From 98eed5ba771fe18c95dac169502f7f41fd21c43b Mon Sep 17 00:00:00 2001 From: Jason Gauci Date: Thu, 19 Jan 2023 20:36:59 -0600 Subject: [PATCH] Update submodule imports --- .../external/crashpad/infra/config/main.star | 0 .../mini_chromium/build/ios/sdk_info.py | 0 .../report-package-build-failure.md | 16 +- .../vcpkg/.github/workflows/trustedPR.yml | 7 +- .../vcpkg/.github/workflows/untrustedPR.yml | 37 +- .../vcpkg/.github/workflows/validateDocs.yml | 54 + external_imported/vcpkg/README.md | 14 +- external_imported/vcpkg/README_es.md | 8 +- external_imported/vcpkg/README_fr.md | 10 +- external_imported/vcpkg/README_ko_KR.md | 11 +- external_imported/vcpkg/README_zh_CN.md | 108 +- external_imported/vcpkg/SECURITY.md | 41 + external_imported/vcpkg/docs/README.md | 19 +- external_imported/vcpkg/docs/about/faq.md | 46 +- .../vcpkg/docs/commands/common-options.md | 121 + .../vcpkg/docs/commands/install.md | 193 + .../vcpkg/docs/commands/integrate.md | 84 + .../vcpkg/docs/commands/remove.md | 43 + .../vcpkg/docs/commands/search.md | 37 + .../vcpkg/docs/commands/update-baseline.md | 42 + .../examples/installing-and-using-packages.md | 4 +- .../modify-baseline-to-pin-old-boost.md | 27 +- .../overlay-triplets-linux-dynamic.md | 2 +- .../docs/examples/packaging-github-repos.md | 2 +- .../vcpkg/docs/examples/packaging-zipfiles.md | 16 +- .../examples/versioning.getting-started.md | 10 +- .../internal/vcpkg_catalog_release_process.md | 14 + .../internal/vcpkg_tool_release_process.md | 53 + .../internal/z_vcpkg_setup_pkgconfig_path.md | 16 + .../docs/maintainers/maintainer-guide.md | 33 +- .../docs/maintainers/portfile-functions.md | 34 +- .../maintainers/ports/vcpkg-cmake-get-vars.md | 3 + .../vcpkg_cmake_get_vars.md | 4 +- .../docs/maintainers/ports/vcpkg-cmake.md | 8 +- .../ports/vcpkg-cmake/vcpkg_cmake_build.md | 38 - .../vcpkg-cmake/vcpkg_cmake_configure.md | 93 - .../ports/vcpkg-cmake/vcpkg_cmake_install.md | 25 - .../ports/vcpkg-get-python-packages.md} | 0 .../x_vcpkg_get_python_packages.md | 38 + .../vcpkg/docs/maintainers/ports/vcpkg-gn.md | 12 + .../ports/vcpkg-gn/vcpkg_gn_configure.md | 32 + .../ports/vcpkg-gn/vcpkg_gn_install.md | 29 + .../maintainers/ports/vcpkg-qmake.md} | 0 .../vcpkg-qmake/vcpkg_qmake_configure.md | 36 + .../docs/maintainers/pr-review-checklist.md | 4 +- .../vcpkg/docs/maintainers/registries.md | 9 +- .../docs/maintainers/vcpkg_build_cmake.md | 2 +- .../docs/maintainers/vcpkg_cmake_build.md | 68 + .../docs/maintainers/vcpkg_cmake_configure.md | 137 + .../docs/maintainers/vcpkg_cmake_install.md | 53 + .../maintainers/vcpkg_common_definitions.md | 2 +- .../docs/maintainers/vcpkg_configure_cmake.md | 2 +- .../docs/maintainers/vcpkg_configure_make.md | 10 +- .../vcpkg_execute_required_process.md | 9 + .../vcpkg_extract_source_archive.md | 168 +- .../vcpkg_extract_source_archive_ex.md | 16 +- .../docs/maintainers/vcpkg_from_gitlab.md | 2 +- .../docs/maintainers/vcpkg_install_cmake.md | 2 +- .../maintainers/vcpkg_install_copyright.md | 69 + external_imported/vcpkg/docs/regenerate.ps1 | 353 -- .../vcpkg/docs/specifications/registries-2.md | 2 + .../vcpkg/docs/specifications/registries.md | 2 + external_imported/vcpkg/docs/users/android.md | 7 +- .../vcpkg/docs/users/binarycaching.md | 19 +- .../users/buildsystems/cmake-integration.md | 226 ++ .../docs/users/buildsystems/export-command.md | 20 + .../docs/users/buildsystems/integration.md | 10 + .../users/buildsystems/manual-integration.md | 31 + .../users/buildsystems/msbuild-integration.md | 138 + .../vcpkg/docs/users/config-environment.md | 19 +- .../vcpkg/docs/users/integration.md | 177 - .../vcpkg/docs/users/manifests.md | 322 +- external_imported/vcpkg/docs/users/mingw.md | 12 +- .../vcpkg/docs/users/registries.md | 8 +- .../vcpkg/docs/users/triplets.md | 22 +- .../vcpkg/docs/users/versioning.md | 51 +- .../vcpkg/ports/7zip/portfile.cmake | 4 +- external_imported/vcpkg/ports/7zip/vcpkg.json | 3 +- .../correct_cmake_include_directory.patch | 20 + .../vcpkg/ports/ableton/portfile.cmake | 83 + ...ce_asiosdk_download_by_vcpkg_asiosdk.patch | 48 + ...e_local_asiostandalone_by_vcpkg_asio.patch | 19 + .../replace_local_catch_by_vcpkg_catch2.patch | 90 + .../vcpkg/ports/ableton/vcpkg.json | 46 + .../vcpkg/ports/abseil/portfile.cmake | 4 +- .../vcpkg/ports/abseil/vcpkg.json | 3 +- .../vcpkg/ports/ace/portfile.cmake | 30 +- external_imported/vcpkg/ports/ace/vcpkg.json | 3 +- .../vcpkg/ports/activemq-cpp/portfile.cmake | 8 + .../vcpkg/ports/activemq-cpp/vcpkg.json | 2 +- .../vcpkg/ports/air-ctl/portfile.cmake | 18 + .../vcpkg/ports/air-ctl/vcpkg.json | 18 + .../vcpkg/ports/aixlog/portfile.cmake | 4 +- .../vcpkg/ports/aixlog/vcpkg.json | 5 +- .../vcpkg/ports/akali/portfile.cmake | 34 +- .../vcpkg/ports/akali/vcpkg.json | 17 +- .../vcpkg/ports/alpaca/portfile.cmake | 28 + .../vcpkg/ports/alpaca/vcpkg.json | 17 + .../vcpkg/ports/alpaka/portfile.cmake | 21 + external_imported/vcpkg/ports/alpaka/usage | 4 + .../vcpkg/ports/alpaka/vcpkg.json | 25 + .../vcpkg/ports/ampl-mp/fix-arm-build.patch | 6 + .../vcpkg/ports/ampl-mp/vcpkg.json | 4 +- .../vcpkg/ports/angelscript/LICENSE | 13 - .../vcpkg/ports/angelscript/portfile.cmake | 13 +- .../vcpkg/ports/angelscript/vcpkg.json | 2 + .../vcpkg/ports/angle/CMakeLists.txt | 17 + .../vcpkg/ports/angle/vcpkg.json | 2 +- .../vcpkg/ports/antlr4/fix_LNK2001.patch | 50 + .../ports/antlr4/fix_utfcpp_dependency.patch | 31 - .../vcpkg/ports/antlr4/fixed_build.patch | 113 +- .../vcpkg/ports/antlr4/portfile.cmake | 60 +- .../ports/antlr4/uuid_discovery_fix.patch | 19 - .../vcpkg/ports/antlr4/vcpkg.json | 8 +- .../vcpkg/ports/anyrpc/mingw.patch | 216 + .../vcpkg/ports/anyrpc/portfile.cmake | 2 + .../vcpkg/ports/anyrpc/vcpkg.json | 1 + .../vcpkg/ports/aom/portfile.cmake | 9 +- external_imported/vcpkg/ports/aom/vcpkg.json | 2 +- .../vcpkg/ports/apr-util/portfile.cmake | 1 + .../vcpkg/ports/apr-util/unglue.patch | 17 + .../vcpkg/ports/apr-util/vcpkg.json | 3 +- .../vcpkg/ports/apr/fix-configcmake.patch | 62 + .../vcpkg/ports/apr/portfile.cmake | 47 +- .../vcpkg/ports/apr/unglue.patch | 17 + external_imported/vcpkg/ports/apr/vcpkg.json | 8 +- .../vcpkg/ports/apsi/portfile.cmake | 14 +- external_imported/vcpkg/ports/apsi/vcpkg.json | 5 +- .../vcpkg/ports/argh/portfile.cmake | 28 +- .../remove_unnamespaced_license_file.patch | 67 - external_imported/vcpkg/ports/argh/vcpkg.json | 17 +- .../vcpkg/ports/argon2/CMakeLists.txt | 83 + .../vcpkg/ports/argon2/portfile.cmake | 31 + .../vcpkg/ports/argon2/thread-header.patch | 12 + .../argon2/unofficial-libargon2-config.cmake | 6 + .../vcpkg/ports/argon2/vcpkg.json | 22 + .../vcpkg/ports/argon2/visibility.patch | 46 + .../vcpkg/ports/argparse/portfile.cmake | 4 +- .../vcpkg/ports/argparse/vcpkg.json | 2 +- .../vcpkg/ports/aricpp/portfile.cmake | 15 +- .../vcpkg/ports/aricpp/vcpkg.json | 4 +- .../armadillo/add-disable-find-package.patch | 16 +- .../vcpkg/ports/armadillo/fix-CMakePath.patch | 4 +- .../vcpkg/ports/armadillo/portfile.cmake | 4 +- .../armadillo/remove_custom_modules.patch | 27 +- .../vcpkg/ports/armadillo/vcpkg.json | 4 +- .../arrayfire/fix-dependency-clfft.patch | 14 + .../vcpkg/ports/arrayfire/portfile.cmake | 18 +- .../vcpkg/ports/arrayfire/vcpkg.json | 4 + .../vcpkg/ports/arrow/cuda-ptr.patch | 61 + .../ports/arrow/fix-ThirdPartyToolchain.patch | 121 + .../vcpkg/ports/arrow/fix-dependencies.patch | 316 -- .../{all.patch => msvc-static-name.patch} | 0 .../vcpkg/ports/arrow/portfile.cmake | 59 +- .../vcpkg/ports/arrow/static-link-libs.patch | 127 + external_imported/vcpkg/ports/arrow/usage | 3 - .../vcpkg/ports/arrow/usage-parquet | 3 + .../vcpkg/ports/arrow/vcpkg.json | 20 +- .../vcpkg/ports/ashes/portfile.cmake | 9 +- .../vcpkg/ports/ashes/vcpkg.json | 2 +- .../vcpkg/ports/asio-grpc/portfile.cmake | 9 +- .../vcpkg/ports/asio-grpc/vcpkg.json | 2 +- .../vcpkg/ports/asio/portfile.cmake | 4 +- external_imported/vcpkg/ports/asio/vcpkg.json | 5 +- .../vcpkg/ports/asiosdk/Findasiosdk.cmake | 7 + .../vcpkg/ports/asiosdk/vcpkg.json | 2 +- .../vcpkg/ports/assimp/build_fixes.patch | 937 ++--- .../vcpkg/ports/assimp/irrlicht.patch | 61 - .../vcpkg/ports/assimp/portfile.cmake | 84 +- .../vcpkg/ports/assimp/vcpkg.json | 16 +- .../vcpkg/ports/atk/portfile.cmake | 25 +- external_imported/vcpkg/ports/atk/vcpkg.json | 3 +- external_imported/vcpkg/ports/atkmm/COPYING | 510 --- .../vcpkg/ports/atkmm/portfile.cmake | 19 +- .../vcpkg/ports/atkmm/vcpkg.json | 4 +- .../vcpkg/ports/aubio/portfile.cmake | 19 +- .../vcpkg/ports/aubio/vcpkg.json | 8 +- .../vcpkg/ports/avisynthplus/clang-cl.patch | 20 + .../vcpkg/ports/avisynthplus/portfile.cmake | 17 +- .../vcpkg/ports/avisynthplus/vcpkg.json | 13 +- .../vcpkg/ports/aws-c-common/portfile.cmake | 4 +- .../vcpkg/ports/aws-c-common/vcpkg.json | 3 +- .../vcpkg/ports/aws-c-io/portfile.cmake | 4 +- .../vcpkg/ports/aws-c-io/vcpkg.json | 3 +- .../vcpkg/ports/azmq/portfile.cmake | 4 +- external_imported/vcpkg/ports/azmq/vcpkg.json | 3 +- .../azure-c-shared-utility/openssl.patch | 13 - .../azure-c-shared-utility/portfile.cmake | 5 +- .../ports/azure-c-shared-utility/vcpkg.json | 3 +- .../vcpkg/ports/azure-core-cpp/portfile.cmake | 4 +- .../vcpkg/ports/azure-core-cpp/vcpkg.json | 5 +- .../portfile.cmake | 18 + .../vcpkg.json | 30 + .../ports/azure-identity-cpp/portfile.cmake | 4 +- .../vcpkg/ports/azure-identity-cpp/vcpkg.json | 3 +- .../fix-iothubclient-includes.patch | 7 +- .../ports/azure-iot-sdk-c/portfile.cmake | 5 +- .../vcpkg/ports/azure-iot-sdk-c/vcpkg.json | 3 +- .../portfile.cmake | 5 +- .../azure-security-attestation-cpp/vcpkg.json | 9 +- .../portfile.cmake | 4 +- .../vcpkg.json | 2 +- .../portfile.cmake | 4 +- .../vcpkg.json | 2 +- .../azure-storage-blobs-cpp/portfile.cmake | 4 +- .../ports/azure-storage-blobs-cpp/vcpkg.json | 4 +- .../azure-storage-common-cpp/portfile.cmake | 4 +- .../ports/azure-storage-common-cpp/vcpkg.json | 4 +- .../vcpkg/ports/azure-uamqp-c/portfile.cmake | 17 +- .../vcpkg/ports/azure-uamqp-c/vcpkg.json | 13 +- .../vcpkg/ports/azure-uhttp-c/portfile.cmake | 4 +- .../vcpkg/ports/azure-uhttp-c/vcpkg.json | 3 +- .../vcpkg/ports/azure-umqtt-c/portfile.cmake | 8 +- .../vcpkg/ports/azure-umqtt-c/vcpkg.json | 3 +- .../vcpkg/ports/b64/CMakeLists.txt | 15 +- .../vcpkg/ports/b64/portfile.cmake | 2 +- external_imported/vcpkg/ports/b64/vcpkg.json | 2 + .../vcpkg/ports/basisu/portfile.cmake | 29 +- .../vcpkg/ports/basisu/vcpkg.json | 11 +- .../vcpkg/ports/bdwgc/portfile.cmake | 7 +- .../vcpkg/ports/bdwgc/vcpkg.json | 6 +- external_imported/vcpkg/ports/bento4/LICENSE | 6 - .../bento4/fix-install-and-c4996-error.patch | 43 - .../vcpkg/ports/bento4/fix-install.patch | 25 + .../vcpkg/ports/bento4/portfile.cmake | 20 +- .../vcpkg/ports/bento4/vcpkg.json | 13 +- .../vcpkg/ports/bext-sml/portfile.cmake | 4 +- .../vcpkg/ports/bext-sml/vcpkg.json | 5 +- .../vcpkg/ports/bext-ut/avoid-cpm.patch | 12 + .../vcpkg/ports/bext-ut/portfile.cmake | 29 +- .../vcpkg/ports/bext-ut/vcpkg.json | 15 +- .../vcpkg/ports/bfgroup-lyra/portfile.cmake | 4 +- .../vcpkg/ports/bfgroup-lyra/vcpkg.json | 3 +- .../vcpkg/ports/bitmagic/portfile.cmake | 4 +- .../vcpkg/ports/bitmagic/vcpkg.json | 2 +- .../vcpkg/ports/bitserializer/portfile.cmake | 7 +- .../vcpkg/ports/bitserializer/vcpkg.json | 2 + .../vcpkg/ports/blake3/CMakeLists.txt | 65 + .../vcpkg/ports/blake3/portfile.cmake | 20 + .../vcpkg/ports/blake3/vcpkg.json | 14 + .../vcpkg/ports/blaze/fix-vm-build.patch | 20 - .../vcpkg/ports/blaze/portfile.cmake | 19 +- .../vcpkg/ports/blaze/vcpkg.json | 14 +- .../vcpkg/ports/blend2d/portfile.cmake | 4 +- .../vcpkg/ports/blend2d/vcpkg.json | 2 +- .../boinc/001-add-openssl3-support.patch | 13 - .../vcpkg/ports/boinc/portfile.cmake | 6 +- .../vcpkg/ports/boinc/vcpkg.json | 3 +- .../ports/boost-accumulators/portfile.cmake | 4 +- .../vcpkg/ports/boost-accumulators/vcpkg.json | 3 +- .../ports/boost-algorithm/portfile.cmake | 4 +- .../vcpkg/ports/boost-algorithm/vcpkg.json | 3 +- .../vcpkg/ports/boost-align/portfile.cmake | 4 +- .../vcpkg/ports/boost-align/vcpkg.json | 3 +- .../vcpkg/ports/boost-any/portfile.cmake | 4 +- .../vcpkg/ports/boost-any/vcpkg.json | 3 +- .../vcpkg/ports/boost-array/portfile.cmake | 4 +- .../vcpkg/ports/boost-array/vcpkg.json | 3 +- .../vcpkg/ports/boost-asio/portfile.cmake | 4 +- .../vcpkg/ports/boost-asio/vcpkg.json | 8 +- .../vcpkg/ports/boost-assert/portfile.cmake | 4 +- .../vcpkg/ports/boost-assert/vcpkg.json | 3 +- .../vcpkg/ports/boost-assign/portfile.cmake | 4 +- .../vcpkg/ports/boost-assign/vcpkg.json | 4 +- .../0001-fix-compilation-for-uwp.patch | 81 - .../vcpkg/ports/boost-atomic/portfile.cmake | 14 +- .../vcpkg/ports/boost-atomic/vcpkg.json | 3 +- .../vcpkg/ports/boost-beast/portfile.cmake | 4 +- .../vcpkg/ports/boost-beast/vcpkg.json | 3 +- .../vcpkg/ports/boost-bimap/portfile.cmake | 4 +- .../vcpkg/ports/boost-bimap/vcpkg.json | 3 +- .../vcpkg/ports/boost-bind/portfile.cmake | 4 +- .../vcpkg/ports/boost-bind/vcpkg.json | 3 +- .../0001-don-t-skip-install-targets.patch | 75 - .../vcpkg/ports/boost-build/portfile.cmake | 5 +- .../vcpkg/ports/boost-build/vcpkg.json | 3 +- .../boost-callable-traits/portfile.cmake | 4 +- .../ports/boost-callable-traits/vcpkg.json | 3 +- .../vcpkg/ports/boost-chrono/portfile.cmake | 7 +- .../vcpkg/ports/boost-chrono/vcpkg.json | 3 +- .../boost-circular-buffer/portfile.cmake | 4 +- .../ports/boost-circular-buffer/vcpkg.json | 3 +- .../ports/boost-compatibility/portfile.cmake | 4 +- .../ports/boost-compatibility/vcpkg.json | 3 +- .../vcpkg/ports/boost-compute/portfile.cmake | 4 +- .../vcpkg/ports/boost-compute/vcpkg.json | 3 +- .../ports/boost-concept-check/portfile.cmake | 4 +- .../ports/boost-concept-check/vcpkg.json | 3 +- .../vcpkg/ports/boost-config/portfile.cmake | 4 +- .../vcpkg/ports/boost-config/vcpkg.json | 3 +- .../ports/boost-container-hash/portfile.cmake | 4 +- .../ports/boost-container-hash/vcpkg.json | 3 +- .../ports/boost-container/portfile.cmake | 7 +- .../vcpkg/ports/boost-container/vcpkg.json | 3 +- .../ports/boost-context/b2-options.cmake.in | 15 +- .../vcpkg/ports/boost-context/portfile.cmake | 16 +- .../vcpkg/ports/boost-context/vcpkg.json | 3 +- .../vcpkg/ports/boost-contract/portfile.cmake | 7 +- .../vcpkg/ports/boost-contract/vcpkg.json | 3 +- .../ports/boost-conversion/portfile.cmake | 4 +- .../vcpkg/ports/boost-conversion/vcpkg.json | 3 +- .../vcpkg/ports/boost-convert/portfile.cmake | 4 +- .../vcpkg/ports/boost-convert/vcpkg.json | 3 +- .../vcpkg/ports/boost-core/portfile.cmake | 4 +- .../vcpkg/ports/boost-core/vcpkg.json | 3 +- .../ports/boost-coroutine/portfile.cmake | 7 +- .../vcpkg/ports/boost-coroutine/vcpkg.json | 3 +- .../ports/boost-coroutine2/portfile.cmake | 4 +- .../vcpkg/ports/boost-coroutine2/vcpkg.json | 3 +- .../vcpkg/ports/boost-crc/portfile.cmake | 4 +- .../vcpkg/ports/boost-crc/vcpkg.json | 3 +- .../ports/boost-date-time/portfile.cmake | 7 +- .../vcpkg/ports/boost-date-time/vcpkg.json | 3 +- .../vcpkg/ports/boost-describe/portfile.cmake | 4 +- .../vcpkg/ports/boost-describe/vcpkg.json | 3 +- .../vcpkg/ports/boost-detail/portfile.cmake | 4 +- .../vcpkg/ports/boost-detail/vcpkg.json | 3 +- .../vcpkg/ports/boost-dll/portfile.cmake | 4 +- .../vcpkg/ports/boost-dll/vcpkg.json | 3 +- .../ports/boost-dynamic-bitset/portfile.cmake | 4 +- .../ports/boost-dynamic-bitset/vcpkg.json | 3 +- .../vcpkg/ports/boost-endian/portfile.cmake | 4 +- .../vcpkg/ports/boost-endian/vcpkg.json | 3 +- .../ports/boost-exception/portfile.cmake | 7 +- .../vcpkg/ports/boost-exception/vcpkg.json | 3 +- .../ports/boost-fiber/fix-build-numa.patch | 15 - .../vcpkg/ports/boost-fiber/portfile.cmake | 15 +- .../vcpkg/ports/boost-fiber/vcpkg.json | 3 +- .../ports/boost-filesystem/portfile.cmake | 7 +- .../vcpkg/ports/boost-filesystem/vcpkg.json | 4 +- .../ports/boost-flyweight/portfile.cmake | 4 +- .../vcpkg/ports/boost-flyweight/vcpkg.json | 3 +- .../vcpkg/ports/boost-foreach/portfile.cmake | 4 +- .../vcpkg/ports/boost-foreach/vcpkg.json | 3 +- .../vcpkg/ports/boost-format/portfile.cmake | 4 +- .../vcpkg/ports/boost-format/vcpkg.json | 3 +- .../ports/boost-function-types/portfile.cmake | 4 +- .../ports/boost-function-types/vcpkg.json | 3 +- .../vcpkg/ports/boost-function/portfile.cmake | 4 +- .../vcpkg/ports/boost-function/vcpkg.json | 3 +- .../ports/boost-functional/portfile.cmake | 4 +- .../vcpkg/ports/boost-functional/vcpkg.json | 3 +- .../vcpkg/ports/boost-fusion/portfile.cmake | 4 +- .../vcpkg/ports/boost-fusion/vcpkg.json | 3 +- .../vcpkg/ports/boost-geometry/portfile.cmake | 4 +- .../vcpkg/ports/boost-geometry/vcpkg.json | 3 +- .../vcpkg/ports/boost-gil/portfile.cmake | 4 +- .../vcpkg/ports/boost-gil/vcpkg.json | 6 +- .../ports/boost-graph-parallel/portfile.cmake | 7 +- .../ports/boost-graph-parallel/vcpkg.json | 3 +- .../vcpkg/ports/boost-graph/portfile.cmake | 7 +- .../vcpkg/ports/boost-graph/vcpkg.json | 3 +- .../vcpkg/ports/boost-hana/portfile.cmake | 4 +- .../vcpkg/ports/boost-hana/vcpkg.json | 3 +- .../vcpkg/ports/boost-heap/portfile.cmake | 4 +- .../vcpkg/ports/boost-heap/vcpkg.json | 3 +- .../ports/boost-histogram/portfile.cmake | 4 +- .../vcpkg/ports/boost-histogram/vcpkg.json | 3 +- .../vcpkg/ports/boost-hof/portfile.cmake | 4 +- .../vcpkg/ports/boost-hof/vcpkg.json | 3 +- .../vcpkg/ports/boost-icl/portfile.cmake | 4 +- .../vcpkg/ports/boost-icl/vcpkg.json | 3 +- .../vcpkg/ports/boost-integer/portfile.cmake | 4 +- .../vcpkg/ports/boost-integer/vcpkg.json | 4 +- .../ports/boost-interprocess/portfile.cmake | 4 +- .../vcpkg/ports/boost-interprocess/vcpkg.json | 3 +- .../vcpkg/ports/boost-interval/portfile.cmake | 4 +- .../vcpkg/ports/boost-interval/vcpkg.json | 3 +- .../ports/boost-intrusive/portfile.cmake | 4 +- .../vcpkg/ports/boost-intrusive/vcpkg.json | 3 +- .../vcpkg/ports/boost-io/portfile.cmake | 4 +- .../vcpkg/ports/boost-io/vcpkg.json | 3 +- .../ports/boost-iostreams/portfile.cmake | 7 +- .../vcpkg/ports/boost-iostreams/vcpkg.json | 3 +- .../vcpkg/ports/boost-iterator/portfile.cmake | 4 +- .../vcpkg/ports/boost-iterator/vcpkg.json | 3 +- .../vcpkg/ports/boost-json/portfile.cmake | 14 +- .../vcpkg/ports/boost-json/vcpkg.json | 6 +- .../vcpkg/ports/boost-lambda/portfile.cmake | 4 +- .../vcpkg/ports/boost-lambda/vcpkg.json | 3 +- .../vcpkg/ports/boost-lambda2/portfile.cmake | 4 +- .../vcpkg/ports/boost-lambda2/vcpkg.json | 3 +- .../vcpkg/ports/boost-leaf/portfile.cmake | 4 +- .../vcpkg/ports/boost-leaf/vcpkg.json | 3 +- .../ports/boost-lexical-cast/portfile.cmake | 4 +- .../vcpkg/ports/boost-lexical-cast/vcpkg.json | 3 +- .../ports/boost-local-function/portfile.cmake | 4 +- .../ports/boost-local-function/vcpkg.json | 3 +- .../allow-force-finding-iconv.patch | 24 - ...U-support.patch => fix-dependencies.patch} | 73 +- .../vcpkg/ports/boost-locale/portfile.cmake | 11 +- .../vcpkg/ports/boost-locale/vcpkg.json | 5 +- .../vcpkg/ports/boost-lockfree/portfile.cmake | 4 +- .../vcpkg/ports/boost-lockfree/vcpkg.json | 3 +- .../vcpkg/ports/boost-log/portfile.cmake | 16 +- .../vcpkg/ports/boost-log/vcpkg.json | 3 +- .../vcpkg/ports/boost-logic/portfile.cmake | 4 +- .../vcpkg/ports/boost-logic/vcpkg.json | 3 +- .../vcpkg/ports/boost-math/portfile.cmake | 7 +- .../vcpkg/ports/boost-math/vcpkg.json | 3 +- .../ports/boost-metaparse/portfile.cmake | 4 +- .../vcpkg/ports/boost-metaparse/vcpkg.json | 3 +- .../boost-modular-build-helper/CMakeLists.txt | 48 +- .../boost-modular-build.cmake | 4 +- .../boost-modular-build-helper/vcpkg.json | 13 +- .../vcpkg/ports/boost-move/portfile.cmake | 4 +- .../vcpkg/ports/boost-move/vcpkg.json | 3 +- .../vcpkg/ports/boost-mp11/portfile.cmake | 4 +- .../vcpkg/ports/boost-mp11/vcpkg.json | 3 +- .../vcpkg/ports/boost-mpi/portfile.cmake | 7 +- .../vcpkg/ports/boost-mpi/vcpkg.json | 3 +- .../vcpkg/ports/boost-mpl/portfile.cmake | 4 +- .../vcpkg/ports/boost-mpl/vcpkg.json | 3 +- .../vcpkg/ports/boost-msm/portfile.cmake | 4 +- .../vcpkg/ports/boost-msm/vcpkg.json | 3 +- .../ports/boost-multi-array/portfile.cmake | 4 +- .../vcpkg/ports/boost-multi-array/vcpkg.json | 3 +- .../ports/boost-multi-index/portfile.cmake | 4 +- .../vcpkg/ports/boost-multi-index/vcpkg.json | 3 +- ...ection-logic-in-intel_intrinsics.hpp.patch | 29 - .../ports/boost-multiprecision/portfile.cmake | 5 +- .../ports/boost-multiprecision/vcpkg.json | 4 +- .../vcpkg/ports/boost-nowide/portfile.cmake | 14 +- .../vcpkg/ports/boost-nowide/vcpkg.json | 3 +- .../boost-numeric-conversion/portfile.cmake | 4 +- .../ports/boost-numeric-conversion/vcpkg.json | 3 +- .../vcpkg/ports/boost-odeint/portfile.cmake | 4 +- .../vcpkg/ports/boost-odeint/vcpkg.json | 3 +- .../vcpkg/ports/boost-optional/portfile.cmake | 4 +- .../vcpkg/ports/boost-optional/vcpkg.json | 3 +- .../vcpkg/ports/boost-outcome/portfile.cmake | 4 +- .../vcpkg/ports/boost-outcome/vcpkg.json | 3 +- .../boost-parameter-python/portfile.cmake | 4 +- .../ports/boost-parameter-python/vcpkg.json | 3 +- .../ports/boost-parameter/portfile.cmake | 4 +- .../vcpkg/ports/boost-parameter/vcpkg.json | 3 +- .../vcpkg/ports/boost-pfr/portfile.cmake | 4 +- .../vcpkg/ports/boost-pfr/vcpkg.json | 3 +- .../vcpkg/ports/boost-phoenix/portfile.cmake | 4 +- .../vcpkg/ports/boost-phoenix/vcpkg.json | 3 +- .../boost-poly-collection/portfile.cmake | 4 +- .../ports/boost-poly-collection/vcpkg.json | 3 +- .../vcpkg/ports/boost-polygon/portfile.cmake | 4 +- .../vcpkg/ports/boost-polygon/vcpkg.json | 3 +- .../vcpkg/ports/boost-pool/portfile.cmake | 4 +- .../vcpkg/ports/boost-pool/vcpkg.json | 3 +- .../vcpkg/ports/boost-predef/portfile.cmake | 4 +- .../vcpkg/ports/boost-predef/vcpkg.json | 3 +- .../ports/boost-preprocessor/portfile.cmake | 4 +- .../vcpkg/ports/boost-preprocessor/vcpkg.json | 3 +- .../ports/boost-process/fix_include.patch | 13 - .../vcpkg/ports/boost-process/portfile.cmake | 5 +- .../vcpkg/ports/boost-process/vcpkg.json | 6 +- .../boost-program-options/portfile.cmake | 7 +- .../ports/boost-program-options/vcpkg.json | 3 +- .../portfile.cmake | 4 +- .../boost-property-map-parallel/vcpkg.json | 4 +- .../ports/boost-property-map/portfile.cmake | 4 +- .../vcpkg/ports/boost-property-map/vcpkg.json | 4 +- .../ports/boost-property-tree/portfile.cmake | 4 +- .../ports/boost-property-tree/vcpkg.json | 3 +- .../vcpkg/ports/boost-proto/portfile.cmake | 4 +- .../vcpkg/ports/boost-proto/vcpkg.json | 3 +- .../ports/boost-ptr-container/portfile.cmake | 4 +- .../ports/boost-ptr-container/vcpkg.json | 3 +- .../vcpkg/ports/boost-python/portfile.cmake | 7 +- .../vcpkg/ports/boost-python/vcpkg.json | 3 +- .../vcpkg/ports/boost-qvm/portfile.cmake | 4 +- .../vcpkg/ports/boost-qvm/vcpkg.json | 3 +- .../vcpkg/ports/boost-random/portfile.cmake | 7 +- .../vcpkg/ports/boost-random/vcpkg.json | 3 +- .../vcpkg/ports/boost-range/portfile.cmake | 4 +- .../vcpkg/ports/boost-range/vcpkg.json | 3 +- .../vcpkg/ports/boost-ratio/portfile.cmake | 4 +- .../vcpkg/ports/boost-ratio/vcpkg.json | 3 +- .../vcpkg/ports/boost-rational/portfile.cmake | 4 +- .../vcpkg/ports/boost-rational/vcpkg.json | 3 +- .../vcpkg/ports/boost-regex/b2-options.cmake | 2 + .../vcpkg/ports/boost-regex/portfile.cmake | 7 +- .../vcpkg/ports/boost-regex/vcpkg.json | 3 +- .../ports/boost-safe-numerics/portfile.cmake | 4 +- .../ports/boost-safe-numerics/vcpkg.json | 3 +- .../ports/boost-scope-exit/portfile.cmake | 4 +- .../vcpkg/ports/boost-scope-exit/vcpkg.json | 3 +- .../ports/boost-serialization/portfile.cmake | 7 +- .../ports/boost-serialization/vcpkg.json | 3 +- .../vcpkg/ports/boost-signals2/portfile.cmake | 4 +- .../vcpkg/ports/boost-signals2/vcpkg.json | 3 +- .../ports/boost-smart-ptr/portfile.cmake | 4 +- .../vcpkg/ports/boost-smart-ptr/vcpkg.json | 3 +- .../vcpkg/ports/boost-sort/portfile.cmake | 4 +- .../vcpkg/ports/boost-sort/vcpkg.json | 3 +- .../vcpkg/ports/boost-spirit/portfile.cmake | 4 +- .../vcpkg/ports/boost-spirit/vcpkg.json | 3 +- .../ports/boost-stacktrace/portfile.cmake | 7 +- .../vcpkg/ports/boost-stacktrace/vcpkg.json | 3 +- .../ports/boost-statechart/portfile.cmake | 4 +- .../vcpkg/ports/boost-statechart/vcpkg.json | 3 +- .../ports/boost-static-assert/portfile.cmake | 4 +- .../ports/boost-static-assert/vcpkg.json | 3 +- .../ports/boost-static-string/portfile.cmake | 4 +- .../ports/boost-static-string/vcpkg.json | 3 +- .../ports/boost-stl-interfaces/portfile.cmake | 4 +- .../ports/boost-stl-interfaces/vcpkg.json | 4 +- .../vcpkg/ports/boost-system/portfile.cmake | 7 +- .../vcpkg/ports/boost-system/vcpkg.json | 3 +- .../vcpkg/ports/boost-test/portfile.cmake | 14 +- .../vcpkg/ports/boost-test/vcpkg.json | 3 +- .../vcpkg/ports/boost-thread/portfile.cmake | 7 +- .../vcpkg/ports/boost-thread/vcpkg.json | 3 +- .../boost-throw-exception/portfile.cmake | 4 +- .../ports/boost-throw-exception/vcpkg.json | 3 +- .../vcpkg/ports/boost-timer/portfile.cmake | 7 +- .../vcpkg/ports/boost-timer/vcpkg.json | 3 +- .../ports/boost-tokenizer/portfile.cmake | 4 +- .../vcpkg/ports/boost-tokenizer/vcpkg.json | 4 +- .../vcpkg/ports/boost-tti/portfile.cmake | 4 +- .../vcpkg/ports/boost-tti/vcpkg.json | 3 +- .../vcpkg/ports/boost-tuple/portfile.cmake | 4 +- .../vcpkg/ports/boost-tuple/vcpkg.json | 3 +- .../ports/boost-type-erasure/portfile.cmake | 7 +- .../vcpkg/ports/boost-type-erasure/vcpkg.json | 3 +- .../ports/boost-type-index/portfile.cmake | 4 +- .../vcpkg/ports/boost-type-index/vcpkg.json | 3 +- .../ports/boost-type-traits/portfile.cmake | 4 +- .../vcpkg/ports/boost-type-traits/vcpkg.json | 3 +- .../vcpkg/ports/boost-typeof/portfile.cmake | 4 +- .../vcpkg/ports/boost-typeof/vcpkg.json | 3 +- .../vcpkg/ports/boost-ublas/portfile.cmake | 4 +- .../vcpkg/ports/boost-ublas/vcpkg.json | 3 +- .../vcpkg/ports/boost-uninstall/vcpkg.json | 5 +- .../vcpkg/ports/boost-units/portfile.cmake | 4 +- .../vcpkg/ports/boost-units/vcpkg.json | 3 +- .../ports/boost-unordered/portfile.cmake | 4 +- .../vcpkg/ports/boost-unordered/vcpkg.json | 7 +- .../vcpkg/ports/boost-utility/portfile.cmake | 4 +- .../vcpkg/ports/boost-utility/vcpkg.json | 4 +- .../vcpkg/ports/boost-uuid/portfile.cmake | 4 +- .../vcpkg/ports/boost-uuid/vcpkg.json | 3 +- .../vcpkg/ports/boost-variant/portfile.cmake | 4 +- .../vcpkg/ports/boost-variant/vcpkg.json | 3 +- .../vcpkg/ports/boost-variant2/portfile.cmake | 4 +- .../vcpkg/ports/boost-variant2/vcpkg.json | 3 +- .../ports/boost-vcpkg-helpers/portfile.cmake | 2 +- .../ports/boost-vcpkg-helpers/vcpkg.json | 4 +- .../vcpkg/ports/boost-vmd/portfile.cmake | 4 +- .../vcpkg/ports/boost-vmd/vcpkg.json | 3 +- .../vcpkg/ports/boost-wave/portfile.cmake | 12 +- .../vcpkg/ports/boost-wave/vcpkg.json | 4 +- .../vcpkg/ports/boost-winapi/portfile.cmake | 4 +- .../vcpkg/ports/boost-winapi/vcpkg.json | 3 +- .../ports/boost-xpressive/portfile.cmake | 4 +- .../vcpkg/ports/boost-xpressive/vcpkg.json | 3 +- .../vcpkg/ports/boost-yap/portfile.cmake | 4 +- .../vcpkg/ports/boost-yap/vcpkg.json | 3 +- .../vcpkg/ports/boost/vcpkg.json | 3 +- .../boringssl/0002-disable-waring-4065.patch | 15 - .../boringssl/0002-remove-WX-Werror.patch | 24 + .../vcpkg/ports/boringssl/portfile.cmake | 11 +- .../vcpkg/ports/boringssl/vcpkg.json | 8 +- .../vcpkg/ports/botan/arm64-windows.patch | 23 + .../vcpkg/ports/botan/portfile.cmake | 11 +- .../vcpkg/ports/botan/vcpkg.json | 6 +- .../ports/breakpad/fix-unordered_map.patch | 14 - .../vcpkg/ports/breakpad/portfile.cmake | 5 +- .../vcpkg/ports/breakpad/vcpkg.json | 6 +- .../vcpkg/ports/brotli/portfile.cmake | 19 +- .../vcpkg/ports/brotli/vcpkg.json | 17 +- .../vcpkg/ports/brpc/brpc-1783.diff | 592 +++ ...ix_boost_ptr.patch => fix-boost-ptr.patch} | 2 +- .../vcpkg/ports/brpc/fix-build.patch | 200 + .../vcpkg/ports/brpc/fix_thrift.patch | 28 - .../vcpkg/ports/brpc/portfile.cmake | 20 +- external_imported/vcpkg/ports/brpc/vcpkg.json | 8 +- .../ports/brunocodutra-metal/portfile.cmake | 4 +- .../vcpkg/ports/brunocodutra-metal/vcpkg.json | 2 +- .../vcpkg/ports/brynet/portfile.cmake | 4 +- .../vcpkg/ports/brynet/vcpkg.json | 2 +- .../bshoshany-thread-pool/portfile.cmake | 12 +- .../ports/bshoshany-thread-pool/vcpkg.json | 9 +- .../portfile.cmake | 4 +- .../buck-yeh-bux-mariadb-client/vcpkg.json | 5 +- .../ports/buck-yeh-bux-sqlite/portfile.cmake | 15 + .../ports/buck-yeh-bux-sqlite/vcpkg.json | 17 + .../ports/buck-yeh-bux/fix-clang-cl.patch | 33 + .../ports/buck-yeh-bux/fix-errorC7595.patch | 15 - .../vcpkg/ports/buck-yeh-bux/portfile.cmake | 6 +- .../vcpkg/ports/buck-yeh-bux/vcpkg.json | 5 +- .../vcpkg/ports/bullet3/portfile.cmake | 11 +- .../vcpkg/ports/bullet3/vcpkg.json | 7 + .../vcpkg/ports/bustache/LICENSE | 4 - .../vcpkg/ports/bustache/portfile.cmake | 10 +- .../vcpkg/ports/bustache/vcpkg.json | 15 +- .../ports/c-ares/guard-imported-lib.patch | 21 + .../vcpkg/ports/c-ares/portfile.cmake | 7 +- external_imported/vcpkg/ports/c-ares/usage | 4 + .../vcpkg/ports/c-ares/vcpkg.json | 3 +- .../vcpkg/ports/c4core/portfile.cmake | 42 +- .../vcpkg/ports/c4core/vcpkg.json | 17 +- .../vcpkg/ports/c89stringutils/no_flags.patch | 20 + .../vcpkg/ports/c89stringutils/portfile.cmake | 2 + .../vcpkg/ports/c89stringutils/vcpkg.json | 1 + .../vcpkg/ports/c9y/portfile.cmake | 16 + external_imported/vcpkg/ports/c9y/vcpkg.json | 13 + .../vcpkg/ports/caf/fix_cxx17.patch | 8 + .../vcpkg/ports/caf/portfile.cmake | 5 +- external_imported/vcpkg/ports/caf/vcpkg.json | 4 +- .../ports/caffe2/fix-isgloginitialized.patch | 31 + .../vcpkg/ports/caffe2/portfile.cmake | 1 + .../vcpkg/ports/caffe2/vcpkg.json | 2 +- .../ports/cairo/fix_clang-cl_build.patch | 37 + .../vcpkg/ports/cairo/mingw-dllexport.patch | 13 + .../vcpkg/ports/cairo/portfile.cmake | 15 +- .../vcpkg/ports/cairo/vcpkg.json | 5 +- .../vcpkg/ports/camport3/portfile.cmake | 52 +- .../vcpkg/ports/camport3/vcpkg.json | 3 +- .../vcpkg/ports/capnproto/portfile.cmake | 4 +- .../vcpkg/ports/capnproto/vcpkg.json | 4 +- .../vcpkg/ports/capstone/portfile.cmake | 4 +- .../vcpkg/ports/capstone/vcpkg.json | 1 + .../vcpkg/ports/catch2/fix-install-path.patch | 46 +- .../vcpkg/ports/catch2/fix-uwp-build.patch | 34 + .../vcpkg/ports/catch2/portfile.cmake | 31 +- .../vcpkg/ports/catch2/vcpkg.json | 3 +- .../vcpkg/ports/ccd/portfile.cmake | 23 +- external_imported/vcpkg/ports/ccd/vcpkg.json | 22 +- .../vcpkg/ports/ccfits/dll_exports.patch | 39 +- .../vcpkg/ports/ccfits/vcpkg.json | 3 +- .../vcpkg/ports/cctag/0001-fix-osx.patch | 12 + .../vcpkg/ports/cctag/0002-find-tbb.patch | 173 + .../vcpkg/ports/cctag/portfile.cmake | 16 +- .../vcpkg/ports/cctag/vcpkg.json | 6 +- .../ports/celero/fix-bin-install-path.patch | 17 + .../vcpkg/ports/celero/portfile.cmake | 24 +- .../vcpkg/ports/celero/vcpkg.json | 16 +- .../vcpkg/ports/cereal/portfile.cmake | 20 +- .../vcpkg/ports/cereal/vcpkg.json | 15 +- .../ports/ceres/0002_use_glog_target.patch | 8 +- .../0003_fix_exported_ceres_config.patch | 14 +- .../ports/ceres/0004_fix_lib_path_linux.patch | 13 - .../ports/ceres/find-package-required.patch | 102 +- .../vcpkg/ports/ceres/portfile.cmake | 20 +- .../vcpkg/ports/ceres/vcpkg.json | 17 +- .../vcpkg/ports/cgal/portfile.cmake | 43 +- external_imported/vcpkg/ports/cgal/vcpkg.json | 4 +- .../vcpkg/ports/cgltf/portfile.cmake | 4 +- .../vcpkg/ports/cgltf/vcpkg.json | 5 +- external_imported/vcpkg/ports/cgns/hdf5.patch | 89 +- .../vcpkg/ports/cgns/linux_lfs.patch | 8 +- .../vcpkg/ports/cgns/portfile.cmake | 91 +- external_imported/vcpkg/ports/cgns/vcpkg.json | 13 +- .../vcpkg/ports/chartdir/portfile.cmake | 24 +- .../vcpkg/ports/chartdir/vcpkg.json | 6 +- .../vcpkg/ports/check/fix-lib-path.patch | 8 +- .../vcpkg/ports/check/portfile.cmake | 28 +- .../vcpkg/ports/check/vcpkg.json | 17 +- .../vcpkg/ports/chromium-base/vcpkg.json | 13 +- .../ports/civetweb/disable_warnings.patch | 37 + .../vcpkg/ports/civetweb/portfile.cmake | 18 +- .../vcpkg/ports/civetweb/vcpkg.json | 12 +- .../vcpkg/ports/cjson/portfile.cmake | 1 + .../vcpkg/ports/cjson/vcpkg.json | 3 +- .../vcpkg/ports/clfft/portfile.cmake | 2 +- .../vcpkg/ports/clfft/vcpkg.json | 3 +- .../vcpkg/ports/cli/portfile.cmake | 5 +- external_imported/vcpkg/ports/cli/vcpkg.json | 4 +- .../vcpkg/ports/cli11/portfile.cmake | 4 +- .../vcpkg/ports/cli11/vcpkg.json | 4 +- .../vcpkg/ports/clipboardxx/portfile.cmake | 24 + .../unofficial-clipboardxx-config.cmake.in | 19 + .../vcpkg/ports/clipboardxx/vcpkg.json | 18 + .../vcpkg/ports/cmakerc/portfile.cmake | 14 + .../vcpkg/ports/cmakerc/vcpkg.json | 7 + .../vcpkg/ports/cnats/portfile.cmake | 4 +- .../vcpkg/ports/cnats/vcpkg.json | 2 +- .../vcpkg/ports/cocoyaxi/portfile.cmake | 14 +- .../vcpkg/ports/cocoyaxi/vcpkg.json | 3 +- .../vcpkg/ports/comms-ublox/copyright | 5 + .../vcpkg/ports/comms-ublox/fix-comms.patch | 23 - .../vcpkg/ports/comms-ublox/portfile.cmake | 21 +- .../vcpkg/ports/comms-ublox/vcpkg.json | 13 +- .../vcpkg/ports/comms/portfile.cmake | 48 +- .../vcpkg/ports/comms/vcpkg.json | 17 +- .../vcpkg/ports/commsdsl/portfile.cmake | 19 +- .../vcpkg/ports/commsdsl/vcpkg.json | 19 +- .../vcpkg/ports/concurrencpp/portfile.cmake | 4 +- .../vcpkg/ports/concurrencpp/vcpkg.json | 2 +- .../vcpkg/ports/configcat/portfile.cmake | 25 + .../vcpkg/ports/configcat/vcpkg.json | 21 + .../vcpkg/ports/console-bridge/portfile.cmake | 38 +- .../vcpkg/ports/console-bridge/vcpkg.json | 18 +- .../vcpkg/ports/constexpr/portfile.cmake | 10 +- .../vcpkg/ports/constexpr/vcpkg.json | 7 +- .../ports/convectionkernels/CMakeLists.txt | 30 + .../ports/convectionkernels/portfile.cmake | 21 + .../vcpkg/ports/convectionkernels/vcpkg.json | 17 + .../corrade/build-corrade-rc-always.patch | 27 + .../vcpkg/ports/corrade/portfile.cmake | 19 +- .../vcpkg/ports/corrade/vcpkg.json | 12 +- .../vcpkg/ports/cpp-httplib/portfile.cmake | 4 +- .../vcpkg/ports/cpp-httplib/vcpkg.json | 2 +- .../vcpkg/ports/cpp-ipc/portfile.cmake | 4 +- .../vcpkg/ports/cpp-ipc/vcpkg.json | 3 +- .../vcpkg/ports/cpp-peglib/portfile.cmake | 24 +- .../vcpkg/ports/cpp-peglib/vcpkg.json | 6 +- .../ports/cppcms/fix_narrowing_error.patch | 13 + .../ports/cppcms/no-tests-and-examples.patch | 58 + .../vcpkg/ports/cppcms/portfile.cmake | 24 +- .../vcpkg/ports/cppcms/vcpkg.json | 11 +- .../vcpkg/ports/cppcodec/0001-Fix-62.patch | 28 + .../vcpkg/ports/cppcodec/portfile.cmake | 1 + .../vcpkg/ports/cppcodec/vcpkg.json | 4 +- .../vcpkg/ports/cppgraphqlgen/portfile.cmake | 4 +- .../vcpkg/ports/cppgraphqlgen/vcpkg.json | 2 +- .../ports/cpprestsdk/fix_narrowing.patch | 50 + .../vcpkg/ports/cpprestsdk/portfile.cmake | 24 +- .../vcpkg/ports/cpprestsdk/vcpkg.json | 12 +- .../ports/cppwinrt/cppwinrt-config.cmake | 14 + .../vcpkg/ports/cppwinrt/portfile.cmake | 72 +- external_imported/vcpkg/ports/cppwinrt/usage | 4 + .../vcpkg/ports/cppwinrt/vcpkg.json | 6 +- .../vcpkg/ports/cpr/disable_werror.patch | 13 + .../vcpkg/ports/cpr/portfile.cmake | 5 +- external_imported/vcpkg/ports/cpr/vcpkg.json | 2 +- .../vcpkg/ports/cpu-features/portfile.cmake | 4 +- .../vcpkg/ports/cpu-features/vcpkg.json | 2 +- .../ports/cpu-features/windows-x86-fix.patch | 17 + .../vcpkg/ports/cpuid/fix-build.patch | 23 + .../vcpkg/ports/cpuid/portfile.cmake | 11 +- .../vcpkg/ports/cpuid/vcpkg.json | 3 +- .../vcpkg/ports/cpuinfo/portfile.cmake | 25 +- .../vcpkg/ports/cpuinfo/vcpkg.json | 4 +- .../ports/crashpad/crashpadConfig.cmake.in | 2 +- .../vcpkg/ports/crashpad/portfile.cmake | 40 +- .../vcpkg/ports/crashpad/vcpkg.json | 14 +- .../crashrpt/002-fix-wtl-includepath.patch | 148 + .../crashrpt/003-add-definition-UNICODE.patch | 39 + .../vcpkg/ports/crashrpt/portfile.cmake | 17 +- .../vcpkg/ports/crashrpt/vcpkg.json | 7 +- .../vcpkg/ports/crc32c/fix_clang-cl.patch | 13 + .../vcpkg/ports/crc32c/portfile.cmake | 2 + .../vcpkg/ports/crc32c/vcpkg.json | 1 + .../vcpkg/ports/crfsuite/portfile.cmake | 9 +- .../vcpkg/ports/crfsuite/vcpkg.json | 10 +- .../vcpkg/ports/crow/portfile.cmake | 4 +- external_imported/vcpkg/ports/crow/vcpkg.json | 2 +- .../vcpkg/ports/cryptopp/cmake.patch | 48 + .../vcpkg/ports/cryptopp/patch.patch | 32 +- .../vcpkg/ports/cryptopp/vcpkg.json | 1 + external_imported/vcpkg/ports/ctp/vcpkg.json | 4 +- .../vcpkg/ports/ctre/portfile.cmake | 4 +- external_imported/vcpkg/ports/ctre/vcpkg.json | 3 +- .../vcpkg/ports/cubeb/portfile.cmake | 23 + .../vcpkg/ports/cubeb/vcpkg.json | 18 + external_imported/vcpkg/ports/cuda/vcpkg.json | 2 +- .../vcpkg/ports/cuda/vcpkg_find_cuda.cmake | 2 + .../vcpkg/ports/cudnn/FindCUDNN.cmake | 4 +- .../vcpkg/ports/cudnn/portfile.cmake | 22 +- .../vcpkg/ports/cudnn/vcpkg.json | 2 +- .../vcpkg/ports/cunit/CMakeLists.txt | 33 +- .../vcpkg/ports/cunit/portfile.cmake | 26 +- .../vcpkg/ports/cunit/vcpkg.json | 17 +- .../ports/curl/0012-fix-dependency-idn2.patch | 10 +- .../vcpkg/ports/curl/portfile.cmake | 25 +- external_imported/vcpkg/ports/curl/vcpkg.json | 13 +- .../vcpkg/ports/czmq/portfile.cmake | 6 + external_imported/vcpkg/ports/czmq/vcpkg.json | 1 + .../vcpkg/ports/darknet/portfile.cmake | 4 +- .../vcpkg/ports/darknet/vcpkg.json | 1 + ...le_unit_tests_examples_and_tutorials.patch | 19 +- .../vcpkg/ports/dartsim/portfile.cmake | 13 +- .../vcpkg/ports/dartsim/vcpkg.json | 9 +- .../ports/dav1d/patch_underscore_prefix.patch | 13 - .../vcpkg/ports/dav1d/portfile.cmake | 8 +- .../vcpkg/ports/dav1d/vcpkg.json | 4 +- .../ports/daw-header-libraries/portfile.cmake | 4 +- .../ports/daw-header-libraries/vcpkg.json | 3 +- .../vcpkg/ports/daw-json-link/portfile.cmake | 4 +- .../vcpkg/ports/daw-json-link/vcpkg.json | 3 +- .../vcpkg/ports/daw-utf-range/portfile.cmake | 4 +- .../vcpkg/ports/daw-utf-range/vcpkg.json | 3 +- .../vcpkg/ports/dbow3/fix_cmake.patch | 2405 +++++------ .../vcpkg/ports/dbow3/portfile.cmake | 20 +- .../vcpkg/ports/dbow3/vcpkg.json | 17 +- .../vcpkg/ports/dbus/cmake.dep.patch | 15 + .../vcpkg/ports/dbus/getpeereid.patch | 26 + .../vcpkg/ports/dbus/pkgconfig.patch | 17 + .../vcpkg/ports/dbus/portfile.cmake | 65 + .../vcpkg/ports/dbus/rdynamic.patch | 15 + .../vcpkg/ports/dbus/rt_pc_link.patch | 27 + external_imported/vcpkg/ports/dbus/vcpkg.json | 21 + .../vcpkg/ports/dcmtk/portfile.cmake | 119 +- .../vcpkg/ports/dcmtk/vcpkg.json | 55 +- .../vcpkg/ports/dcmtk/windows-patch.patch | 32 + external_imported/vcpkg/ports/detours/usage | 7 + .../vcpkg/ports/detours/vcpkg.json | 4 +- .../ports/devicenameresolver/portfile.cmake | 2 - .../vcpkg/ports/devicenameresolver/vcpkg.json | 5 +- .../directx-dxc/directx-dxc-config.cmake.in | 29 + .../vcpkg/ports/directx-dxc/portfile.cmake | 52 + .../vcpkg/ports/directx-dxc/vcpkg.json | 9 + .../ports/directx-headers/portfile.cmake | 15 +- .../vcpkg/ports/directx-headers/vcpkg.json | 17 +- .../vcpkg/ports/directxmath/portfile.cmake | 6 +- .../vcpkg/ports/directxmath/vcpkg.json | 2 +- .../vcpkg/ports/directxmesh/portfile.cmake | 14 +- .../vcpkg/ports/directxmesh/vcpkg.json | 2 +- .../directxtex/enable_openexr_support.patch | 65 + .../vcpkg/ports/directxtex/portfile.cmake | 35 +- .../vcpkg/ports/directxtex/vcpkg.json | 3 +- .../vcpkg/ports/directxtk/portfile.cmake | 26 +- .../vcpkg/ports/directxtk/vcpkg.json | 4 +- .../vcpkg/ports/directxtk12/portfile.cmake | 32 +- .../vcpkg/ports/directxtk12/vcpkg.json | 25 +- .../vcpkg/ports/discordcoreapi/portfile.cmake | 14 +- .../vcpkg/ports/discordcoreapi/vcpkg.json | 8 +- .../vcpkg/ports/dlfcn-win32/portfile.cmake | 4 +- .../vcpkg/ports/dlfcn-win32/vcpkg.json | 4 +- .../vcpkg/ports/dlib/fix-dependencies.patch | 80 + .../ports/dlib/fix-sqlite3-fftw-linkage.patch | 57 - .../ports/dlib/force_finding_packages.patch | 44 - .../vcpkg/ports/dlib/portfile.cmake | 29 +- external_imported/vcpkg/ports/dlib/vcpkg.json | 3 +- .../vcpkg/ports/doctest/portfile.cmake | 19 +- .../vcpkg/ports/doctest/vcpkg.json | 15 +- .../vcpkg/ports/dpdk/CMakeLists.txt | 63 - .../vcpkg/ports/dpdk/FindNuma.cmake | 26 - .../vcpkg/ports/dpdk/dpdkConfig.cmake | 31 - ...enable-either-static-or-shared-build.patch | 81 + .../vcpkg/ports/dpdk/fix-dependencies.patch | 65 + .../ports/dpdk/no-absolute-driver-path.patch | 13 + .../vcpkg/ports/dpdk/portfile.cmake | 125 +- .../remove-examples-src-from-datadir.patch | 17 + .../vcpkg/ports/dpdk/stop-building-apps.patch | 13 + external_imported/vcpkg/ports/dpdk/usage | 10 +- external_imported/vcpkg/ports/dpdk/vcpkg.json | 40 +- .../ports/dpp/make-pkgconfig-required.patch | 16 + .../vcpkg/ports/dpp/portfile.cmake | 34 + external_imported/vcpkg/ports/dpp/usage | 3 + external_imported/vcpkg/ports/dpp/vcpkg.json | 23 + .../ports/draco/fix-compile-error-uwp.patch | 32 +- .../vcpkg/ports/draco/portfile.cmake | 4 +- .../vcpkg/ports/draco/vcpkg.json | 3 +- .../vcpkg/ports/drlibs/portfile.cmake | 4 +- .../vcpkg/ports/drlibs/vcpkg.json | 2 +- .../vcpkg/ports/drogon/portfile.cmake | 9 +- .../vcpkg/ports/drogon/redis.patch | 66 + .../vcpkg/ports/drogon/static-brotli.patch | 17 - .../vcpkg/ports/drogon/use-libmariadb.patch | 31 - .../vcpkg/ports/drogon/vcpkg.json | 2 +- .../vcpkg/ports/drogon/vcpkg.patch | 3 +- .../vcpkg/ports/dstorage/portfile.cmake | 16 +- .../vcpkg/ports/dstorage/vcpkg.json | 5 +- .../vcpkg/ports/duckx/fix_dependencies.patch | 66 + .../vcpkg/ports/duckx/portfile.cmake | 26 +- .../vcpkg/ports/duckx/vcpkg.json | 17 +- .../vcpkg/ports/dv-processing/portfile.cmake | 41 + .../vcpkg/ports/dv-processing/vcpkg.json | 34 + .../vcpkg/ports/dxsdk-d3dx/vcpkg.json | 4 +- .../vcpkg/ports/dxut/portfile.cmake | 20 +- external_imported/vcpkg/ports/dxut/vcpkg.json | 23 +- .../vcpkg/ports/eastl/fix-error-C2039.diff | 88 + .../vcpkg/ports/eastl/portfile.cmake | 3 +- .../vcpkg/ports/eastl/vcpkg.json | 2 +- .../vcpkg/ports/edflib/CMakeLists.txt | 64 + .../vcpkg/ports/edflib/portfile.cmake | 41 + .../vcpkg/ports/edflib/vcpkg.json | 22 + .../vcpkg/ports/effects11/portfile.cmake | 15 +- .../vcpkg/ports/effects11/vcpkg.json | 15 +- .../ports/effolkronium-random/portfile.cmake | 4 +- .../ports/effolkronium-random/vcpkg.json | 4 +- .../vcpkg/ports/elfutils/portfile.cmake | 6 + .../vcpkg/ports/elfutils/vcpkg.json | 2 +- .../vcpkg/ports/embree2/cmake_policy.patch | 14 - .../vcpkg/ports/embree2/portfile.cmake | 53 - .../vcpkg/ports/embree2/vcpkg.json | 15 - .../vcpkg/ports/entt/portfile.cmake | 15 +- external_imported/vcpkg/ports/entt/vcpkg.json | 4 +- .../vcpkg/ports/epsilon/portfile.cmake | 13 +- .../vcpkg/ports/epsilon/vcpkg.json | 5 +- .../vcpkg/ports/ereignis/portfile.cmake | 14 + .../vcpkg/ports/ereignis/vcpkg.json | 13 + .../vcpkg/ports/eve/portfile.cmake | 6 +- external_imported/vcpkg/ports/eve/vcpkg.json | 5 +- .../evpp/Add-static-shared-handling.patch | 98 + .../ports/evpp/Export-unofficial-target.patch | 168 + .../vcpkg/ports/evpp/compile-features.patch | 31 + .../vcpkg/ports/evpp/portfile.cmake | 19 +- external_imported/vcpkg/ports/evpp/vcpkg.json | 22 +- .../vcpkg/ports/expected-lite/portfile.cmake | 4 +- .../vcpkg/ports/expected-lite/vcpkg.json | 3 +- .../ezfoundation/ezFoundation_vcpkg.patch | 185 + .../vcpkg/ports/ezfoundation/portfile.cmake | 62 + .../vcpkg/ports/ezfoundation/vcpkg.json | 18 + .../vcpkg/ports/fakeit/portfile.cmake | 4 +- .../vcpkg/ports/fakeit/vcpkg.json | 2 +- .../vcpkg/ports/fann/portfile.cmake | 22 +- external_imported/vcpkg/ports/fann/vcpkg.json | 11 +- .../vcpkg/ports/fast-float/portfile.cmake | 6 +- .../vcpkg/ports/fast-float/vcpkg.json | 3 +- .../vcpkg/ports/fastcgi/dll.patch | 109 + .../vcpkg/ports/fastcgi/portfile.cmake | 84 +- .../vcpkg/ports/fastcgi/vcpkg.json | 5 +- .../ports/fastrtps/disable-symlink.patch | 18 +- .../vcpkg/ports/fastrtps/portfile.cmake | 9 +- .../vcpkg/ports/fastrtps/vcpkg.json | 3 +- .../ports/fawdlstty-libfv/portfile.cmake | 21 + .../vcpkg/ports/fawdlstty-libfv/vcpkg.json | 15 + ...-fix-compatibility-with-boost-1.79.0.patch | 60 + .../vcpkg/ports/fbthrift/fix-glog.patch | 14 + .../vcpkg/ports/fbthrift/portfile.cmake | 3 + .../vcpkg/ports/fbthrift/vcpkg.json | 1 + .../ports/ffmpeg/0004-fix-debug-build.patch | 2 +- .../ffmpeg/0020-fix-aarch64-libswscale.patch | 28 + .../ffmpeg/0021-fix-sdl2-version-check.patch | 13 + .../vcpkg/ports/ffmpeg/portfile.cmake | 9 + .../vcpkg/ports/ffmpeg/vcpkg.json | 4 +- .../vcpkg/ports/fftw3/bigobj.patch | 13 + .../vcpkg/ports/fftw3/portfile.cmake | 1 + .../vcpkg/ports/fftw3/vcpkg.json | 2 +- .../vcpkg/ports/fixed-string/portfile.cmake | 17 +- .../vcpkg/ports/fixed-string/vcpkg.json | 16 +- .../vcpkg/ports/flann/portfile.cmake | 1 + .../vcpkg/ports/flann/vcpkg.json | 2 +- .../vcpkg/ports/flashlight-cpu/vcpkg.json | 11 +- .../vcpkg/ports/flashlight-cuda/vcpkg.json | 11 +- .../vcpkg/ports/flat/portfile.cmake | 15 + external_imported/vcpkg/ports/flat/vcpkg.json | 7 + .../vcpkg/ports/flatbuffers/portfile.cmake | 4 +- .../vcpkg/ports/flatbuffers/vcpkg.json | 4 +- .../vcpkg/ports/flecs/portfile.cmake | 37 + .../ports/flecs/vcpkg-cmake-wrapper.cmake | 9 + .../vcpkg/ports/flecs/vcpkg.json | 18 + .../vcpkg/ports/fltk/portfile.cmake | 13 +- external_imported/vcpkg/ports/fltk/vcpkg.json | 6 +- .../ports/fluidsynth/fix-dependencies.patch | 10 +- ...parate-gentables.patch => gentables.patch} | 48 +- .../vcpkg/ports/fluidsynth/portfile.cmake | 55 +- .../vcpkg/ports/fluidsynth/vcpkg.json | 19 +- .../vcpkg/ports/fmt/fix-format-conflict.patch | 15 + .../vcpkg/ports/fmt/fix-invalid-command.patch | 11 - .../vcpkg/ports/fmt/portfile.cmake | 6 +- external_imported/vcpkg/ports/fmt/vcpkg.json | 4 +- .../vcpkg/ports/folly/portfile.cmake | 8 +- .../ports/folly/vcpkg-cmake-wrapper.cmake | 6 + .../vcpkg/ports/folly/vcpkg.json | 2 +- .../vcpkg/ports/font-util/build.patch | 33 + .../vcpkg/ports/font-util/portfile.cmake | 56 + .../vcpkg/ports/font-util/vcpkg.json | 10 + .../fontconfig/fix-mingw-gperf-fallback.patch | 13 + .../fix-preprocessor-clang-cl.patch | 13 + .../vcpkg/ports/fontconfig/libgetopt.patch | 130 + .../vcpkg/ports/fontconfig/portfile.cmake | 7 +- .../vcpkg/ports/fontconfig/vcpkg.json | 6 + .../vcpkg/ports/fplus/portfile.cmake | 18 +- .../vcpkg/ports/fplus/vcpkg.json | 11 +- .../vcpkg/ports/freealut/portfile.cmake | 20 +- .../vcpkg/ports/freealut/vcpkg.json | 3 +- .../vcpkg/ports/freeimage/CMakeLists.txt | 4 +- .../vcpkg/ports/freeimage/portfile.cmake | 1 + .../ports/freeimage/remove_auto_ptr.patch | 35 + .../freeimage/use-external-openexr.patch | 32 +- .../vcpkg/ports/freeimage/vcpkg.json | 4 +- .../ports/freerdp/fix-include-path.patch | 12 +- .../vcpkg/ports/freerdp/portfile.cmake | 4 +- .../vcpkg/ports/freerdp/vcpkg.json | 2 +- .../vcpkg/ports/freetds/disable-tests.patch | 94 + .../vcpkg/ports/freetds/portfile.cmake | 75 +- .../vcpkg/ports/freetds/vcpkg.json | 26 +- ...o-dependencies-also-for-static-build.patch | 43 + .../0002-Remove-duplicate-installs.patch | 31 + .../ports/freetype-gl/0003-Add-exports.patch | 34 + ...004-Change-install-dir-for-pkgconfig.patch | 25 + .../ports/freetype-gl/0005-add-version.patch | 11 + .../vcpkg/ports/freetype-gl/glew.patch | 13 - .../vcpkg/ports/freetype-gl/portfile.cmake | 56 +- .../vcpkg/ports/freetype-gl/vcpkg.json | 12 +- .../vcpkg/ports/freetype/bzip2.patch | 13 + .../vcpkg/ports/freetype/error-strings.patch | 37 + .../vcpkg/ports/freetype/fix-bzip2-pc.patch | 13 - .../vcpkg/ports/freetype/fix-exports.patch | 12 +- .../vcpkg/ports/freetype/portfile.cmake | 46 +- .../vcpkg/ports/freetype/vcpkg.json | 8 +- .../vcpkg/ports/freexl/portfile.cmake | 62 +- .../vcpkg/ports/freexl/vcpkg.json | 3 +- .../vcpkg/ports/fribidi/portfile.cmake | 4 +- .../vcpkg/ports/fribidi/vcpkg.json | 3 +- .../vcpkg/ports/frozen/portfile.cmake | 10 +- .../vcpkg/ports/frozen/vcpkg.json | 3 +- .../ports/ftgl/Fix-headersFilePath.patch | 23 - .../vcpkg/ports/ftgl/portfile.cmake | 7 +- external_imported/vcpkg/ports/ftgl/vcpkg.json | 5 +- .../vcpkg/ports/ftxui/portfile.cmake | 4 +- .../vcpkg/ports/ftxui/vcpkg.json | 3 +- .../vcpkg/ports/fuzzylite/no-werror.patch | 13 + .../vcpkg/ports/fuzzylite/portfile.cmake | 2 + .../vcpkg/ports/fuzzylite/vcpkg.json | 2 +- .../vcpkg/ports/gainput/fix-build.patch | 5 +- .../vcpkg/ports/gainput/vcpkg.json | 2 +- .../ports/gamedev-framework/portfile.cmake | 17 +- .../vcpkg/ports/gamedev-framework/vcpkg.json | 11 +- .../gamenetworkingsockets/portfile.cmake | 15 +- .../ports/gamenetworkingsockets/vcpkg.json | 12 +- .../vcpkg/ports/gamma/vcpkg.json | 11 +- .../vcpkg/ports/gazebo/fix-tbb.patch | 443 ++ .../vcpkg/ports/gazebo/portfile.cmake | 23 +- .../vcpkg/ports/gazebo/vcpkg.json | 1 + .../vcpkg/ports/gcem/portfile.cmake | 19 +- external_imported/vcpkg/ports/gcem/vcpkg.json | 17 +- .../ports/gdal/0001-Fix-debug-crt-flags.patch | 43 - .../vcpkg/ports/gdal/0002-Fix-build.patch | 38 - .../vcpkg/ports/gdal/0004-Fix-cfitsio.patch | 13 - .../vcpkg/ports/gdal/0005-Fix-configure.patch | 315 -- .../ports/gdal/0006-Fix-mingw-dllexport.patch | 13 - .../vcpkg/ports/gdal/0007-Control-tools.patch | 83 - .../gdal/0008-Fix-absl-string_view.patch | 13 - .../vcpkg/ports/gdal/0009-atlbase.patch | 72 - .../vcpkg/ports/gdal/0010-symprefix.patch | 13 - .../vcpkg/ports/gdal/dependency_win.cmake | 219 - .../ports/gdal/find-link-libraries.patch | 109 + .../gdal/fix-gdal-target-interfaces.patch | 15 + .../vcpkg/ports/gdal/portfile.cmake | 482 +-- external_imported/vcpkg/ports/gdal/usage | 5 +- .../ports/gdal/vcpkg-cmake-wrapper.cmake | 166 +- external_imported/vcpkg/ports/gdal/vcpkg.json | 164 +- .../vcpkg/ports/gdcm/portfile.cmake | 4 +- external_imported/vcpkg/ports/gdcm/vcpkg.json | 4 +- .../vcpkg/ports/gdk-pixbuf/fix_build.patch | 67 - .../gdk-pixbuf/fix_build_error_windows.patch | 6 +- .../vcpkg/ports/gdk-pixbuf/portfile.cmake | 55 +- .../vcpkg/ports/gdk-pixbuf/vcpkg.json | 7 +- .../geographiclib/cxx-library-only.patch | 139 - .../vcpkg/ports/geographiclib/portfile.cmake | 82 +- .../vcpkg/ports/geographiclib/vcpkg.json | 14 +- .../ports/geos/disable-warning-4996.patch | 4 +- .../ports/geos/fix-exported-config.patch | 12 +- .../vcpkg/ports/geos/fix_clang-cl.patch | 97 + .../vcpkg/ports/geos/install-hpp-files.patch | 13 - .../vcpkg/ports/geos/portfile.cmake | 51 +- external_imported/vcpkg/ports/geos/vcpkg.json | 6 +- .../vcpkg/ports/getopt-win32/CMakeLists.txt | 11 + .../vcpkg/ports/getopt-win32/portfile.cmake | 35 +- .../vcpkg/ports/getopt-win32/vcpkg.json | 14 +- .../vcpkg/ports/getopt/vcpkg.json | 4 +- .../vcpkg/ports/gklib/build-fixes.patch | 87 + .../vcpkg/ports/gklib/fix-mingw.patch | 32 + .../vcpkg/ports/gklib/portfile.cmake | 26 + .../vcpkg/ports/gklib/vcpkg.json | 18 + .../vcpkg/ports/glad/portfile.cmake | 8 +- external_imported/vcpkg/ports/glad/vcpkg.json | 9 +- .../vcpkg/ports/glfw3/portfile.cmake | 4 +- .../vcpkg/ports/glfw3/vcpkg.json | 2 +- .../vcpkg/ports/glib/libintl.patch | 23 +- .../vcpkg/ports/glib/portfile.cmake | 56 +- external_imported/vcpkg/ports/glib/vcpkg.json | 6 +- .../ports/glog/fix_cplusplus_macro.patch | 15 + .../glog/fix_crosscompile_symbolize.patch | 22 + .../glog/fix_glog_CMAKE_MODULE_PATH.patch | 70 +- .../vcpkg/ports/glog/fix_log_every_n.patch | 848 ---- .../glog/glog_disable_debug_postfix.patch | 26 +- .../vcpkg/ports/glog/nogdi-nominmax.patch | 59 - .../vcpkg/ports/glog/portfile.cmake | 18 +- external_imported/vcpkg/ports/glog/vcpkg.json | 12 +- .../always-install-resource-limits.patch | 13 - .../vcpkg/ports/glslang/glslang-config.cmake | 7 - .../vcpkg/ports/glslang/portfile.cmake | 15 +- external_imported/vcpkg/ports/glslang/usage | 4 + .../vcpkg/ports/glslang/vcpkg.json | 2 +- .../vcpkg/ports/gmp/portfile.cmake | 10 +- external_imported/vcpkg/ports/gmp/usage | 11 + external_imported/vcpkg/ports/gmp/vcpkg.json | 4 +- .../0003-fix-paths.patch | 22 + .../gobject-introspection/portfile.cmake | 12 +- .../ports/gobject-introspection/python.patch | 29 + .../ports/gobject-introspection/vcpkg.json | 3 +- .../ports/google-cloud-cpp/portfile.cmake | 41 +- .../google-cloud-cpp/support_absl_cxx17.patch | 20 +- .../vcpkg/ports/google-cloud-cpp/vcpkg.json | 125 +- .../vcpkg/ports/gperf/portfile.cmake | 6 +- .../vcpkg/ports/gperf/vcpkg.json | 14 +- .../vcpkg/ports/gpgmm/portfile.cmake | 30 + .../vcpkg/ports/gpgmm/vcpkg.json | 18 + .../vcpkg/ports/gppanel/portfile.cmake | 15 +- .../ports/gppanel/use-complex-header.patch | 14 + .../vcpkg/ports/gppanel/vcpkg.json | 11 +- .../vcpkg/ports/graphene/fix_clang-cl.patch | 40 + .../vcpkg/ports/graphene/portfile.cmake | 2 + .../vcpkg/ports/graphene/vcpkg.json | 2 +- .../vcpkg/ports/graphviz/vcpkg.json | 3 +- .../vcpkg/ports/grpc/00001-fix-uwp.patch | 22 +- .../grpc/00004-link-gdi32-on-windows.patch | 8 +- .../ports/grpc/00005-fix-uwp-error.patch | 23 +- .../ports/grpc/00006-fix-uwp-error.patch | 13 - .../ports/grpc/00009-use-system-upb.patch | 51 +- .../grpc/00010-add-feature-absl-sync.patch | 33 - .../ports/grpc/00011-fix-csharp_plugin.patch | 33 - .../ports/grpc/00012-fix-use-cxx17.patch | 16 +- .../ports/grpc/00013-build-upbdefs.patch | 28 - .../ports/grpc/00014-pkgconfig-upbdefs.patch | 8 +- .../grpc/00015-disable-download-archive.patch | 12 + .../vcpkg/ports/grpc/portfile.cmake | 24 +- external_imported/vcpkg/ports/grpc/vcpkg.json | 5 +- .../vcpkg/ports/grppi/portfile.cmake | 29 +- external_imported/vcpkg/ports/grppi/tbb.patch | 24 + .../vcpkg/ports/grppi/vcpkg.json | 21 +- .../vcpkg/ports/gsl/CMakeLists.txt | 3 + .../vcpkg/ports/gsl/portfile.cmake | 2 + external_imported/vcpkg/ports/gsl/vcpkg.json | 2 + .../ports/gstreamer/fix-clang-cl-bad.patch | 111 + .../ports/gstreamer/fix-clang-cl-base.patch | 22 + .../ports/gstreamer/fix-clang-cl-good.patch | 22 + .../gstreamer/fix-clang-cl-gstreamer.patch | 57 + .../ports/gstreamer/fix-clang-cl-ugly.patch | 13 + .../vcpkg/ports/gstreamer/fix-clang-cl.patch | 22 + .../ports/gstreamer/plugins-base-x11.patch | 13 + .../vcpkg/ports/gstreamer/portfile.cmake | 35 +- .../vcpkg/ports/gstreamer/vcpkg.json | 17 +- .../vcpkg/ports/gtest/portfile.cmake | 6 +- .../vcpkg/ports/gtest/remove-werror.patch | 20 - .../vcpkg/ports/gtest/vcpkg.json | 3 +- .../vcpkg/ports/gtk/0001-build.patch | 8 +- .../vcpkg/ports/gtk/portfile.cmake | 12 +- external_imported/vcpkg/ports/gtk/vcpkg.json | 16 +- .../vcpkg/ports/gtl/portfile.cmake | 8 +- external_imported/vcpkg/ports/gtl/vcpkg.json | 3 +- .../vcpkg/ports/gts/CMakeLists.txt | 43 + .../vcpkg/ports/gts/fix-M_PI-in-windows.patch | 28 - .../vcpkg/ports/gts/fix-dllexport.patch | 13 + .../vcpkg/ports/gts/fix-dllexport_2.patch | 13 + .../vcpkg/ports/gts/fix-pkgconfig.patch | 28 - .../vcpkg/ports/gts/fix_missing_extern.patch | 13 + external_imported/vcpkg/ports/gts/glib2.patch | 54 - .../vcpkg/ports/gts/portfile.cmake | 39 +- .../vcpkg/ports/gts/predicates_init.h | 26 + .../vcpkg/ports/gts/support-unix.patch | 190 - external_imported/vcpkg/ports/gts/usage | 6 + external_imported/vcpkg/ports/gts/vcpkg.json | 13 +- .../vcpkg/ports/guile/portfile.cmake | 25 + .../vcpkg/ports/guile/vcpkg.json | 22 + .../vcpkg/ports/guilite/portfile.cmake | 7 +- .../vcpkg/ports/guilite/vcpkg.json | 5 +- .../vcpkg/ports/gul14/portfile.cmake | 24 + .../vcpkg/ports/gul14/vcpkg.json | 19 + .../vcpkg/ports/gumbo/CMakeLists.txt | 10 +- .../vcpkg/ports/gumbo/portfile.cmake | 22 +- .../vcpkg/ports/gumbo/vcpkg.json | 17 +- .../vcpkg/ports/halide/portfile.cmake | 6 +- .../vcpkg/ports/halide/vcpkg.json | 2 +- .../vcpkg/ports/hareflow/portfile.cmake | 23 + .../vcpkg/ports/hareflow/vcpkg.json | 42 + .../0001-circumvent-samefile-error.patch | 42 - .../ports/harfbuzz/0002-fix-uwp-build.patch | 15 - .../vcpkg/ports/harfbuzz/fix-macos-build.diff | 43 - .../ports/harfbuzz/fix-win32-build.patch | 26 + .../ports/harfbuzz/harfbuzzConfig.cmake.in | 28 +- .../vcpkg/ports/harfbuzz/portfile.cmake | 43 +- .../vcpkg/ports/harfbuzz/vcpkg.json | 6 +- .../ports/hash-library/001-fix-macos.patch | 98 + .../vcpkg/ports/hash-library/CMakeLists.txt | 48 + .../vcpkg/ports/hash-library/portfile.cmake | 26 + .../vcpkg/ports/hash-library/vcpkg.json | 18 + .../vcpkg/ports/hdf5/hdf5_config.patch | 6 +- .../vcpkg/ports/hdf5/portfile.cmake | 30 +- external_imported/vcpkg/ports/hdf5/vcpkg.json | 5 +- .../vcpkg/ports/hexl/portfile.cmake | 31 +- external_imported/vcpkg/ports/hexl/vcpkg.json | 6 +- .../vcpkg/ports/hidapi/portfile.cmake | 6 +- .../vcpkg/ports/hidapi/vcpkg.json | 3 +- .../ports/highfive/fix_compiler_flags.patch | 14 + .../vcpkg/ports/highfive/portfile.cmake | 1 + .../vcpkg/ports/highfive/vcpkg.json | 2 +- .../vcpkg/ports/hiredis/portfile.cmake | 15 +- .../vcpkg/ports/hiredis/vcpkg.json | 3 +- .../ports/hpx/fix-cmakecache-paths.patch | 22 - .../vcpkg/ports/hpx/fix-debug.patch | 21 + .../vcpkg/ports/hpx/fix-export.patch | 24 + .../ports/hpx/fix_output_name_clash.patch | 13 + .../vcpkg/ports/hpx/format.patch | 12 + .../vcpkg/ports/hpx/portfile.cmake | 80 +- external_imported/vcpkg/ports/hpx/usage | 4 + external_imported/vcpkg/ports/hpx/vcpkg.json | 48 +- .../hunspell/0005-autotools-subdirs.patch | 36 + .../vcpkg/ports/hunspell/portfile.cmake | 74 +- .../vcpkg/ports/hunspell/vcpkg.json | 13 +- .../vcpkg/ports/hwloc/portfile.cmake | 4 +- .../vcpkg/ports/hwloc/vcpkg.json | 2 +- .../vcpkg/ports/hyperscan/portfile.cmake | 17 +- .../vcpkg/ports/hyperscan/vcpkg.json | 10 +- .../ports/icu/check-autoconf-archive.patch | 14 + .../vcpkg/ports/icu/portfile.cmake | 5 +- external_imported/vcpkg/ports/icu/vcpkg.json | 3 +- .../vcpkg/ports/ideviceinstaller/vcpkg.json | 3 +- .../ports/ignition-cmake0/portfile.cmake | 18 +- .../vcpkg/ports/ignition-cmake0/vcpkg.json | 10 +- ...kgconfig-and-remove-privatefor-limit.patch | 48 + .../ports/ignition-cmake2/portfile.cmake | 10 +- .../vcpkg/ports/ignition-cmake2/vcpkg.json | 8 +- .../ports/ignition-common1/portfile.cmake | 4 +- .../vcpkg/ports/ignition-common1/vcpkg.json | 9 +- .../ignition-common3/fix-dependencies.patch | 81 + .../ports/ignition-common3/portfile.cmake | 6 +- .../vcpkg/ports/ignition-common3/vcpkg.json | 10 +- .../ports/ignition-fuel-tools1/portfile.cmake | 4 +- .../ports/ignition-fuel-tools1/vcpkg.json | 9 +- .../ports/ignition-fuel-tools4/portfile.cmake | 4 +- .../ports/ignition-fuel-tools4/vcpkg.json | 10 +- .../vcpkg/ports/ignition-math4/portfile.cmake | 4 +- .../vcpkg/ports/ignition-math4/vcpkg.json | 11 +- .../vcpkg/ports/ignition-math6/portfile.cmake | 4 +- .../vcpkg/ports/ignition-math6/vcpkg.json | 10 +- .../ignition-modularscripts/portfile.cmake | 11 +- ..._library.cmake => vcpkg-port-config.cmake} | 37 +- .../ports/ignition-modularscripts/vcpkg.json | 5 +- .../ignition-msgs1/fix-Add_std_string.patch | 29 + .../vcpkg/ports/ignition-msgs1/portfile.cmake | 8 +- .../vcpkg/ports/ignition-msgs1/vcpkg.json | 9 +- .../ignition-msgs5/02-Add_std_string.patch | 29 + .../vcpkg/ports/ignition-msgs5/portfile.cmake | 7 +- .../vcpkg/ports/ignition-msgs5/vcpkg.json | 8 +- .../ignition-msgs6/01-Add_std_string.patch | 29 + .../vcpkg/ports/ignition-msgs6/portfile.cmake | 5 +- .../vcpkg/ports/ignition-msgs6/vcpkg.json | 8 +- .../ports/ignition-plugin1/portfile.cmake | 4 +- .../vcpkg/ports/ignition-plugin1/vcpkg.json | 10 +- .../ports/ignition-transport4/portfile.cmake | 4 +- .../ports/ignition-transport4/vcpkg.json | 8 +- .../ports/ignition-transport8/portfile.cmake | 6 +- .../ports/ignition-transport8/vcpkg.json | 9 +- .../ports/ignition-transport9/portfile.cmake | 4 +- .../ports/ignition-transport9/vcpkg.json | 7 +- .../vcpkg/ports/igraph/glpk-uwp.patch | 13 + .../vcpkg/ports/igraph/portfile.cmake | 20 +- .../vcpkg/ports/igraph/vcpkg.json | 5 +- .../vcpkg/ports/iir1/fix-shared-static.patch | 42 + .../vcpkg/ports/iir1/portfile.cmake | 8 +- external_imported/vcpkg/ports/iir1/vcpkg.json | 3 +- .../vcpkg/ports/ijg-libjpeg/CMakeLists.txt | 6 +- .../vcpkg/ports/ijg-libjpeg/portfile.cmake | 27 +- .../vcpkg/ports/ijg-libjpeg/vcpkg.json | 15 +- .../vcpkg/ports/ilmbase/vcpkg.json | 7 +- .../vcpkg/ports/imgui-sfml/portfile.cmake | 2 + .../vcpkg/ports/imgui-sfml/vcpkg.json | 1 + .../vcpkg/ports/imgui/CMakeLists.txt | 2 + .../vcpkg/ports/imgui/portfile.cmake | 12 +- .../vcpkg/ports/imgui/vcpkg.json | 21 +- .../vcpkg/ports/implot/portfile.cmake | 4 +- .../vcpkg/ports/implot/vcpkg.json | 2 +- .../influxdb-cxx/include-stringview.patch | 12 - .../vcpkg/ports/influxdb-cxx/portfile.cmake | 5 +- .../vcpkg/ports/influxdb-cxx/vcpkg.json | 4 +- .../vcpkg/ports/inih/CMakeLists.txt | 59 +- .../vcpkg/ports/inih/portfile.cmake | 32 +- external_imported/vcpkg/ports/inih/vcpkg.json | 22 +- .../vcpkg/ports/iniparser/vcpkg.json | 7 +- .../vcpkg/ports/intelrdfpmathlib/vcpkg.json | 3 +- .../vcpkg/ports/isal/CMakeLists.txt | 51 - .../vcpkg/ports/isal/isalConfig.cmake | 30 +- .../vcpkg/ports/isal/osx-asm-sysroot.patch | 32 + .../vcpkg/ports/isal/portfile.cmake | 125 +- .../ports/isal/unofficial-isal-config.cmake | 18 + external_imported/vcpkg/ports/isal/usage | 7 +- external_imported/vcpkg/ports/isal/vcpkg.json | 8 +- .../vcpkg/ports/ixwebsocket/portfile.cmake | 18 +- .../vcpkg/ports/ixwebsocket/vcpkg.json | 2 +- .../vcpkg/ports/jack2/portfile.cmake | 6 +- .../vcpkg/ports/jack2/vcpkg.json | 4 +- .../ports/jansson/fix-linker-flags.patch | 13 + .../vcpkg/ports/jansson/portfile.cmake | 40 +- .../vcpkg/ports/jansson/vcpkg.json | 17 +- .../vcpkg/ports/jasper/vcpkg.json | 25 +- .../vcpkg/ports/jemalloc/fix-cmakelists.patch | 67 - .../ports/jemalloc/fix-configure-ac.patch | 13 + .../ports/jemalloc/fix-static-build.patch | 25 - .../vcpkg/ports/jemalloc/fix-utilities.patch | 30 - .../vcpkg/ports/jemalloc/portfile.cmake | 65 +- .../vcpkg/ports/jemalloc/preprocessor.patch | 12 + .../vcpkg/ports/jemalloc/vcpkg.json | 7 +- .../vcpkg/ports/json-c/fix-clang-cl.patch | 22 + .../vcpkg/ports/json-c/portfile.cmake | 20 +- .../vcpkg/ports/json-c/vcpkg.json | 15 +- .../vcpkg/ports/jsoncons/portfile.cmake | 19 +- .../vcpkg/ports/jsoncons/vcpkg.json | 16 +- .../0003-use-upstream-nlohmann-json.patch | 4 +- .../ports/jsonnet/0004-incorporate-md5.patch | 11 +- .../jsonnet/0005-use-upstream-rapidyaml.patch | 47 + .../vcpkg/ports/jsonnet/001-enable-msvc.patch | 5 +- .../002-fix-dependency-and-install.patch | 10 +- .../vcpkg/ports/jsonnet/portfile.cmake | 17 +- .../vcpkg/ports/jsonnet/vcpkg.json | 6 +- .../vcpkg/ports/jwt-cpp/portfile.cmake | 4 +- .../vcpkg/ports/jwt-cpp/vcpkg.json | 4 +- .../vcpkg/ports/jxrlib/portfile.cmake | 19 +- .../vcpkg/ports/jxrlib/vcpkg.json | 11 +- .../vcpkg/ports/kangaru/portfile.cmake | 32 +- .../vcpkg/ports/kangaru/vcpkg.json | 22 +- .../vcpkg/ports/kf5archive/portfile.cmake | 3 +- .../vcpkg/ports/kf5archive/vcpkg.json | 2 +- .../vcpkg/ports/kf5attica/portfile.cmake | 3 +- .../vcpkg/ports/kf5attica/vcpkg.json | 2 +- .../vcpkg/ports/kf5auth/portfile.cmake | 4 +- .../vcpkg/ports/kf5auth/vcpkg.json | 1 + .../vcpkg/ports/kf5bookmarks/portfile.cmake | 3 +- .../vcpkg/ports/kf5bookmarks/vcpkg.json | 1 + .../vcpkg/ports/kf5codecs/portfile.cmake | 7 +- .../vcpkg/ports/kf5codecs/vcpkg.json | 1 + .../vcpkg/ports/kf5completion/portfile.cmake | 3 +- .../vcpkg/ports/kf5completion/vcpkg.json | 1 + .../vcpkg/ports/kf5config/portfile.cmake | 5 +- .../vcpkg/ports/kf5config/vcpkg.json | 1 + .../ports/kf5configwidgets/portfile.cmake | 3 +- .../vcpkg/ports/kf5configwidgets/vcpkg.json | 1 + .../vcpkg/ports/kf5coreaddons/portfile.cmake | 5 +- .../vcpkg/ports/kf5coreaddons/vcpkg.json | 1 + .../vcpkg/ports/kf5crash/portfile.cmake | 3 +- .../vcpkg/ports/kf5crash/vcpkg.json | 1 + .../vcpkg/ports/kf5dbusaddons/portfile.cmake | 3 +- .../vcpkg/ports/kf5dbusaddons/vcpkg.json | 1 + .../vcpkg/ports/kf5declarative/portfile.cmake | 10 +- .../vcpkg/ports/kf5declarative/vcpkg.json | 1 + .../vcpkg/ports/kf5diagram/portfile.cmake | 3 +- .../vcpkg/ports/kf5diagram/vcpkg.json | 1 + .../kf5globalaccel/make_x11_required.patch | 28 + .../vcpkg/ports/kf5globalaccel/portfile.cmake | 11 +- .../vcpkg/ports/kf5globalaccel/vcpkg.json | 1 + .../vcpkg/ports/kf5guiaddons/portfile.cmake | 9 +- .../vcpkg/ports/kf5guiaddons/vcpkg.json | 6 +- .../vcpkg/ports/kf5holidays/portfile.cmake | 3 +- .../vcpkg/ports/kf5holidays/vcpkg.json | 1 + .../vcpkg/ports/kf5i18n/portfile.cmake | 3 +- .../vcpkg/ports/kf5i18n/vcpkg.json | 1 + .../vcpkg/ports/kf5iconthemes/portfile.cmake | 17 +- .../vcpkg/ports/kf5iconthemes/vcpkg.json | 1 + .../vcpkg/ports/kf5itemmodels/portfile.cmake | 3 +- .../vcpkg/ports/kf5itemmodels/vcpkg.json | 1 + .../vcpkg/ports/kf5itemviews/portfile.cmake | 3 +- .../vcpkg/ports/kf5itemviews/vcpkg.json | 1 + .../vcpkg/ports/kf5jobwidgets/portfile.cmake | 3 +- .../vcpkg/ports/kf5jobwidgets/vcpkg.json | 1 + .../vcpkg/ports/kf5kcmutils/portfile.cmake | 3 +- .../vcpkg/ports/kf5kcmutils/vcpkg.json | 1 + .../vcpkg/ports/kf5kio/portfile.cmake | 3 +- .../vcpkg/ports/kf5kio/vcpkg.json | 1 + .../vcpkg/ports/kf5newstuff/portfile.cmake | 5 +- .../vcpkg/ports/kf5newstuff/vcpkg.json | 1 + .../ports/kf5notifications/portfile.cmake | 3 +- .../vcpkg/ports/kf5notifications/vcpkg.json | 1 + .../vcpkg/ports/kf5package/portfile.cmake | 3 +- .../vcpkg/ports/kf5package/vcpkg.json | 1 + .../vcpkg/ports/kf5plotting/portfile.cmake | 3 +- .../vcpkg/ports/kf5plotting/vcpkg.json | 1 + .../vcpkg/ports/kf5service/portfile.cmake | 4 +- .../vcpkg/ports/kf5service/vcpkg.json | 1 + .../vcpkg/ports/kf5solid/portfile.cmake | 7 +- .../vcpkg/ports/kf5solid/vcpkg.json | 1 + .../vcpkg/ports/kf5sonnet/portfile.cmake | 3 +- .../vcpkg/ports/kf5sonnet/vcpkg.json | 1 + .../kf5syntaxhighlighting/portfile.cmake | 3 +- .../ports/kf5syntaxhighlighting/vcpkg.json | 1 + .../vcpkg/ports/kf5textwidgets/portfile.cmake | 3 +- .../vcpkg/ports/kf5textwidgets/vcpkg.json | 1 + .../vcpkg/ports/kf5wallet/portfile.cmake | 3 +- .../vcpkg/ports/kf5wallet/vcpkg.json | 1 + .../ports/kf5widgetsaddons/portfile.cmake | 3 +- .../vcpkg/ports/kf5widgetsaddons/vcpkg.json | 1 + .../ports/kf5windowsystem/portfile.cmake | 3 +- .../vcpkg/ports/kf5windowsystem/vcpkg.json | 2 +- .../vcpkg/ports/kf5xmlgui/portfile.cmake | 4 +- .../vcpkg/ports/kf5xmlgui/vcpkg.json | 1 + external_imported/vcpkg/ports/kfr/vcpkg.json | 2 +- .../vcpkg/ports/kinectsdk1/Config.cmake.in | 33 + .../vcpkg/ports/kinectsdk1/portfile.cmake | 50 +- .../vcpkg/ports/kinectsdk1/vcpkg.json | 11 +- .../vcpkg/ports/kinectsdk2/Config.cmake.in | 33 + .../vcpkg/ports/kinectsdk2/portfile.cmake | 36 +- .../vcpkg/ports/kinectsdk2/vcpkg.json | 13 +- .../vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch | 51 +- .../vcpkg/ports/ktx/portfile.cmake | 6 +- external_imported/vcpkg/ports/ktx/vcpkg.json | 6 +- .../vcpkg/ports/kubazip/fix_targets.patch | 45 +- .../vcpkg/ports/kubazip/portfile.cmake | 15 +- .../vcpkg/ports/kubazip/vcpkg.json | 16 +- .../ports/lapack-reference/lapacke.patch | 16 + .../ports/lapack-reference/portfile.cmake | 6 +- .../vcpkg/ports/lapack-reference/vcpkg.json | 2 +- .../vcpkg/ports/lcm/disable-docs.patch | 12 + .../vcpkg/ports/lcm/portfile.cmake | 33 +- external_imported/vcpkg/ports/lcm/vcpkg.json | 14 +- .../vcpkg/ports/lcms/cpp17.patch | 13 + .../vcpkg/ports/lcms/portfile.cmake | 1 + external_imported/vcpkg/ports/lcms/vcpkg.json | 2 +- .../vcpkg/ports/lerc/create_package.patch | 26 +- .../ports/lerc/enable_static_build.patch | 16 - .../lerc/install_lib_to_archive_path.patch | 16 - .../vcpkg/ports/lerc/portfile.cmake | 23 +- external_imported/vcpkg/ports/lerc/vcpkg.json | 16 +- ...{fix-dependencies.patch => fix-deps.patch} | 93 +- .../ports/libarchive/pkgconfig-modules.patch | 10 +- .../vcpkg/ports/libarchive/portfile.cmake | 11 +- .../vcpkg/ports/libarchive/vcpkg.json | 4 +- .../vcpkg/ports/libass/CMakeLists.txt | 64 +- .../vcpkg/ports/libass/config.h.in | 2 +- .../vcpkg/ports/libass/portfile.cmake | 10 +- .../vcpkg/ports/libass/vcpkg.json | 13 +- .../vcpkg/ports/libatomic-ops/portfile.cmake | 7 +- .../vcpkg/ports/libatomic-ops/vcpkg.json | 3 + .../ports/libavif/fix-compiler-warnings.patch | 22 + .../vcpkg/ports/libavif/portfile.cmake | 13 +- .../vcpkg/ports/libavif/vcpkg.json | 4 +- .../vcpkg/ports/libbf/portfile.cmake | 17 +- .../vcpkg/ports/libbf/vcpkg.json | 14 +- .../vcpkg/ports/libcaer/portfile.cmake | 25 + .../vcpkg/ports/libcaer/vcpkg.json | 21 + .../vcpkg/ports/libcbor/portfile.cmake | 23 +- .../vcpkg/ports/libcbor/vcpkg.json | 12 +- .../vcpkg/ports/libcds/vcpkg.json | 6 +- .../vcpkg/ports/libcerf/portfile.cmake | 16 +- .../vcpkg/ports/libcerf/vcpkg.json | 12 +- .../vcpkg/ports/libcopp/fix-x86-windows.patch | 20 + .../vcpkg/ports/libcopp/portfile.cmake | 1 + .../vcpkg/ports/libcopp/vcpkg.json | 2 +- .../vcpkg/ports/libcuckoo/portfile.cmake | 23 +- .../vcpkg/ports/libcuckoo/vcpkg.json | 16 +- .../libdatachannel/0001-fix-for-vcpkg.patch | 32 +- .../vcpkg/ports/libdatachannel/portfile.cmake | 5 +- .../ports/libdatachannel/uwp-warnings.patch | 4 +- .../vcpkg/ports/libdatachannel/vcpkg.json | 4 +- .../vcpkg/ports/libdc1394/fix-macosx.patch | 11 + .../vcpkg/ports/libdc1394/portfile.cmake | 13 +- .../vcpkg/ports/libdc1394/vcpkg.json | 3 +- .../vcpkg/ports/libe57/portfile.cmake | 13 +- .../vcpkg/ports/libe57/vcpkg.json | 2 +- .../vcpkg/ports/libffi/CMakeLists.txt | 14 +- .../vcpkg/ports/libffi/portfile.cmake | 5 +- .../vcpkg/ports/libffi/vcpkg.json | 3 +- .../vcpkg/ports/libflac/portfile.cmake | 47 +- .../vcpkg/ports/libflac/vcpkg.json | 18 +- .../vcpkg/ports/libfontenc/build.patch | 38 + .../vcpkg/ports/libfontenc/configure.ac.patch | 13 + .../vcpkg/ports/libfontenc/portfile.cmake | 32 + .../vcpkg/ports/libfontenc/vcpkg.json | 13 + .../ports/libfreenect2/fix-macbuild.patch | 22 + .../vcpkg/ports/libfreenect2/portfile.cmake | 34 +- .../vcpkg/ports/libfreenect2/vcpkg.json | 21 +- .../vcpkg/ports/libfs/portfile.cmake | 30 + .../vcpkg/ports/libfs/vcpkg.json | 14 + .../vcpkg/ports/libgcrypt/portfile.cmake | 4 +- .../vcpkg/ports/libgcrypt/vcpkg.json | 3 +- .../vcpkg/ports/libgd/0001-fix-cmake.patch | 38 +- .../vcpkg/ports/libgd/fix_msvc_build.patch | 42 +- .../vcpkg/ports/libgd/intrin.patch | 13 - .../ports/libgd/no-write-source-dir.patch | 14 - .../vcpkg/ports/libgd/portfile.cmake | 19 +- .../vcpkg/ports/libgd/vcpkg.json | 4 +- .../vcpkg/ports/libgeotiff/portfile.cmake | 1 + .../libgeotiff/public-dependencies.patch | 47 + .../vcpkg/ports/libgeotiff/vcpkg.json | 1 + .../libgo/Add-target-include-directory.patch | 13 + .../vcpkg/ports/libgo/portfile.cmake | 1 + .../vcpkg/ports/libgo/vcpkg.json | 3 +- .../TargetPlatformMinVersion.patch | 12 + .../vcpkg/ports/libgpg-error/portfile.cmake | 1 + .../vcpkg/ports/libgpg-error/vcpkg.json | 2 +- .../vcpkg/ports/libgpiod/portfile.cmake | 18 +- .../vcpkg/ports/libgpiod/vcpkg.json | 12 +- .../ports/libharu/add-boolean-typedef.patch | 12 - .../vcpkg/ports/libharu/export-targets.patch | 29 + .../vcpkg/ports/libharu/fix-build-fail.patch | 21 - .../ports/libharu/fix-include-path.patch | 13 + .../vcpkg/ports/libharu/portfile.cmake | 47 +- .../vcpkg/ports/libharu/tiff.patch | 25 - .../vcpkg/ports/libharu/vcpkg.json | 21 +- .../vcpkg/ports/libheif/portfile.cmake | 10 +- .../vcpkg/ports/libheif/vcpkg.json | 3 +- .../vcpkg/ports/libhsplasma/portfile.cmake | 5 +- .../vcpkg/ports/libhsplasma/vcpkg.json | 4 +- .../vcpkg/ports/libhv/fix-find_package.patch | 24 - .../ports/libhv/fix-include_header.patch | 22 + .../vcpkg/ports/libhv/portfile.cmake | 17 +- .../vcpkg/ports/libhv/vcpkg.json | 7 +- .../vcpkg/ports/libhydrogen/no-arch.patch | 25 + .../vcpkg/ports/libhydrogen/portfile.cmake | 7 +- .../ports/libhydrogen/remove-tests.patch | 30 + .../vcpkg/ports/libhydrogen/vcpkg.json | 3 +- .../vcpkg/ports/libice/fix_build.patch | 34 + .../vcpkg/ports/libice/portfile.cmake | 31 + .../vcpkg/ports/libice/vcpkg.json | 14 + .../ports/libiconv/0002-Config-for-MSVC.patch | 15 +- .../vcpkg/ports/libiconv/portfile.cmake | 25 +- .../vcpkg/ports/libiconv/vcpkg.json | 6 +- .../vcpkg/ports/libigl/portfile.cmake | 1 + .../vcpkg/ports/libigl/vcpkg.json | 9 +- .../vcpkg/ports/libilbc/absl.patch | 39 + .../vcpkg/ports/libilbc/portfile.cmake | 30 +- .../vcpkg/ports/libilbc/vcpkg.json | 13 +- .../vcpkg/ports/libirecovery/vcpkg.json | 3 +- .../vcpkg/ports/libjpeg-turbo/portfile.cmake | 6 +- .../vcpkg/ports/libjpeg-turbo/vcpkg.json | 3 +- .../vcpkg/ports/libjuice/portfile.cmake | 4 +- .../vcpkg/ports/libjuice/vcpkg.json | 3 +- .../vcpkg/ports/liblas/fix-cmake-config.patch | 13 + .../vcpkg/ports/liblas/misc-fixes.patch | 59 + .../vcpkg/ports/liblas/portfile.cmake | 59 +- external_imported/vcpkg/ports/liblas/usage | 9 + .../vcpkg/ports/liblas/vcpkg.json | 27 +- .../vcpkg/ports/liblbfgs/portfile.cmake | 13 +- .../vcpkg/ports/liblbfgs/vcpkg.json | 12 +- .../vcpkg/ports/liblsquic/disable-asan.patch | 23 + .../vcpkg/ports/liblsquic/portfile.cmake | 76 + .../vcpkg/ports/liblsquic/vcpkg.json | 24 + .../vcpkg/ports/liblzma/build-tools.patch | 18 + .../vcpkg/ports/liblzma/portfile.cmake | 7 + .../ports/liblzma/vcpkg-cmake-wrapper.cmake | 2 +- .../vcpkg/ports/liblzma/vcpkg.json | 10 +- .../vcpkg/ports/libmariadb/arm64.patch | 15 - .../libmariadb/export-cmake-targets.patch | 43 - .../ports/libmariadb/fix-CMakeLists.patch | 83 + .../ports/libmariadb/fix-InstallPath.patch | 40 +- .../libmariadb/no-extra-static-lib.patch | 19 - .../vcpkg/ports/libmariadb/pkgconfig.patch | 8 +- .../vcpkg/ports/libmariadb/portfile.cmake | 26 +- .../vcpkg/ports/libmariadb/vcpkg.json | 7 +- .../vcpkg/ports/libmicrodns/portfile.cmake | 16 + .../vcpkg/ports/libmicrodns/vcpkg.json | 13 + .../vcpkg/ports/libmodplug/portfile.cmake | 10 +- .../vcpkg/ports/libmodplug/vcpkg.json | 13 +- .../vcpkg/ports/libmount/portfile.cmake | 7 +- .../vcpkg/ports/libmount/vcpkg.json | 3 +- .../vcpkg/ports/libmt32emu/portfile.cmake | 4 +- .../vcpkg/ports/libmt32emu/vcpkg.json | 2 +- .../Add-target-include-directories.patch | 20 + .../vcpkg/ports/libmysql/portfile.cmake | 8 +- .../vcpkg/ports/libmysql/vcpkg.json | 7 +- .../vcpkg/ports/libnice/portfile.cmake | 11 +- .../vcpkg/ports/libnice/vcpkg.json | 3 +- .../vcpkg/ports/libopensp/opensp.pc.in | 12 + .../vcpkg/ports/libopensp/portfile.cmake | 10 +- .../vcpkg/ports/libopensp/vcpkg.json | 2 + .../ports/libopensp/windows_cmake_build.diff | 15 +- .../vcpkg/ports/libosmium/portfile.cmake | 4 +- .../vcpkg/ports/libosmium/vcpkg.json | 4 +- .../vcpkg/ports/libpff/portfile.cmake | 6 +- .../vcpkg/ports/libpff/vcpkg.json | 3 +- .../vcpkg/ports/libpng/cmake.patch | 44 +- .../ports/libpng/fix-export-targets.patch | 64 +- .../libpng/fix-msa-support-for-mips.patch | 25 + .../vcpkg/ports/libpng/pkgconfig.2.patch | 48 - .../vcpkg/ports/libpng/pkgconfig.patch | 50 +- .../vcpkg/ports/libpng/portfile.cmake | 140 +- external_imported/vcpkg/ports/libpng/usage | 4 + .../ports/libpng/vcpkg-cmake-wrapper.cmake | 3 + .../vcpkg/ports/libpng/vcpkg.json | 3 +- .../vcpkg/ports/libpq/libpq.props.in | 25 + .../ports/libpq/patches/fix-configure.patch | 68 +- .../ports/libpq/patches/linux/configure.patch | 22 - .../patches/mingw/link-with-crypt32.patch | 79 - .../libpq/patches/windows/macro-def.patch | 18 + .../vcpkg/ports/libpq/portfile.cmake | 55 +- .../vcpkg/ports/libpq/vcpkg.json | 33 +- .../fix_build_with_apple_clang_13.patch | 15 - .../ports/libpqxx/fix_build_with_vs2017.patch | 47 +- .../vcpkg/ports/libpqxx/portfile.cmake | 5 +- .../vcpkg/ports/libpqxx/vcpkg.json | 4 +- .../vcpkg/ports/libproxy/portfile.cmake | 16 +- .../vcpkg/ports/libproxy/vcpkg.json | 5 +- .../librabbitmq/fix-link-header-files.patch | 41 + .../vcpkg/ports/librabbitmq/portfile.cmake | 3 +- .../vcpkg/ports/librabbitmq/vcpkg.json | 3 +- .../vcpkg/ports/libraw/portfile.cmake | 2 + .../ports/libraw/remove_register_cpp.patch | 31 + .../vcpkg/ports/libraw/vcpkg.json | 3 +- .../vcpkg/ports/librdkafka/fix_curl.patch | 16 + .../vcpkg/ports/librdkafka/portfile.cmake | 11 +- .../vcpkg/ports/librdkafka/vcpkg.json | 9 +- .../vcpkg/ports/librttopo/vcpkg.json | 3 +- .../disable_tests_enable_static_build.patch | 23 +- .../libsigcpp/fix-shared-windows-build.patch | 33 +- .../libsigcpp/fix-usage-in-static-build.patch | 29 - .../vcpkg/ports/libsigcpp/portfile.cmake | 6 +- .../vcpkg/ports/libsigcpp/vcpkg.json | 3 +- .../vcpkg/ports/libsigcpp/version.patch | 17 - .../vcpkg/ports/libslirp/portfile.cmake | 4 +- .../vcpkg/ports/libslirp/vcpkg.json | 3 +- .../vcpkg/ports/libsm/portfile.cmake | 31 + .../vcpkg/ports/libsm/vcpkg.json | 12 + .../vcpkg/ports/libsm/windows.patch | 22 + .../vcpkg/ports/libsndfile/portfile.cmake | 14 +- .../vcpkg/ports/libsndfile/vcpkg.json | 3 +- .../vcpkg/ports/libsodium/portfile.cmake | 28 +- .../vcpkg/ports/libsodium/vcpkg.json | 3 +- .../vcpkg/ports/libspatialindex/mingw.patch | 12 + .../ports/libspatialindex/portfile.cmake | 1 + .../vcpkg/ports/libspatialindex/vcpkg.json | 1 + .../vcpkg/ports/libspatialite/fix-mingw.patch | 24 + .../vcpkg/ports/libspatialite/portfile.cmake | 14 +- .../vcpkg/ports/libspatialite/vcpkg.json | 9 +- .../vcpkg/ports/libsquish/export-target.patch | 13 +- .../vcpkg/ports/libsquish/portfile.cmake | 4 +- .../vcpkg/ports/libsquish/vcpkg.json | 2 +- .../vcpkg/ports/libsrt/portfile.cmake | 25 +- .../vcpkg/ports/libsrt/vcpkg.json | 10 +- .../vcpkg/ports/libsrtp/portfile.cmake | 1 - .../vcpkg/ports/libsrtp/vcpkg.json | 3 +- .../vcpkg/ports/libtcod/portfile.cmake | 19 +- .../vcpkg/ports/libtcod/vcpkg.json | 46 +- .../vcpkg/ports/libtheora/CMakeLists.txt | 6 +- .../vcpkg/ports/libtheora/portfile.cmake | 21 +- .../vcpkg/ports/libtheora/vcpkg.json | 13 +- .../vcpkg/ports/libtorrent/portfile.cmake | 8 +- .../vcpkg/ports/libtorrent/vcpkg.json | 2 +- .../vcpkg/ports/libunibreak/CMakeLists.txt | 18 +- .../libunibreak/libunibreak-config.cmake.in | 32 + .../vcpkg/ports/libunibreak/portfile.cmake | 12 +- .../vcpkg/ports/libunibreak/vcpkg.json | 11 +- .../fix-for-automake-1.16.4.patch | 13 - .../libunistring-msys-msvc-build.patch | 53 + .../vcpkg/ports/libunistring/portfile.cmake | 5 +- .../vcpkg/ports/libunistring/vcpkg.json | 4 +- .../liburing/disable-tests-and-examples.patch | 13 + .../vcpkg/ports/liburing/fix-configure.patch | 20 +- .../ports/liburing/fix-spec-version.patch | 11 - .../vcpkg/ports/liburing/portfile.cmake | 25 +- .../vcpkg/ports/liburing/vcpkg.json | 5 +- .../vcpkg/ports/libusb/portfile.cmake | 9 +- .../vcpkg/ports/libusb/vcpkg.json | 5 +- .../vcpkg/ports/libuv/CMakeLists.txt | 83 - .../vcpkg/ports/libuv/fix-build-type.patch | 72 + .../vcpkg/ports/libuv/portfile.cmake | 34 +- .../libuv/unofficial-libuv-config.in.cmake | 7 - external_imported/vcpkg/ports/libuv/usage | 4 + .../ports/libuv/vcpkg-cmake-wrapper.cmake | 16 - .../vcpkg/ports/libuv/vcpkg.json | 3 +- .../0002-Fix-nasm-debug-format-flag.patch | 42 +- ... 0003-add-uwp-v142-and-v143-support.patch} | 36 +- .../libvpx/0004-remove-library-suffixes.patch | 26 +- .../vcpkg/ports/libvpx/portfile.cmake | 26 +- .../vcpkg/ports/libvpx/vcpkg.json | 4 +- .../vcpkg/ports/libwebp/0001-build.patch | 45 - ...e-config-add-backwards-compatibility.patch | 69 - .../ports/libwebp/0002-cmake-config.patch | 26 + .../vcpkg/ports/libwebp/0003-always-mux.patch | 13 - .../libwebp/0003-fix-tool-dependencies.patch | 13 + .../0004-add-missing-linked-library.patch | 15 - .../0006-fix-dependecies-platform.patch | 17 - .../vcpkg/ports/libwebp/0009-glut.patch | 10 - .../vcpkg/ports/libwebp/0010-fix_build.patch | 62 + .../vcpkg/ports/libwebp/portfile.cmake | 97 +- .../vcpkg/ports/libwebp/vcpkg.json | 48 +- .../vcpkg/ports/libx11/cl.build.patch | 147 + .../vcpkg/ports/libx11/dllimport.patch | 44 + .../vcpkg/ports/libx11/io_include.patch | 12 + .../vcpkg/ports/libx11/portfile.cmake | 96 + .../ports/libx11/vcpkg-cmake-wrapper.cmake | 12 + .../vcpkg/ports/libx11/vcpkg.json | 22 + .../vcpkg/ports/libx11/vcxserver.patch | 138 + .../vcpkg/ports/libxau/portfile.cmake | 31 + .../vcpkg/ports/libxau/vcpkg.json | 12 + .../vcpkg/ports/libxdamage/portfile.cmake | 30 + .../vcpkg/ports/libxdamage/vcpkg.json | 14 + .../vcpkg/ports/libxdmcp/configure.ac.patch | 13 + .../vcpkg/ports/libxdmcp/portfile.cmake | 36 + .../vcpkg/ports/libxdmcp/vcpkg.json | 12 + .../vcpkg/ports/libxext/portfile.cmake | 31 + .../vcpkg/ports/libxext/vcpkg.json | 12 + .../vcpkg/ports/libxfixes/portfile.cmake | 29 + .../vcpkg/ports/libxfixes/vcpkg.json | 12 + .../vcpkg/ports/libxi/portfile.cmake | 35 + .../vcpkg/ports/libxi/vcpkg.json | 11 + .../vcpkg/ports/libxkbcommon/build.patch | 27 + .../ports/libxkbcommon/fix_msvc_build.patch | 13 + .../vcpkg/ports/libxkbcommon/portfile.cmake | 55 + .../vcpkg/ports/libxkbcommon/vcpkg.json | 18 + .../vcpkg/ports/libxkbfile/fix_u_char.patch | 15 + .../vcpkg/ports/libxkbfile/portfile.cmake | 41 + .../ports/libxkbfile/symbol_visibility.patch | 24 + .../vcpkg/ports/libxkbfile/vcpkg.json | 12 + .../vcpkg/ports/libxml2/disable-docs.patch | 16 + .../vcpkg/ports/libxml2/fix-uwp.patch | 6 +- .../vcpkg/ports/libxml2/fix_cmakelist.patch | 31 +- .../vcpkg/ports/libxml2/portfile.cmake | 23 +- external_imported/vcpkg/ports/libxml2/usage | 2 +- .../ports/libxml2/vcpkg-cmake-wrapper.cmake | 52 +- .../vcpkg/ports/libxml2/vcpkg.json | 4 +- .../vcpkg/ports/libxmlmm/CMakeLists.txt | 15 +- .../vcpkg/ports/libxmlmm/portfile.cmake | 19 +- .../libxmlmm/unofficial-libxmlmm-config.cmake | 3 + .../vcpkg/ports/libxmlmm/vcpkg.json | 15 +- .../ports/libxpm/fix-dependency-gettext.patch | 15 + .../vcpkg/ports/libxpm/portfile.cmake | 46 + .../vcpkg/ports/libxpm/remove_strings_h.patch | 16 + .../vcpkg/ports/libxpm/vcpkg.json | 32 + .../vcpkg/ports/libxrandr/portfile.cmake | 35 + .../vcpkg/ports/libxrandr/vcpkg.json | 15 + .../vcpkg/ports/libxrender/portfile.cmake | 35 + .../vcpkg/ports/libxrender/vcpkg.json | 11 + .../vcpkg/ports/libxres/build.patch | 16 + .../vcpkg/ports/libxres/portfile.cmake | 35 + .../vcpkg/ports/libxres/vcpkg.json | 14 + .../ports/libxslt/0001-Fix-makefile.patch | 49 - .../vcpkg/ports/libxslt/0002-Fix-lzma.patch | 45 - .../ports/libxslt/0003-Fix-configure.patch | 50 - .../vcpkg/ports/libxslt/fix-gcrypt-deps.patch | 45 + .../ports/libxslt/libexslt-pkgconfig.patch | 14 + .../vcpkg/ports/libxslt/msvc-no-suffix.patch | 22 + .../libxslt/only_build_one_lib_type.patch | 56 - .../vcpkg/ports/libxslt/portfile.cmake | 221 +- .../vcpkg/ports/libxslt/python3.patch | 16 + .../ports/libxslt/skip-install-docs.patch | 17 + external_imported/vcpkg/ports/libxslt/usage | 12 + .../ports/libxslt/vcpkg-cmake-wrapper.cmake | 5 + .../vcpkg/ports/libxslt/vcpkg.json | 39 +- .../vcpkg/ports/libzip/portfile.cmake | 4 +- .../vcpkg/ports/libzip/vcpkg.json | 3 +- .../vcpkg/ports/libzippp/portfile.cmake | 17 +- .../vcpkg/ports/libzippp/vcpkg.json | 11 +- .../vcpkg/ports/linmath/portfile.cmake | 12 + .../vcpkg/ports/linmath/vcpkg.json | 7 + .../vcpkg/ports/live555/fix-RTSPClient.patch | 8 +- .../vcpkg/ports/live555/portfile.cmake | 6 +- .../vcpkg/ports/live555/vcpkg.json | 5 +- .../ports/llfio/issue-83-fix-backport.patch | 35 - .../vcpkg/ports/llfio/portfile.cmake | 17 +- .../vcpkg/ports/llfio/vcpkg.json | 39 +- .../ports/llvm/0002-fix-install-paths.patch | 109 +- .../ports/llvm/0003-fix-openmp-debug.patch | 25 - .../ports/llvm/0005-fix-tools-path.patch | 2 +- .../0007-fix-compiler-rt-install-path.patch | 12 +- .../llvm/0009-fix-tools-install-path.patch | 199 +- .../vcpkg/ports/llvm/0010-fix-libffi.patch | 24 +- .../ports/llvm/0011-fix-install-bolt.patch | 22 + .../vcpkg/ports/llvm/0011-fix-libxml2.patch | 34 - .../vcpkg/ports/llvm/portfile.cmake | 141 +- external_imported/vcpkg/ports/llvm/vcpkg.json | 41 +- .../vcpkg/ports/lmdb/cmake/CMakeLists.txt | 2 +- external_imported/vcpkg/ports/lmdb/vcpkg.json | 2 + .../vcpkg/ports/lockpp/portfile.cmake | 15 + .../vcpkg/ports/lockpp/vcpkg.json | 13 + .../vcpkg/ports/log4cxx/expat.patch | 46 +- .../vcpkg/ports/log4cxx/pkgconfig.patch | 22 - .../vcpkg/ports/log4cxx/portfile.cmake | 16 +- .../vcpkg/ports/log4cxx/threadutility.patch | 17 + .../vcpkg/ports/log4cxx/vcpkg.json | 3 +- .../vcpkg/ports/lua/CMakeLists-cpp.txt | 28 + .../vcpkg/ports/lua/CMakeLists.txt | 82 +- .../vcpkg/ports/lua/portfile.cmake | 18 +- .../ports/lua/vcpkg-cmake-wrapper.cmake.in | 2 +- external_imported/vcpkg/ports/lua/vcpkg.json | 9 +- .../ports/luajit/002-fix-crt-linkage.patch | 42 - ...-do-not-set-macosx-deployment-target.patch | 14 + ... 004-fix-build-path-and-crt-linkage.patch} | 70 +- .../vcpkg/ports/luajit/portfile.cmake | 181 +- .../vcpkg/ports/luajit/vcpkg.json | 5 +- .../vcpkg/ports/luasec/portfile.cmake | 9 +- .../vcpkg/ports/luasec/vcpkg.json | 14 +- .../vcpkg/ports/luasocket/portfile.cmake | 22 +- .../vcpkg/ports/luasocket/vcpkg.json | 7 +- ...mory-corruption-with-negative-memmov.patch | 26 + .../vcpkg/ports/lz4/portfile.cmake | 2 + external_imported/vcpkg/ports/lz4/vcpkg.json | 3 +- .../vcpkg/ports/magic-enum/portfile.cmake | 18 +- .../vcpkg/ports/magic-enum/vcpkg.json | 16 +- .../ports/magnum/004-fix-FindOpenAL.patch | 12 + .../ports/magnum/005-fix-find-sdl2.patch | 13 + .../vcpkg/ports/magnum/portfile.cmake | 2 + .../vcpkg/ports/magnum/vcpkg.json | 3 +- .../vcpkg/ports/mapnik/portfile.cmake | 1 + .../vcpkg/ports/mapnik/vcpkg.json | 2 +- .../vcpkg/ports/marble/portfile.cmake | 54 +- .../vcpkg/ports/marble/qtfix.patch | 71 +- .../vcpkg/ports/marble/vcpkg.json | 5 +- .../vcpkg/ports/matchit/portfile.cmake | 23 + external_imported/vcpkg/ports/matchit/usage | 4 + .../vcpkg/ports/matchit/vcpkg.json | 17 + .../vcpkg/ports/materialx/portfile.cmake | 49 + .../vcpkg/ports/materialx/vcpkg.json | 18 + .../vcpkg/ports/mathgl/portfile.cmake | 3 +- .../vcpkg/ports/mathgl/vcpkg.json | 2 + .../vcpkg/ports/matio/portfile.cmake | 7 +- .../vcpkg/ports/matio/vcpkg.json | 4 +- .../ports/matplotplusplus/portfile.cmake | 3 +- .../vcpkg/ports/matplotplusplus/vcpkg.json | 2 +- .../vcpkg/ports/mbedtls/portfile.cmake | 4 +- .../vcpkg/ports/mbedtls/vcpkg.json | 2 +- .../vcpkg/ports/mchehab-zbar/c99.patch | 89 + .../vcpkg/ports/mchehab-zbar/issue219.patch | 13 + .../vcpkg/ports/mchehab-zbar/portfile.cmake | 48 + .../vcpkg/ports/mchehab-zbar/vcpkg.json | 11 + .../vcpkg/ports/mchehab-zbar/windows.patch | 68 + .../vcpkg/ports/mchehab-zbar/x64.patch | 21 + .../vcpkg/ports/mdns/portfile.cmake | 4 +- external_imported/vcpkg/ports/mdns/vcpkg.json | 3 +- .../vcpkg/ports/mdnsresponder/portfile.cmake | 5 +- .../vcpkg/ports/mdnsresponder/vcpkg.json | 3 +- .../vcpkg/ports/mesa/clover.patch | 63 + .../vcpkg/ports/mesa/d3d10sw.patch | 383 -- .../vcpkg/ports/mesa/def-fixes.patch | 3571 +++++++++++++++++ .../vcpkg/ports/mesa/portfile.cmake | 50 +- .../vcpkg/ports/mesa/radv-msvc-llvm13-2.patch | 14 - .../vcpkg/ports/mesa/swr-llvm13.patch | 334 -- .../vcpkg/ports/mesa/swr-msvc-2.patch | 57 - .../mesa/swravx512-post-static-link.patch | 22 - external_imported/vcpkg/ports/mesa/vcpkg.json | 31 +- .../vcpkg/ports/meschach/vcpkg.json | 5 +- .../vcpkg/ports/metis/build-fixes.patch | 144 + .../vcpkg/ports/metis/disable-programs.patch | 8 - .../vcpkg/ports/metis/enable-install.patch | 15 - .../ports/metis/fix-INT_MIN_define.patch | 34 - .../ports/metis/fix-gklib-vs14-math.patch | 11 - .../ports/metis/fix-linux-build-error.patch | 14 - .../ports/metis/fix-metis-vs14-math.patch | 11 - .../fix-runtime-install-destination.patch | 10 - .../ports/metis/install-metisConfig.patch | 44 - .../vcpkg/ports/metis/portfile.cmake | 63 +- .../vcpkg/ports/metis/vcpkg.json | 17 +- .../vcpkg/ports/mgnlibs/portfile.cmake | 6 +- .../vcpkg/ports/mgnlibs/vcpkg.json | 7 +- .../FixFindPackageIssue.patch | 5 +- .../ports/milerius-sfml-imgui/vcpkg.json | 3 +- .../vcpkg/ports/mimalloc/portfile.cmake | 4 +- .../vcpkg/ports/mimalloc/vcpkg.json | 3 +- .../vcpkg/ports/minimp3/portfile.cmake | 10 +- .../vcpkg/ports/minimp3/vcpkg.json | 6 +- .../ports/minio-cpp/fix_cmake_file.patch | 12 - .../vcpkg/ports/minio-cpp/portfile.cmake | 14 +- .../vcpkg/ports/minio-cpp/vcpkg.json | 16 +- .../vcpkg/ports/minizip/0004-define.patch | 13 + .../vcpkg/ports/minizip/portfile.cmake | 18 +- .../vcpkg/ports/minizip/vcpkg.json | 10 +- .../vcpkg/ports/mmloader/portfile.cmake | 17 +- .../vcpkg/ports/mmloader/vcpkg.json | 13 +- .../ports/mnn/use-package-and-install.patch | 4 +- external_imported/vcpkg/ports/mnn/vcpkg.json | 2 +- .../ports/mongo-cxx-driver/portfile.cmake | 3 + .../vcpkg/ports/mongo-cxx-driver/vcpkg.json | 3 +- .../vcpkg/ports/mongoose/portfile.cmake | 4 +- .../vcpkg/ports/mongoose/vcpkg.json | 4 +- .../vcpkg/ports/moos-core/portfile.cmake | 18 +- .../vcpkg/ports/moos-core/vcpkg.json | 17 +- ...1-add-archive-destination-to-install.patch | 39 - .../ports/mosquitto/0002-win64-support.patch | 2 +- .../0003-add-find_package-libwebsockets.patch | 16 +- .../mosquitto/0004-support-static-build.patch | 4 +- .../vcpkg/ports/mosquitto/portfile.cmake | 64 +- .../vcpkg/ports/mosquitto/vcpkg.json | 13 +- .../vcpkg/ports/mp-units/cmake.patch | 30 - .../vcpkg/ports/mp-units/portfile.cmake | 3 +- .../vcpkg/ports/mp-units/vcpkg.json | 2 + .../vcpkg/ports/mp3lame/portfile.cmake | 77 +- .../vcpkg/ports/mp3lame/vcpkg.json | 7 +- .../vcpkg/ports/mpfr/portfile.cmake | 17 +- external_imported/vcpkg/ports/mpfr/usage | 6 + external_imported/vcpkg/ports/mpfr/vcpkg.json | 2 +- .../vcpkg/ports/mpg123/fix-m1-build.patch | 13 + .../vcpkg/ports/mpg123/no-executables.patch | 13 - .../vcpkg/ports/mpg123/portfile.cmake | 16 +- .../vcpkg/ports/mpg123/vcpkg.json | 3 +- .../vcpkg/ports/mpi/portfile.cmake | 4 + external_imported/vcpkg/ports/mpi/vcpkg.json | 3 +- .../vcpkg/ports/mpir/portfile.cmake | 6 +- external_imported/vcpkg/ports/mpir/vcpkg.json | 1 + .../vcpkg/ports/mpmcqueue/portfile.cmake | 15 +- .../vcpkg/ports/mpmcqueue/vcpkg.json | 16 +- .../vcpkg/ports/mqtt-cpp/portfile.cmake | 22 +- .../vcpkg/ports/mqtt-cpp/vcpkg.json | 5 +- .../vcpkg/ports/ms-gltf/portfile.cmake | 11 +- .../vcpkg/ports/ms-gltf/vcpkg.json | 3 +- .../vcpkg/ports/msdfgen/portfile.cmake | 6 +- .../vcpkg/ports/msdfgen/vcpkg.json | 3 +- external_imported/vcpkg/ports/msix/vcpkg.json | 4 +- .../vcpkg/ports/msmpi/mpi-wrapper.cmake | 9 + .../vcpkg/ports/msmpi/portfile.cmake | 37 +- .../vcpkg/ports/msmpi/vcpkg.json | 2 +- .../vcpkg/ports/mygui/Install-tools.patch | 14 + .../vcpkg/ports/mygui/Use-vcpkg-sdl2.patch | 14 + .../vcpkg/ports/mygui/portfile.cmake | 13 +- .../vcpkg/ports/mygui/vcpkg.json | 6 +- .../mysql-connector-cpp/export-targets.patch | 69 + .../fix-static-build8.patch | 131 + .../mysql-connector-cpp-config.cmake.in | 8 + .../ports/mysql-connector-cpp/portfile.cmake | 42 + .../ports/mysql-connector-cpp/vcpkg.json | 20 + .../vcpkg/ports/nameof/portfile.cmake | 17 +- .../vcpkg/ports/nameof/vcpkg.json | 16 +- .../vcpkg/ports/nanobench/fix-cmakefile.patch | 21 + .../vcpkg/ports/nanobench/portfile.cmake | 17 +- .../vcpkg/ports/nanobench/vcpkg.json | 16 +- .../vcpkg/ports/nanoflann/portfile.cmake | 14 +- .../vcpkg/ports/nanoflann/vcpkg.json | 4 +- .../ports/nanogui/fix-glad-dependence.patch | 101 + .../vcpkg/ports/nanogui/portfile.cmake | 32 +- .../vcpkg/ports/nanogui/vcpkg.json | 17 +- .../vcpkg/ports/nanosvg/CMakeLists.txt | 16 + .../vcpkg/ports/nanosvg/portfile.cmake | 15 + .../vcpkg/ports/nanosvg/vcpkg.json | 13 + .../vcpkg/ports/ncnn/portfile.cmake | 29 + external_imported/vcpkg/ports/ncnn/vcpkg.json | 18 + .../vcpkg/ports/ncurses/portfile.cmake | 9 +- .../vcpkg/ports/ncurses/vcpkg.json | 2 +- .../ned14-internal-quickcpplib/portfile.cmake | 52 +- .../quicklib-depheaders.patch | 30 +- .../sha_manifest.cmake | 4 +- .../ned14-internal-quickcpplib/vcpkg.json | 26 +- .../nethost/0001-nethost-cmakelists.patch | 83 +- .../ports/nethost/0002-settings-cmake.patch | 13 - .../vcpkg/ports/nethost/portfile.cmake | 37 +- external_imported/vcpkg/ports/nethost/usage | 6 +- .../vcpkg/ports/nethost/vcpkg.json | 15 +- .../vcpkg/ports/nghttp2/portfile.cmake | 4 +- .../vcpkg/ports/nghttp2/vcpkg.json | 3 +- .../vcpkg/ports/nghttp3/portfile.cmake | 45 + .../vcpkg/ports/nghttp3/vcpkg.json | 14 + .../vcpkg/ports/ngspice/portfile.cmake | 6 +- .../vcpkg/ports/ngspice/vcpkg.json | 3 +- .../vcpkg/ports/nifticlib/vcpkg.json | 7 +- .../vcpkg/ports/nlohmann-json/portfile.cmake | 21 +- .../vcpkg/ports/nlohmann-json/usage | 2 +- .../vcpkg/ports/nlohmann-json/vcpkg.json | 11 +- .../vcpkg/ports/nlopt/portfile.cmake | 19 +- .../vcpkg/ports/nlopt/vcpkg.json | 17 +- .../vcpkg/ports/nng/portfile.cmake | 8 +- external_imported/vcpkg/ports/nng/vcpkg.json | 2 +- .../vcpkg/ports/nowide/portfile.cmake | 6 +- .../vcpkg/ports/nowide/vcpkg.json | 2 +- .../vcpkg/ports/nrf-ble-driver/portfile.cmake | 43 +- .../vcpkg/ports/nrf-ble-driver/vcpkg.json | 18 +- .../vcpkg/ports/nspr/portfile.cmake | 10 +- external_imported/vcpkg/ports/nspr/vcpkg.json | 1 + .../vcpkg/ports/nss/portfile.cmake | 4 +- external_imported/vcpkg/ports/nss/vcpkg.json | 2 +- .../ignore-pdb-install-symbols-in-lib.patch | 12 - .../ports/nu-book-zxing-cpp/portfile.cmake | 5 +- .../vcpkg/ports/nu-book-zxing-cpp/vcpkg.json | 2 +- .../vcpkg/ports/nuklear/CMakeLists.txt | 2 +- .../vcpkg/ports/nuklear/portfile.cmake | 6 +- .../vcpkg/ports/nuklear/vcpkg.json | 4 +- .../vcpkg/ports/nuspell/portfile.cmake | 41 +- .../vcpkg/ports/nuspell/vcpkg.json | 23 +- .../vcpkg/ports/nvtt/fix-release-flags.patch | 15 + .../vcpkg/ports/nvtt/portfile.cmake | 13 +- external_imported/vcpkg/ports/nvtt/vcpkg.json | 12 +- .../vcpkg/ports/oatpp-consul/portfile.cmake | 1 - .../vcpkg/ports/oatpp-consul/vcpkg.json | 2 + .../vcpkg/ports/oatpp-curl/portfile.cmake | 1 - .../vcpkg/ports/oatpp-curl/vcpkg.json | 2 + .../vcpkg/ports/oatpp-libressl/portfile.cmake | 3 +- .../vcpkg/ports/oatpp-libressl/vcpkg.json | 2 + .../vcpkg/ports/oatpp-mongo/portfile.cmake | 3 - .../vcpkg/ports/oatpp-mongo/vcpkg.json | 2 + .../ports/oatpp-postgresql/portfile.cmake | 3 - .../vcpkg/ports/oatpp-postgresql/vcpkg.json | 2 + .../vcpkg/ports/oatpp-sqlite/portfile.cmake | 1 - .../vcpkg/ports/oatpp-sqlite/vcpkg.json | 2 + .../vcpkg/ports/oatpp-ssdp/portfile.cmake | 1 - .../vcpkg/ports/oatpp-ssdp/vcpkg.json | 2 + .../vcpkg/ports/oatpp-swagger/portfile.cmake | 3 +- .../vcpkg/ports/oatpp-swagger/vcpkg.json | 2 + .../vcpkg/ports/oatpp-zlib/portfile.cmake | 3 - .../vcpkg/ports/oatpp-zlib/vcpkg.json | 2 + .../vcpkg/ports/oatpp/portfile.cmake | 7 +- .../vcpkg/ports/oatpp/vcpkg.json | 2 + .../vcpkg/ports/octomap/portfile.cmake | 21 +- .../vcpkg/ports/octomap/vcpkg.json | 16 +- .../vcpkg/ports/ogre-next/portfile.cmake | 6 +- .../vcpkg/ports/ogre-next/vcpkg.json | 2 +- .../ogre/fix-cmake-feature-summary.patch | 14 + .../vcpkg/ports/ogre/fix-dependency.patch | 89 +- .../vcpkg/ports/ogre/fix-findimgui.patch | 65 - .../vcpkg/ports/ogre/fix-pkgconfig.patch | 27 + .../vcpkg/ports/ogre/portfile.cmake | 44 +- external_imported/vcpkg/ports/ogre/vcpkg.json | 8 +- .../vcpkg/ports/onednn/portfile.cmake | 4 +- .../vcpkg/ports/onednn/vcpkg.json | 4 +- .../0001-fix-mingw-x86-build.patch | 13 + .../dont-export-symbols-in-static-build.patch | 13 - .../vcpkg/ports/openal-soft/portfile.cmake | 32 +- .../vcpkg/ports/openal-soft/vcpkg.json | 28 +- .../vcpkg/ports/openblas/fix-space-path.patch | 8 +- .../vcpkg/ports/openblas/portfile.cmake | 14 +- .../vcpkg/ports/openblas/vcpkg.json | 4 +- .../opencascade/fix-depend-freetype.patch | 15 + .../vcpkg/ports/opencascade/portfile.cmake | 31 +- .../vcpkg/ports/opencascade/vcpkg.json | 7 +- .../vcpkg/ports/opencc/fix-dependencies.patch | 26 + .../vcpkg/ports/opencc/portfile.cmake | 55 +- .../vcpkg/ports/opencc/vcpkg.json | 20 +- .../ports/opencensus-cpp/fix-install.patch | 34 +- .../vcpkg/ports/opencensus-cpp/portfile.cmake | 9 +- .../vcpkg/ports/opencensus-cpp/vcpkg.json | 13 +- .../ports/opencolorio/fix-buildTools.patch | 13 - .../ports/opencolorio/fix-dependency.patch | 48 +- .../ports/opencolorio/fix-pkgconfig.patch | 10 + .../vcpkg/ports/opencolorio/portfile.cmake | 27 +- .../vcpkg/ports/opencolorio/vcpkg.json | 3 +- .../vcpkg/ports/openctm/CMakeLists.txt | 60 + .../vcpkg/ports/openctm/portfile.cmake | 21 + .../vcpkg/ports/openctm/vcpkg.json | 17 + .../vcpkg/ports/opencv/portfile.cmake | 8 + .../vcpkg/ports/opencv/vcpkg.json | 15 +- ...tions.patch => 0001-install-options.patch} | 47 +- ...> 0002-fix-paths-containing-symbols.patch} | 2 - .../0003-force-package-requirements.patch | 9 - .../vcpkg/ports/opencv2/0006-fix-jasper.patch | 20 + .../vcpkg/ports/opencv2/0007-fix-config.patch | 18 + .../ports/opencv2/0019-fix-openexr.patch | 30 + .../vcpkg/ports/opencv2/portfile.cmake | 99 +- .../vcpkg/ports/opencv2/usage.in | 4 + .../vcpkg/ports/opencv2/vcpkg.json | 17 +- .../0003-force-package-requirements.patch | 11 +- .../vcpkg/ports/opencv3/0012-fix-zlib.patch | 2 - .../vcpkg/ports/opencv3/0013-fix-ceres.patch | 11 + .../opencv3/0016-fix-freetype-contrib.patch | 15 + .../opencv3/0018-fix-depend-tesseract.patch | 11 + .../vcpkg/ports/opencv3/portfile.cmake | 148 +- .../vcpkg/ports/opencv3/usage.in | 4 + .../vcpkg/ports/opencv3/vcpkg.json | 48 +- .../0003-force-package-requirements.patch | 11 +- ...5-fix-eigen.patch => 0004-fix-eigen.patch} | 0 ...57.patch => 0005-fix-policy-CMP0057.patch} | 0 .../ports/opencv4/0008-devendor-quirc.patch | 4 +- .../vcpkg/ports/opencv4/0012-fix-zlib.patch | 2 - .../vcpkg/ports/opencv4/0013-fix-ceres.patch | 11 + .../vcpkg/ports/opencv4/0013-fix-opengl.patch | 11 - .../ports/opencv4/0014-fix-gstreamer.patch | 29 - .../vcpkg/ports/opencv4/0014-fix-ogre.patch | 12 + .../ports/opencv4/0015-fix-freetype.patch | 2 - .../opencv4/0016-fix-freetype-contrib.patch | 2 - .../0017-mingw-strsafe-no-deprecate.patch | 15 + .../opencv4/0018-fix-depend-tesseract.patch | 11 + .../vcpkg/ports/opencv4/portfile.cmake | 110 +- .../vcpkg/ports/opencv4/usage.in | 5 + .../vcpkg/ports/opencv4/vcpkg.json | 16 +- .../0001-remove_find_package_macro.patch | 87 - .../0002-fixup_cmake_exports_path.patch | 78 - .../ports/openexr/0003-remove_symlinks.patch | 40 - ...ig-lib-suffix-for-cmake-debug-builds.patch | 54 - .../vcpkg/ports/openexr/portfile.cmake | 85 +- external_imported/vcpkg/ports/openexr/usage | 4 + .../ports/openexr/vcpkg-cmake-wrapper.cmake | 38 - .../vcpkg/ports/openexr/vcpkg.json | 20 +- .../vcpkg/ports/openfbx/CMakeLists.txt | 48 + .../vcpkg/ports/openfbx/portfile.cmake | 25 + .../openfbx/unofficial-openfbxConfig.cmake.in | 8 + .../vcpkg/ports/openfbx/vcpkg.json | 18 + .../vcpkg/ports/opengl/portfile.cmake | 81 +- .../vcpkg/ports/opengl/vcpkg.json | 4 +- .../ports/openimageio/fix-config-cmake.patch | 13 - .../ports/openimageio/fix-dependencies.patch | 129 +- .../ports/openimageio/fix-openexr-dll.patch | 13 + .../openimageio/fix-openjpeg-linkage.patch | 13 - .../ports/openimageio/fix-static-ffmpeg.patch | 18 + .../openimageio/imath-version-guard.patch | 16 + .../vcpkg/ports/openimageio/portfile.cmake | 55 +- .../vcpkg/ports/openimageio/usage | 4 + .../vcpkg/ports/openimageio/vcpkg.json | 20 +- .../Enable-tools-of-each-features.patch | 13 - .../vcpkg/ports/openjpeg/arm.patch | 13 + .../vcpkg/ports/openjpeg/dll.location.patch | 32 - .../openjpeg/fix-lrintf-to-opj_lrintf.patch | 13 - .../vcpkg/ports/openjpeg/fix-static.patch | 59 + .../vcpkg/ports/openjpeg/no-wx.patch | 10 + .../vcpkg/ports/openjpeg/portfile.cmake | 37 +- .../vcpkg/ports/openjpeg/vcpkg.json | 25 +- .../vcpkg/ports/openldap/m4.patch | 12 + .../vcpkg/ports/openldap/openssl.patch | 35 + .../vcpkg/ports/openldap/portfile.cmake | 66 + .../vcpkg/ports/openldap/subdirs.patch | 34 + external_imported/vcpkg/ports/openldap/usage | 6 + .../vcpkg/ports/openldap/vcpkg.json | 19 + .../vcpkg/ports/openmpi/portfile.cmake | 4 +- .../vcpkg/ports/openmpi/vcpkg.json | 3 +- .../vcpkg/ports/openmvg/build_fixes.patch | 39 - .../ports/openmvg/no-absolute-paths.patch | 66 + .../vcpkg/ports/openmvg/portfile.cmake | 1 + .../vcpkg/ports/openmvg/vcpkg.json | 2 +- .../openmvs/fix-build-boost-1_77_0.patch | 19 - .../vcpkg/ports/openmvs/fix-build.patch | 396 +- .../ports/openmvs/no-absolute-paths.patch | 42 + .../vcpkg/ports/openmvs/portfile.cmake | 35 +- .../vcpkg/ports/openmvs/vcpkg.json | 20 +- .../vcpkg/ports/openni2/portfile.cmake | 59 +- .../vcpkg/ports/openni2/vcpkg.json | 7 +- .../vcpkg/ports/openscap/fix-build.patch | 2 +- .../vcpkg/ports/openscap/portfile.cmake | 23 +- .../vcpkg/ports/openscap/vcpkg.json | 9 +- .../vcpkg/ports/openssl/portfile.cmake | 17 +- .../vcpkg/ports/openssl/unix/CMakeLists.txt | 12 +- .../vcpkg/ports/openssl/unix/portfile.cmake | 10 +- .../vcpkg/ports/openssl/uwp/portfile.cmake | 5 - .../openssl/vcpkg-cmake-wrapper.cmake.in | 2 +- .../vcpkg/ports/openssl/vcpkg.json | 9 +- .../vcpkg/ports/openssl/windows/flags.patch | 35 + .../ports/openssl/windows/portfile.cmake | 97 +- .../ports/opentelemetry-cpp/portfile.cmake | 24 +- .../vcpkg/ports/opentelemetry-cpp/vcpkg.json | 7 +- .../vcpkg/ports/opentracing/portfile.cmake | 8 +- .../vcpkg/ports/opentracing/vcpkg.json | 15 +- .../vcpkg/ports/openvdb/portfile.cmake | 2 + .../vcpkg/ports/openvdb/vcpkg.json | 3 +- .../vcpkg/ports/openvpn3/CMakeLists.txt | 8 + .../vcpkg/ports/openvpn3/portfile.cmake | 26 +- .../vcpkg/ports/openvpn3/vcpkg.json | 14 +- .../ports/opus/fix-pkgconfig-version.patch | 13 + .../vcpkg/ports/opus/portfile.cmake | 61 +- external_imported/vcpkg/ports/opus/vcpkg.json | 15 +- .../orc/0003-dependencies-from-vcpkg.patch | 148 +- .../vcpkg/ports/orc/0005-disable-tzdata.patch | 30 - .../vcpkg/ports/orc/fix-linux-error.patch | 21 + .../vcpkg/ports/orc/portfile.cmake | 46 +- external_imported/vcpkg/ports/orc/vcpkg.json | 12 +- ...isable-present3d-staticview-in-linux.patch | 36 - .../vcpkg/ports/osg/fix-curl.patch | 18 - .../vcpkg/ports/osg/fix-dependency-coin.patch | 29 - .../ports/osg/fix-example-application.patch | 34 - .../vcpkg/ports/osg/fix-liblas.patch | 16 - .../vcpkg/ports/osg/fix-nvtt-squish.patch | 22 + .../vcpkg/ports/osg/fix-nvtt.patch | 14 - .../vcpkg/ports/osg/fix-sdl.patch | 18 +- .../vcpkg/ports/osg/link-libraries.patch | 21 + .../vcpkg/ports/osg/openexr3.patch | 46 + .../vcpkg/ports/osg/plugin-pdb-install.patch | 13 + .../vcpkg/ports/osg/portfile.cmake | 236 +- .../vcpkg/ports/osg/remove-prefix.patch | 26 - .../vcpkg/ports/osg/static.patch | 7 - .../vcpkg/ports/osg/unofficial-export.patch | 67 + .../ports/osg/unofficial-osg-config.cmake | 23 + external_imported/vcpkg/ports/osg/usage | 4 + external_imported/vcpkg/ports/osg/vcpkg.json | 191 +- .../vcpkg/ports/osgearth/StaticOSG.patch | 84 - .../vcpkg/ports/osgearth/blend2d-fix.patch | 15 - ...ages-required.patch => find-package.patch} | 87 +- .../ports/osgearth/fix-dependency-osg.patch | 176 - .../osgearth/fix-gcc11-compilation.patch | 38 - .../vcpkg/ports/osgearth/fix-imgui.patch | 21 - .../ports/osgearth/fix-osgearth-config.patch | 85 + .../vcpkg/ports/osgearth/link-libraries.patch | 16 + .../vcpkg/ports/osgearth/portfile.cmake | 123 +- .../ports/osgearth/remove-lerc-gltf.patch | 20 + .../vcpkg/ports/osgearth/vcpkg.json | 32 +- .../vcpkg/ports/otl/portfile.cmake | 2 +- external_imported/vcpkg/ports/otl/vcpkg.json | 2 +- .../ports/outcome/fix-find-library.patch | 41 + .../outcome/fix-status-code-include.patch | 16 + .../ports/outcome/outcome-prune-sources.patch | 12 - .../vcpkg/ports/outcome/portfile.cmake | 51 +- .../vcpkg/ports/outcome/vcpkg.json | 49 +- .../vcpkg/ports/pagmo2/disable-C4701.patch | 13 - .../ports/pagmo2/disable-md-override.patch | 20 - .../vcpkg/ports/pagmo2/disable-werror.patch | 20 + .../vcpkg/ports/pagmo2/doxygen.patch | 15 + .../vcpkg/ports/pagmo2/find-tbb.patch | 5 +- .../vcpkg/ports/pagmo2/portfile.cmake | 33 +- .../vcpkg/ports/pagmo2/vcpkg.json | 15 +- .../ports/paho-mqtt/fix-install-path.patch | 28 - .../paho-mqtt/fix-unresolvedsymbol-arm.patch | 7 +- .../vcpkg/ports/paho-mqtt/portfile.cmake | 26 +- .../paho-mqtt/remove_compiler_options.patch | 13 - .../vcpkg/ports/paho-mqtt/vcpkg.json | 13 +- .../ports/paho-mqttpp3/fix-include-path.patch | 249 -- .../vcpkg/ports/paho-mqttpp3/portfile.cmake | 16 +- .../vcpkg/ports/paho-mqttpp3/vcpkg.json | 12 +- .../vcpkg/ports/pango/portfile.cmake | 4 +- .../vcpkg/ports/pango/vcpkg.json | 2 +- .../ports/pangolin/fix-dependencies.patch | 36 +- .../vcpkg/ports/pangolin/vcpkg.json | 2 +- external_imported/vcpkg/ports/pangomm/COPYING | 515 --- .../vcpkg/ports/pangomm/portfile.cmake | 6 +- .../vcpkg/ports/pangomm/vcpkg.json | 5 +- .../vcpkg/ports/paraview/portfile.cmake | 47 +- .../vcpkg/ports/paraview/vcpkg.json | 13 +- .../vcpkg/ports/parmetis/build-fixes.patch | 98 + .../ports/parmetis/fix-gklib-vs14-math.patch | 11 - .../parmetis/fix-libparmetis-cmakelist.patch | 15 - .../ports/parmetis/fix-metis-vs14-math.patch | 11 - .../ports/parmetis/fix-root-cmakelist-2.patch | 18 - .../ports/parmetis/fix-root-cmakelist.patch | 29 - .../vcpkg/ports/parmetis/portfile.cmake | 43 +- .../vcpkg/ports/parmetis/vcpkg.json | 14 +- .../vcpkg/ports/pcapplusplus/portfile.cmake | 4 +- .../vcpkg/ports/pcapplusplus/vcpkg.json | 3 +- ...unction_exists_for_arm-androi_builds.patch | 32 + .../vcpkg/ports/pcre/portfile.cmake | 16 +- external_imported/vcpkg/ports/pcre/vcpkg.json | 3 +- .../vcpkg/ports/pcre2/no-static-suffix.patch | 33 + .../vcpkg/ports/pcre2/portfile.cmake | 7 +- .../vcpkg/ports/pcre2/vcpkg.json | 6 +- .../pdal/0002-no-source-dir-writes.patch | 21 - .../ports/pdal/0003-fix-copy-vendor.patch | 20 - .../ports/pdal/cmake-project-include.cmake | 6 + .../vcpkg/ports/pdal/fix-dependency.patch | 8 +- .../ports/pdal/fix-find-library-suffix.patch | 19 +- .../vcpkg/ports/pdal/portfile.cmake | 71 +- .../vcpkg/ports/pdal/use-vcpkg-boost.patch | 66 - external_imported/vcpkg/ports/pdal/vcpkg.json | 13 +- .../vcpkg/ports/pegtl/portfile.cmake | 6 +- .../vcpkg/ports/pegtl/vcpkg.json | 2 +- .../ports/pffft/fix-invalid-command.patch | 17 + .../vcpkg/ports/pffft/portfile.cmake | 2 + .../vcpkg/ports/pffft/vcpkg.json | 3 +- .../vcpkg/ports/physfs/portfile.cmake | 9 +- .../vcpkg/ports/physfs/vcpkg.json | 2 +- .../vcpkg/ports/physx/portfile.cmake | 20 +- .../vcpkg/ports/physx/remove-werror.patch | 78 +- .../vcpkg/ports/physx/vcpkg.json | 7 +- .../vcpkg/ports/pipewire/portfile.cmake | 93 + .../vcpkg/ports/pipewire/vcpkg.json | 15 + .../vcpkg/ports/pixel/portfile.cmake | 2 +- .../vcpkg/ports/pixel/vcpkg.json | 1 + .../vcpkg/ports/pixman/fix_clang-cl.patch | 13 + .../ports/pixman/missing_intrin_include.patch | 15 + .../vcpkg/ports/pixman/portfile.cmake | 22 +- .../vcpkg/ports/pixman/vcpkg.json | 2 +- .../vcpkg/ports/pkgconf/portfile.cmake | 4 +- .../vcpkg/ports/pkgconf/vcpkg.json | 3 +- .../vcpkg/ports/plog/portfile.cmake | 35 +- external_imported/vcpkg/ports/plog/usage | 6 + external_imported/vcpkg/ports/plog/vcpkg.json | 16 +- .../vcpkg/ports/pmdk/portfile.cmake | 6 +- external_imported/vcpkg/ports/pmdk/vcpkg.json | 4 +- .../vcpkg/ports/poco/arm64_pcre.patch | 15 +- .../vcpkg/ports/poco/portfile.cmake | 4 +- external_imported/vcpkg/ports/poco/vcpkg.json | 2 +- .../vcpkg/ports/podofo/fix-compiler.patch | 12 + .../ports/podofo/install-cmake-config.patch | 49 + .../vcpkg/ports/podofo/portfile.cmake | 40 +- .../vcpkg/ports/podofo/vcpkg.json | 11 +- .../001_no_catch_submodule.patch | 33 - .../polymorphic-value/002_fixed_config.patch | 14 - .../ports/polymorphic-value/portfile.cmake | 33 +- .../vcpkg/ports/polymorphic-value/vcpkg.json | 17 +- .../vcpkg/ports/poppler/portfile.cmake | 6 +- .../vcpkg/ports/poppler/vcpkg.json | 19 +- .../vcpkg/ports/portable-snippets/vcpkg.json | 8 +- .../ports/proj/fix-proj4-targets-cmake.patch | 20 +- .../vcpkg/ports/proj/portfile.cmake | 7 +- .../vcpkg/ports/proj/remove-doc.patch | 34 + external_imported/vcpkg/ports/proj/vcpkg.json | 2 +- .../vcpkg/ports/prometheus-cpp/portfile.cmake | 4 +- .../vcpkg/ports/prometheus-cpp/vcpkg.json | 3 +- .../ports/protobuf/compile_options.patch | 48 + .../fix-default-proto-file-path.patch | 7 +- .../ports/protobuf/fix-static-build.patch | 39 +- .../vcpkg/ports/protobuf/portfile.cmake | 11 +- .../vcpkg/ports/protobuf/vcpkg.json | 2 +- .../vcpkg/ports/protopuf/portfile.cmake | 4 +- .../vcpkg/ports/protopuf/vcpkg.json | 3 +- .../ports/protozero/fix-builderror.patch | 13 - .../vcpkg/ports/protozero/fix-no-tests.patch | 17 + .../vcpkg/ports/protozero/portfile.cmake | 9 +- .../vcpkg/ports/protozero/vcpkg.json | 4 +- .../vcpkg/ports/proxy/portfile.cmake | 19 + .../vcpkg/ports/proxy/vcpkg.json | 17 + .../vcpkg/ports/proxygen/portfile.cmake | 15 +- .../vcpkg/ports/proxygen/vcpkg.json | 8 +- .../vcpkg/ports/pthread-stubs/portfile.cmake | 51 + .../vcpkg/ports/pthread-stubs/vcpkg.json | 10 + .../vcpkg/ports/pthreadpool/fix-uwp.patch | 3 +- .../vcpkg/ports/pthreadpool/vcpkg.json | 2 +- ...e-wrapper.cmake => PThreads4WConfig.cmake} | 62 +- .../vcpkg/ports/pthreads/portfile.cmake | 93 +- external_imported/vcpkg/ports/pthreads/usage | 7 +- .../vcpkg-cmake-wrapper-pthread.cmake | 13 + ...vcpkg-cmake-wrapper-pthreads-windows.cmake | 39 + .../vcpkg-cmake-wrapper-pthreads.cmake | 39 + .../vcpkg/ports/pthreads/vcpkg.json | 7 +- .../vcpkg/ports/pugixml/dllexport.patch | 18 + .../vcpkg/ports/pugixml/portfile.cmake | 22 +- .../vcpkg/ports/pugixml/vcpkg.json | 15 +- .../vcpkg/ports/pybind11/fix-usage.patch | 24 + .../vcpkg/ports/pybind11/portfile.cmake | 5 +- .../vcpkg/ports/pybind11/vcpkg.json | 3 +- .../vcpkg/ports/pystring/portfile.cmake | 7 +- .../vcpkg/ports/pystring/vcpkg.json | 3 +- .../vcpkg/ports/python2/vcpkg.json | 5 +- .../ports/python3/0011-dont-skip-rpath.patch | 158 + .../vcpkg/ports/python3/portfile.cmake | 59 +- .../vcpkg/ports/python3/usage.unix | 9 + .../vcpkg/ports/python3/usage.win | 8 + .../ports/python3/vcpkg-cmake-wrapper.cmake | 6 + .../vcpkg/ports/python3/vcpkg.json | 10 +- .../vcpkg/ports/qca/portfile.cmake | 4 +- external_imported/vcpkg/ports/qca/vcpkg.json | 2 +- .../vcpkg/ports/qnnpack/fix-arm64-osx.patch | 18 + .../vcpkg/ports/qnnpack/portfile.cmake | 9 +- .../vcpkg/ports/qnnpack/vcpkg.json | 4 +- .../ports/qpid-proton/fix-dependencies.patch | 116 + .../ports/qpid-proton/fix-openssl3.patch | 22 - .../vcpkg/ports/qpid-proton/portfile.cmake | 70 +- .../ports/qpid-proton/qpid-protonConfig.cmake | 4 - .../vcpkg/ports/qpid-proton/vcpkg.json | 7 +- .../config_changes.patch | 4 +- .../hardcode_version.patch | 17 - .../qt-advanced-docking-system/portfile.cmake | 22 +- .../qt-advanced-docking-system/vcpkg.json | 3 +- external_imported/vcpkg/ports/qt/vcpkg.json | 2 +- .../vcpkg/ports/qt5-3d/portfile.cmake | 11 +- .../vcpkg/ports/qt5-3d/vcpkg.json | 2 +- .../vcpkg/ports/qt5-activeqt/vcpkg.json | 2 +- .../vcpkg/ports/qt5-androidextras/vcpkg.json | 2 +- .../ports/qt5-base/cmake/configure_qt.cmake | 73 +- .../qt5-base/cmake/qt_build_submodule.cmake | 3 - .../qt5-base/cmake/qt_port_functions.cmake | 5 - .../ports/qt5-base/cmake/qt_port_hashes.cmake | 96 +- .../cmake/qt_port_hashes_latest.cmake | 67 - .../qt5-base/patches/limits_include.patch | 13 - .../vcpkg/ports/qt5-base/portfile.cmake | 51 +- .../vcpkg/ports/qt5-base/qtdeploy.ps1 | 12 +- .../vcpkg/ports/qt5-base/vcpkg.json | 10 +- .../vcpkg/ports/qt5-charts/vcpkg.json | 2 +- .../vcpkg/ports/qt5-connectivity/vcpkg.json | 2 +- .../vcpkg/ports/qt5-datavis3d/vcpkg.json | 2 +- .../qt5-declarative/limits_include.patch | 24 - .../ports/qt5-declarative/portfile.cmake | 4 +- .../vcpkg/ports/qt5-declarative/vcpkg.json | 2 +- .../vcpkg/ports/qt5-doc/vcpkg.json | 2 +- .../vcpkg/ports/qt5-gamepad/vcpkg.json | 2 +- .../ports/qt5-graphicaleffects/vcpkg.json | 2 +- .../ports/qt5-imageformats/portfile.cmake | 29 +- .../vcpkg/ports/qt5-imageformats/vcpkg.json | 2 +- .../vcpkg/ports/qt5-location/vcpkg.json | 2 +- .../vcpkg/ports/qt5-macextras/vcpkg.json | 2 +- .../vcpkg/ports/qt5-mqtt/vcpkg.json | 2 +- .../vcpkg/ports/qt5-multimedia/vcpkg.json | 2 +- .../vcpkg/ports/qt5-networkauth/vcpkg.json | 2 +- .../vcpkg/ports/qt5-purchasing/vcpkg.json | 2 +- .../vcpkg/ports/qt5-quickcontrols/vcpkg.json | 2 +- .../vcpkg/ports/qt5-quickcontrols2/vcpkg.json | 2 +- .../vcpkg/ports/qt5-remoteobjects/vcpkg.json | 2 +- .../vcpkg/ports/qt5-script/vcpkg.json | 2 +- .../vcpkg/ports/qt5-scxml/vcpkg.json | 2 +- .../vcpkg/ports/qt5-sensors/vcpkg.json | 2 +- .../vcpkg/ports/qt5-serialbus/vcpkg.json | 2 +- .../vcpkg/ports/qt5-serialport/vcpkg.json | 2 +- .../vcpkg/ports/qt5-speech/vcpkg.json | 2 +- .../vcpkg/ports/qt5-svg/vcpkg.json | 2 +- .../ports/qt5-tools/icudt-debug-suffix.patch | 13 - .../vcpkg/ports/qt5-tools/portfile.cmake | 4 +- .../vcpkg/ports/qt5-tools/vcpkg.json | 2 +- .../vcpkg/ports/qt5-translations/vcpkg.json | 2 +- .../ports/qt5-virtualkeyboard/vcpkg.json | 2 +- .../vcpkg/ports/qt5-wayland/vcpkg.json | 2 +- .../vcpkg/ports/qt5-webchannel/vcpkg.json | 2 +- .../vcpkg/ports/qt5-webengine/portfile.cmake | 13 +- .../vcpkg/ports/qt5-webengine/vcpkg.json | 8 +- .../workaround-msvc2022-ice.patch | 101 + .../vcpkg/ports/qt5-webglplugin/vcpkg.json | 2 +- .../vcpkg/ports/qt5-websockets/vcpkg.json | 2 +- .../vcpkg/ports/qt5-webview/vcpkg.json | 2 +- .../vcpkg/ports/qt5-winextras/vcpkg.json | 3 +- .../vcpkg/ports/qt5-x11extras/vcpkg.json | 2 +- .../vcpkg/ports/qt5-xmlpatterns/vcpkg.json | 2 +- external_imported/vcpkg/ports/qt5/vcpkg.json | 14 +- .../vcpkg/ports/qt5compat/vcpkg.json | 2 +- .../vcpkg/ports/qtactiveqt/vcpkg.json | 2 +- .../ports/qtapplicationmanager/portfile.cmake | 1 + .../stack-walker-arm64.patch | 19 + .../ports/qtapplicationmanager/vcpkg.json | 3 +- .../ports/qtbase/clang-cl_QGADGET_fix.diff | 37 + .../qtbase/cmake/qt_install_copyright.cmake | 2 + .../qtbase/cmake/qt_install_submodule.cmake | 94 +- .../ports/qtbase/cmake/qt_port_data.cmake | 38 + .../qtbase/cmake/qt_port_details-latest.cmake | 112 - .../ports/qtbase/cmake/qt_port_details.cmake | 271 +- .../ports/qtbase/dont_force_cmakecache.patch | 58 - .../qtbase/dont_force_cmakecache_latest.patch | 13 + .../vcpkg/ports/qtbase/installed_dir.patch | 15 + .../vcpkg/ports/qtbase/portfile.cmake | 130 +- .../vcpkg/ports/qtbase/qmake.debug.bat | 2 +- .../vcpkg/ports/qtbase/qtpaths.debug.bat | 2 + .../vcpkg/ports/qtbase/vcpkg.json | 39 +- .../vcpkg/ports/qtbase/windeployqt.debug.bat | 10 + .../vcpkg/ports/qtcharts/vcpkg.json | 2 +- .../vcpkg/ports/qtcoap/vcpkg.json | 2 +- .../vcpkg/ports/qtconnectivity/vcpkg.json | 2 +- .../vcpkg/ports/qtdatavis3d/vcpkg.json | 2 +- .../vcpkg/ports/qtdeclarative/portfile.cmake | 1 + .../vcpkg/ports/qtdeclarative/vcpkg.json | 2 +- .../vcpkg/ports/qtdeviceutilities/vcpkg.json | 2 +- .../vcpkg/ports/qtdoc/vcpkg.json | 2 +- ...patch => no_target_promotion_latest.patch} | 7 +- .../vcpkg/ports/qtimageformats/portfile.cmake | 2 +- .../vcpkg/ports/qtimageformats/vcpkg.json | 2 +- .../ports/qtinterfaceframework/portfile.cmake | 65 +- .../requirements_minimal.txt | 14 + .../ports/qtinterfaceframework/vcpkg.json | 9 +- .../vcpkg/ports/qtkeychain-qt6/portfile.cmake | 5 +- .../vcpkg/ports/qtkeychain-qt6/vcpkg.json | 1 + .../vcpkg/ports/qtkeychain/portfile.cmake | 5 +- .../vcpkg/ports/qtkeychain/vcpkg.json | 2 +- .../vcpkg/ports/qtlocation/vcpkg.json | 2 +- .../vcpkg/ports/qtlottie/vcpkg.json | 2 +- .../vcpkg/ports/qtmqtt/vcpkg.json | 2 +- .../vcpkg/ports/qtmultimedia/portfile.cmake | 10 +- .../vcpkg/ports/qtmultimedia/vcpkg.json | 6 +- .../vcpkg/ports/qtnetworkauth/vcpkg.json | 2 +- .../vcpkg/ports/qtopcua/vcpkg.json | 3 +- .../vcpkg/ports/qtpositioning/vcpkg.json | 2 +- .../vcpkg/ports/qtquick3d/portfile.cmake | 2 +- .../vcpkg/ports/qtquick3d/vcpkg.json | 3 +- .../vcpkg/ports/qtquickcontrols2/vcpkg.json | 3 +- .../vcpkg/ports/qtquicktimeline/vcpkg.json | 2 +- .../vcpkg/ports/qtremoteobjects/vcpkg.json | 2 +- .../vcpkg/ports/qtscxml/vcpkg.json | 2 +- .../vcpkg/ports/qtsensors/vcpkg.json | 2 +- .../vcpkg/ports/qtserialbus/vcpkg.json | 2 +- .../vcpkg/ports/qtserialport/vcpkg.json | 2 +- .../vcpkg/ports/qtshadertools/vcpkg.json | 2 +- .../vcpkg/ports/qtsvg/vcpkg.json | 2 +- .../vcpkg/ports/qttools/no_src_changes.patch | 41 - .../vcpkg/ports/qttools/portfile.cmake | 62 +- .../vcpkg/ports/qttools/vcpkg.json | 2 +- .../vcpkg/ports/qttools/windeployqt.debug.bat | 10 +- .../vcpkg/ports/qttranslations/vcpkg.json | 2 +- .../vcpkg/ports/qtvirtualkeyboard/vcpkg.json | 2 +- .../vcpkg/ports/qtwayland/vcpkg.json | 2 +- .../vcpkg/ports/qtwebchannel/vcpkg.json | 2 +- .../vcpkg/ports/qtwebengine/0ce5e91.diff | 94 + .../vcpkg/ports/qtwebengine/portfile.cmake | 40 +- .../vcpkg/ports/qtwebengine/vcpkg.json | 12 +- .../vcpkg/ports/qtwebsockets/vcpkg.json | 2 +- .../vcpkg/ports/qtwebview/vcpkg.json | 2 +- .../vcpkg/ports/quantlib/portfile.cmake | 12 +- .../vcpkg/ports/quantlib/vcpkg.json | 5 +- .../vcpkg/ports/quazip/portfile.cmake | 6 +- .../vcpkg/ports/quazip/vcpkg.json | 3 +- .../vcpkg/ports/quill/fix-c4189-warning.patch | 15 - .../vcpkg/ports/quill/portfile.cmake | 8 +- .../vcpkg/ports/quill/vcpkg.json | 4 +- .../vcpkg/ports/quirc/portfile.cmake | 15 +- .../vcpkg/ports/quirc/vcpkg.json | 16 +- .../vcpkg/ports/random123/portfile.cmake | 23 + .../vcpkg/ports/random123/vcpkg.json | 7 + .../vcpkg/ports/range-v3/portfile.cmake | 4 +- .../vcpkg/ports/range-v3/vcpkg.json | 3 +- .../vcpkg/ports/rapidcsv/portfile.cmake | 4 +- .../vcpkg/ports/rapidcsv/vcpkg.json | 3 +- .../vcpkg/ports/rapidjson/portfile.cmake | 32 +- .../vcpkg/ports/rapidjson/vcpkg.json | 5 +- .../vcpkg/ports/raylib/portfile.cmake | 5 +- .../vcpkg/ports/raylib/vcpkg.json | 3 +- .../vcpkg/ports/rbdl-orb/portfile.cmake | 46 +- .../vcpkg/ports/rbdl-orb/vcpkg.json | 16 +- ...ections_exceeded_in_object_file_patch.diff | 15 - .../vcpkg/ports/rbdl/portfile.cmake | 36 +- external_imported/vcpkg/ports/rbdl/vcpkg.json | 10 +- .../vcpkg/ports/readline-unix/portfile.cmake | 1 + .../vcpkg/ports/readline-unix/vcpkg.json | 3 +- .../vcpkg/ports/readline-win32/CMakeLists.txt | 16 +- .../vcpkg/ports/readline-win32/portfile.cmake | 20 +- .../vcpkg/ports/readline-win32/vcpkg.json | 17 +- .../vcpkg/ports/readosm/vcpkg.json | 4 +- .../vcpkg/ports/realsense2/portfile.cmake | 4 +- .../vcpkg/ports/realsense2/vcpkg.json | 3 +- .../vcpkg/ports/recast/portfile.cmake | 5 +- .../vcpkg/ports/recast/vcpkg.json | 3 +- .../fix-dependency-libuv.patch | 23 + .../ports/redis-plus-plus/portfile.cmake | 10 + .../vcpkg/ports/redis-plus-plus/vcpkg.json | 20 + .../vcpkg/ports/refl-cpp/portfile.cmake | 5 +- .../vcpkg/ports/refl-cpp/vcpkg.json | 6 +- .../vcpkg/ports/rendergraph/portfile.cmake | 20 +- .../vcpkg/ports/rendergraph/vcpkg.json | 2 +- .../vcpkg/ports/restinio/portfile.cmake | 11 +- .../vcpkg/ports/restinio/vcpkg.json | 2 +- .../vcpkg/ports/rhash/CMakeLists.txt | 14 +- .../vcpkg/ports/rhash/portfile.cmake | 18 +- .../vcpkg/ports/rhash/vcpkg.json | 17 +- .../vcpkg/ports/rioki-glow/portfile.cmake | 16 + .../vcpkg/ports/rioki-glow/vcpkg.json | 19 + .../vcpkg/ports/rmlui/portfile.cmake | 4 +- .../vcpkg/ports/rmlui/vcpkg.json | 2 +- .../vcpkg/ports/roaring/portfile.cmake | 11 +- .../vcpkg/ports/roaring/vcpkg.json | 17 +- .../vcpkg/ports/robin-map/portfile.cmake | 10 +- .../vcpkg/ports/robin-map/vcpkg.json | 3 +- .../vcpkg/ports/rsig/portfile.cmake | 11 + external_imported/vcpkg/ports/rsig/usage | 4 + external_imported/vcpkg/ports/rsig/vcpkg.json | 7 + .../vcpkg/ports/rsm-binary-io/portfile.cmake | 4 +- .../vcpkg/ports/rsm-binary-io/vcpkg.json | 4 +- .../rtabmap/0001-add-bigobj-for-msvc.patch | 14 - .../ports/rtabmap/0002-fix-opencv46.patch | 11 + .../{fix-qt.patch => 0003-fix-qt.patch} | 13 - .../vcpkg/ports/rtabmap/portfile.cmake | 5 +- .../vcpkg/ports/rtabmap/vcpkg.json | 23 +- .../vcpkg/ports/rtmidi/fix-POSIXname.patch | 17 - .../vcpkg/ports/rtmidi/fix-cmake-usage.patch | 32 + .../vcpkg/ports/rtmidi/portfile.cmake | 28 +- .../vcpkg/ports/rtmidi/vcpkg.json | 26 +- .../vcpkg/ports/rttr/portfile.cmake | 66 +- external_imported/vcpkg/ports/rttr/vcpkg.json | 16 +- .../vcpkg/ports/rubberband/portfile.cmake | 48 + .../vcpkg/ports/rubberband/vcpkg.json | 30 + .../vcpkg/ports/rxcpp/portfile.cmake | 16 +- .../ports/rxcpp/support_find_package.patch | 32 - .../vcpkg/ports/rxcpp/vcpkg.json | 16 +- .../rxspencer/disable-docs-and-tests.patch | 37 + .../vcpkg/ports/rxspencer/portfile.cmake | 7 +- .../vcpkg/ports/rxspencer/vcpkg.json | 3 +- .../vcpkg/ports/ryml/cmake-fix.patch | 11 +- .../vcpkg/ports/ryml/portfile.cmake | 13 +- external_imported/vcpkg/ports/ryml/vcpkg.json | 4 +- .../vcpkg/ports/sail/portfile.cmake | 8 +- external_imported/vcpkg/ports/sail/vcpkg.json | 2 +- .../ports/saucer/fix-source-generation.patch | 21 + .../vcpkg/ports/saucer/portfile.cmake | 22 + .../ports/saucer/unofficial-webview2.patch | 15 + .../vcpkg/ports/saucer/vcpkg.json | 36 + .../vcpkg/ports/sciplot/portfile.cmake | 23 +- .../vcpkg/ports/sciplot/vcpkg.json | 16 +- .../vcpkg/ports/sdformat9/portfile.cmake | 6 +- .../vcpkg/ports/sdformat9/vcpkg.json | 5 +- .../vcpkg/ports/sdl1/portfile.cmake | 83 +- .../vcpkg/ports/sdl1/sdl-config.patch | 13 + external_imported/vcpkg/ports/sdl1/vcpkg.json | 6 +- .../vcpkg/ports/sdl2-image/CMakeLists.txt | 101 +- .../vcpkg/ports/sdl2-image/portfile.cmake | 26 +- .../sdl2-image/sdl2-image-config.cmake.in | 13 + .../vcpkg/ports/sdl2-image/vcpkg.json | 30 +- .../vcpkg/ports/sdl2-mixer/CMakeLists.txt | 166 - .../ports/sdl2-mixer/fix-featurempg123.patch | 47 - .../ports/sdl2-mixer/fix-pkg-prefix.patch | 13 + .../ports/sdl2-mixer/fix-pkgconfig.patch | 13 + .../vcpkg/ports/sdl2-mixer/portfile.cmake | 64 +- .../vcpkg/ports/sdl2-mixer/usage | 4 + .../vcpkg/ports/sdl2-mixer/vcpkg.json | 22 +- .../vcpkg/ports/sdl2-ttf/CMakeLists.txt | 52 - .../vcpkg/ports/sdl2-ttf/fix-pkgconfig.patch | 22 + .../vcpkg/ports/sdl2-ttf/portfile.cmake | 51 +- external_imported/vcpkg/ports/sdl2-ttf/usage | 4 + .../vcpkg/ports/sdl2-ttf/vcpkg.json | 24 +- ...-creation-of-pkg-cfg-file-on-windows.patch | 49 +- .../sdl2/0002-sdl2-skip-ibus-on-linux.patch | 5 +- ...disable-sdlmain-target-search-on-uwp.patch | 34 - .../ports/sdl2/0004-Define-crt-macros.patch | 15 - .../ports/sdl2/0005-Fix-uwp-joystick.patch | 25 - .../sdl2/0006-Update-SDL_sysurl.cpp.patch | 15 - ...pten-declaration-after-statement-err.patch | 45 - .../vcpkg/ports/sdl2/portfile.cmake | 43 +- external_imported/vcpkg/ports/sdl2/vcpkg.json | 11 +- .../vcpkg/ports/sdl2pp/fix-dependencies.patch | 51 +- .../vcpkg/ports/sdl2pp/portfile.cmake | 5 +- external_imported/vcpkg/ports/sdl2pp/usage | 9 +- .../ports/sdl2pp/vcpkg-cmake-wrapper.cmake | 9 +- .../vcpkg/ports/sdl2pp/vcpkg.json | 3 +- .../vcpkg/ports/seal/portfile.cmake | 6 + external_imported/vcpkg/ports/seal/vcpkg.json | 2 +- .../vcpkg/ports/secp256k1/CMakeLists.txt | 64 +- .../ports/secp256k1/libsecp256k1-config.h | 29 - .../vcpkg/ports/secp256k1/portfile.cmake | 47 +- .../ports/secp256k1/secp256k1-config.cmake | 1 - .../vcpkg/ports/secp256k1/vcpkg.json | 25 +- .../vcpkg/ports/sentry-native/portfile.cmake | 10 +- .../vcpkg/ports/sentry-native/vcpkg.json | 2 +- .../vcpkg/ports/septag-dmon/portfile.cmake | 18 + .../vcpkg/ports/septag-dmon/vcpkg.json | 14 + .../ports/sfgui/002-add-limits-header.patch | 13 + .../vcpkg/ports/sfgui/portfile.cmake | 1 + .../vcpkg/ports/sfgui/vcpkg.json | 4 +- .../vcpkg/ports/sfml/fix-dependencies.patch | 75 + .../vcpkg/ports/sfml/portfile.cmake | 14 +- .../vcpkg/ports/sfml/stb_include.patch | 14 - .../ports/sfml/use-system-freetype.patch | 11 - external_imported/vcpkg/ports/sfml/vcpkg.json | 4 +- .../ports/shaderc/glslang/CMakeLists.txt | 21 +- .../vcpkg/ports/shaderc/vcpkg.json | 2 +- .../vcpkg/ports/shaderwriter/portfile.cmake | 11 +- .../vcpkg/ports/shaderwriter/vcpkg.json | 2 +- .../ports/shiftmedia-libgcrypt/portfile.cmake | 107 + .../ports/shiftmedia-libgcrypt/vcpkg.json | 11 + .../external-libtasn1.patch | 91 + .../shiftmedia-libgnutls/pkgconfig.patch | 13 + .../ports/shiftmedia-libgnutls/portfile.cmake | 177 + .../ports/shiftmedia-libgnutls/vcpkg.json | 24 + .../vcpkg/ports/simage/portfile.cmake | 6 +- .../simage/requies-all-dependencies.patch | 29 +- .../vcpkg/ports/simage/vcpkg.json | 14 +- .../vcpkg/ports/simbody/portfile.cmake | 3 + .../vcpkg/ports/simbody/vcpkg.json | 3 +- .../vcpkg/ports/simdjson/portfile.cmake | 4 +- .../vcpkg/ports/simdjson/vcpkg.json | 2 +- .../vcpkg/ports/skia/add-missing-tuple.patch | 12 - .../ports/skia/dawn_use_vcpkg_spirv.patch | 13 + .../vcpkg/ports/skia/fontconfig.gn | 10 + .../vcpkg/ports/skia/portfile.cmake | 271 +- .../vcpkg/ports/skia/skiaConfig.cmake.in | 54 +- .../ports/skia/use_vcpkg_fontconfig.patch | 42 + external_imported/vcpkg/ports/skia/vcpkg.json | 35 +- .../ports/snappy/fix_clang-cl_build.patch | 13 + .../vcpkg/ports/snappy/portfile.cmake | 18 +- .../vcpkg/ports/snappy/snappy.pc.in | 10 + .../vcpkg/ports/snappy/vcpkg.json | 3 +- .../vcpkg/ports/so5extra/portfile.cmake | 4 +- .../vcpkg/ports/so5extra/vcpkg.json | 2 +- .../vcpkg/ports/sobjectizer/portfile.cmake | 4 +- .../vcpkg/ports/sobjectizer/vcpkg.json | 2 +- .../socket-io-client/fix-file-not-found.patch | 49 - .../ports/socket-io-client/portfile.cmake | 17 +- .../vcpkg/ports/socket-io-client/vcpkg.json | 8 +- .../vcpkg/ports/sockpp/portfile.cmake | 13 +- .../vcpkg/ports/sockpp/vcpkg.json | 6 +- external_imported/vcpkg/ports/soil2/LICENSE | 7 - .../vcpkg/ports/soil2/portfile.cmake | 21 +- .../vcpkg/ports/soil2/vcpkg.json | 3 +- .../vcpkg/ports/sol2/fix-namespace.patch | 8 +- .../vcpkg/ports/sol2/portfile.cmake | 23 +- external_imported/vcpkg/ports/sol2/vcpkg.json | 12 +- .../vcpkg/ports/solid3/no-sse.patch | 19 + .../vcpkg/ports/solid3/portfile.cmake | 8 +- .../vcpkg/ports/solid3/vcpkg.json | 17 +- ..._on_windows.patch => 003_detect_arm.patch} | 2 +- .../vcpkg/ports/soxr/portfile.cmake | 2 +- external_imported/vcpkg/ports/soxr/vcpkg.json | 2 +- .../vcpkg/ports/spdk-isal/portfile.cmake | 3 + .../vcpkg/ports/spdk-isal/vcpkg.json | 5 +- .../vcpkg/ports/spdlog/portfile.cmake | 19 +- .../vcpkg/ports/spdlog/vcpkg.json | 1 + .../vcpkg/ports/spectra/portfile.cmake | 4 +- .../vcpkg/ports/spectra/vcpkg.json | 2 +- ...ake-pkg-config-lib-name-configurable.patch | 13 - .../vcpkg/ports/speex/CMakeLists.txt | 111 - .../vcpkg/ports/speex/fix-vla-check.patch | 13 + .../vcpkg/ports/speex/portfile.cmake | 56 +- .../vcpkg/ports/speex/subdirs.patch | 13 + .../vcpkg/ports/speex/vcpkg.json | 13 +- .../vcpkg/ports/speexdsp/CMakeLists.txt | 4 +- .../vcpkg/ports/speexdsp/portfile.cmake | 19 +- .../vcpkg/ports/speexdsp/vcpkg.json | 12 +- .../vcpkg/ports/spirv-headers/portfile.cmake | 4 +- .../vcpkg/ports/spirv-headers/vcpkg.json | 2 +- .../vcpkg/ports/spirv-tools/portfile.cmake | 4 +- .../vcpkg/ports/spirv-tools/vcpkg.json | 2 +- .../vcpkg/ports/spix/portfile.cmake | 8 +- external_imported/vcpkg/ports/spix/vcpkg.json | 2 +- .../vcpkg/ports/sqlcipher/portfile.cmake | 31 +- .../vcpkg/ports/sqlcipher/vcpkg.json | 13 +- .../vcpkg/ports/sqlite3/portfile.cmake | 10 +- .../ports/sqlite3/sqlite3-config.in.cmake | 2 +- .../vcpkg/ports/sqlite3/vcpkg.json | 3 +- .../vcpkg/ports/sqlitecpp/portfile.cmake | 5 + .../vcpkg/ports/sqlitecpp/vcpkg.json | 2 +- .../sqlpp11-connector-mysql/portfile.cmake | 28 +- .../ports/sqlpp11-connector-mysql/vcpkg.json | 28 +- .../sqlpp11-connector-sqlite3/portfile.cmake | 26 +- .../sqlpp11-connector-sqlite3/vcpkg.json | 18 +- .../vcpkg/ports/sqlpp11/ddl2cpp_path.patch | 10 +- .../vcpkg/ports/sqlpp11/fix-dependency.patch | 20 - .../vcpkg/ports/sqlpp11/portfile.cmake | 37 +- .../vcpkg/ports/sqlpp11/vcpkg.json | 35 +- .../vcpkg/ports/srell/portfile.cmake | 4 +- .../vcpkg/ports/srell/vcpkg.json | 5 +- .../vcpkg/ports/status-code/portfile.cmake | 17 +- .../vcpkg/ports/status-code/vcpkg.json | 20 +- .../vcpkg/ports/stb/portfile.cmake | 24 +- external_imported/vcpkg/ports/stb/vcpkg.json | 5 +- .../ports/stduuid/fix-gsl-polyfill.patch | 37 + .../ports/stduuid/fix-install-directory.patch | 23 + .../stduuid/fix-libuuid-dependency.patch | 32 + .../vcpkg/ports/stduuid/portfile.cmake | 40 + .../vcpkg/ports/stduuid/vcpkg.json | 33 + .../vcpkg/ports/stftpitchshift/portfile.cmake | 29 + .../vcpkg/ports/stftpitchshift/vcpkg.json | 16 + .../vcpkg/ports/string-theory/portfile.cmake | 4 +- .../vcpkg/ports/string-theory/vcpkg.json | 3 +- .../vcpkg/ports/stronk/portfile.cmake | 21 + .../vcpkg/ports/stronk/vcpkg.json | 41 + .../ports/stxxl/0001-fix-visual-studio.patch | 529 +-- .../vcpkg/ports/stxxl/vcpkg.json | 4 +- .../vcpkg/ports/sundials/portfile.cmake | 16 +- .../vcpkg/ports/sundials/vcpkg.json | 2 +- .../vcpkg/ports/superlu/portfile.cmake | 21 +- .../vcpkg/ports/superlu/vcpkg.json | 13 +- .../vcpkg/ports/symengine/fix-build.patch | 13 - .../vcpkg/ports/symengine/portfile.cmake | 6 +- .../vcpkg/ports/symengine/vcpkg.json | 4 +- .../vcpkg/ports/szip/portfile.cmake | 20 +- external_imported/vcpkg/ports/szip/vcpkg.json | 3 +- .../vcpkg/ports/taglib/portfile.cmake | 11 +- .../vcpkg/ports/taglib/vcpkg.json | 4 +- .../vcpkg/ports/taskflow/portfile.cmake | 4 +- .../vcpkg/ports/taskflow/vcpkg.json | 2 +- .../vcpkg/ports/tbb/CMakeLists.txt | 40 - .../vcpkg/ports/tbb/fix-static-build.patch | 13 - .../vcpkg/ports/tbb/portfile.cmake | 152 +- .../terminate-when-buildtool-notfound.patch | 13 - external_imported/vcpkg/ports/tbb/usage | 4 - external_imported/vcpkg/ports/tbb/vcpkg.json | 16 +- .../vcpkg/ports/tclap/portfile.cmake | 4 +- .../vcpkg/ports/tclap/vcpkg.json | 6 +- .../vcpkg/ports/teemo/portfile.cmake | 4 +- .../vcpkg/ports/teemo/vcpkg.json | 3 +- .../ports/tensorpipe/fix-cmakelists.patch | 71 - .../vcpkg/ports/tensorpipe/portfile.cmake | 27 +- .../ports/tensorpipe/support-pybind11.patch | 30 - .../vcpkg/ports/tensorpipe/support-test.patch | 46 +- .../vcpkg/ports/tensorpipe/use-vcpkg.patch | 52 + .../vcpkg/ports/tensorpipe/vcpkg.json | 3 +- .../vcpkg/ports/termcolor/portfile.cmake | 17 +- .../vcpkg/ports/termcolor/vcpkg.json | 15 +- .../tesseract/fix-depend-libarchive.patch | 12 + .../ports/tesseract/fix-tiff-linkage.patch | 13 - .../vcpkg/ports/tesseract/fix-timeval.patch | 14 - .../vcpkg/ports/tesseract/portfile.cmake | 31 +- .../vcpkg/ports/tesseract/vcpkg.json | 8 +- .../vcpkg/ports/tgui/devendor-stb.patch | 27 + .../vcpkg/ports/tgui/fix-dependencies.patch | 95 +- .../vcpkg/ports/tgui/fix-usage.patch | 23 - .../vcpkg/ports/tgui/portfile.cmake | 58 +- external_imported/vcpkg/ports/tgui/usage | 4 + external_imported/vcpkg/ports/tgui/vcpkg.json | 37 +- .../theia/fix-external-dependencies.patch | 3 +- .../vcpkg/ports/theia/portfile.cmake | 1 + .../vcpkg/ports/theia/vcpkg.json | 5 +- .../vcpkg/ports/thor/portfile.cmake | 21 +- external_imported/vcpkg/ports/thor/vcpkg.json | 11 +- .../vcpkg/ports/thrift/pc-suffix.patch | 44 + .../vcpkg/ports/thrift/portfile.cmake | 81 +- .../vcpkg/ports/thrift/vcpkg.json | 12 +- .../ports/tidy-html5/debug-postfix.patch | 25 + .../vcpkg/ports/tidy-html5/disable-doc.patch | 13 + .../vcpkg/ports/tidy-html5/portfile.cmake | 33 +- .../ports/tidy-html5/static-vs-shared.patch | 34 + .../vcpkg/ports/tidy-html5/vcpkg.json | 9 +- .../vcpkg/ports/tiff/android-libm.patch | 14 + .../vcpkg/ports/tiff/cmakelists.patch | 22 +- .../vcpkg/ports/tiff/fix-pkgconfig.patch | 104 - .../vcpkg/ports/tiff/portfile.cmake | 16 +- .../ports/tiff/vcpkg-cmake-wrapper.cmake.in | 2 +- external_imported/vcpkg/ports/tiff/vcpkg.json | 8 +- .../vcpkg/ports/tinydir/portfile.cmake | 9 +- .../vcpkg/ports/tinydir/vcpkg.json | 6 +- .../vcpkg/ports/tinyobjloader/portfile.cmake | 19 +- .../vcpkg/ports/tinyobjloader/vcpkg.json | 14 +- .../vcpkg/ports/tinyspline/portfile.cmake | 4 +- .../vcpkg/ports/tinyspline/vcpkg.json | 4 +- .../vcpkg/ports/tinyutf8/fixbuild.patch | 43 - .../vcpkg/ports/tinyutf8/portfile.cmake | 20 +- .../vcpkg/ports/tinyutf8/vcpkg.json | 12 +- .../vcpkg/ports/tinyxml2/portfile.cmake | 4 +- .../vcpkg/ports/tinyxml2/vcpkg.json | 2 + .../vcpkg/ports/tmx/libxml2.patch | 12 + .../vcpkg/ports/tmx/portfile.cmake | 2 + external_imported/vcpkg/ports/tmx/vcpkg.json | 3 +- .../vcpkg/ports/tmxlite/portfile.cmake | 6 +- .../vcpkg/ports/tmxlite/vcpkg.json | 2 + .../vcpkg/ports/toml11/portfile.cmake | 6 +- .../vcpkg/ports/toml11/vcpkg.json | 3 +- .../vcpkg/ports/tomlplusplus/portfile.cmake | 11 +- .../vcpkg/ports/tomlplusplus/vcpkg.json | 2 +- .../ports/tracy/001-fix-vcxproj-vcpkg.patch | 44 + .../ports/tracy/002-fix-capstone-5.patch | 26 + .../vcpkg/ports/tracy/portfile.cmake | 160 +- .../vcpkg/ports/tracy/vcpkg.json | 37 +- .../vcpkg/ports/trantor/portfile.cmake | 5 +- .../vcpkg/ports/trantor/vcpkg.json | 2 +- .../vcpkg/ports/trantor/vcpkg.patch | 14 - .../vcpkg/ports/tre/CMakeLists.txt | 3 + .../vcpkg/ports/tre/fix-config.patch | 17 + .../vcpkg/ports/tre/portfile.cmake | 6 +- external_imported/vcpkg/ports/tre/vcpkg.json | 4 +- .../vcpkg/ports/tree-sitter/CMakeLists.txt | 51 + .../vcpkg/ports/tree-sitter/pkgconfig.patch | 22 + .../vcpkg/ports/tree-sitter/portfile.cmake | 30 + .../vcpkg/ports/tree-sitter/vcpkg.json | 17 + .../ports/triton/001-fix-dependency-z3.patch | 28 +- ...stone-5.patch => 002-fix-capstone-5.patch} | 0 .../triton/002-fix-dependency-capstone.patch | 60 - .../vcpkg/ports/triton/003-fix-python.patch | 28 + .../vcpkg/ports/triton/004-fix-python.patch | 27 - .../vcpkg/ports/triton/portfile.cmake | 20 +- .../vcpkg/ports/triton/vcpkg.json | 12 +- .../vcpkg/ports/turbobase64/CMakeLists.txt | 32 +- .../vcpkg/ports/turbobase64/portfile.cmake | 15 +- .../vcpkg/ports/turbobase64/vcpkg.json | 15 +- .../vcpkg/ports/unixodbc/portfile.cmake | 28 +- external_imported/vcpkg/ports/unixodbc/usage | 4 +- .../vcpkg/ports/unixodbc/vcpkg.json | 3 +- .../vcpkg/ports/unrar/portfile.cmake | 4 +- .../vcpkg/ports/unrar/vcpkg.json | 3 +- .../ports/upb/0001-make-cmakelists-py.patch | 141 + .../vcpkg/ports/upb/0002-fix-uwp.patch | 13 + .../vcpkg/ports/upb/add-all-libs-target.patch | 25 - .../vcpkg/ports/upb/add-cmake-install.patch | 41 - .../vcpkg/ports/upb/fix-cmakelists.patch | 33 - .../vcpkg/ports/upb/fix-uwp.patch | 28 - .../vcpkg/ports/upb/portfile.cmake | 49 +- .../ports/upb/upb-config-vcpkg-tools.cmake | 10 + external_imported/vcpkg/ports/upb/vcpkg.json | 21 +- .../urdfdom-headers/fix-include-path.patch | 17 +- .../ports/urdfdom-headers/portfile.cmake | 40 +- .../vcpkg/ports/urdfdom-headers/vcpkg.json | 16 +- .../ports/urdfdom/0001_use_math_defines.patch | 27 +- .../ports/urdfdom/0002_fix_exports.patch | 29 - .../0004_fix-dependency-console_bridge.patch | 13 - .../urdfdom/0005-fix-config-and-install.patch | 101 +- .../vcpkg/ports/urdfdom/portfile.cmake | 24 +- .../vcpkg/ports/urdfdom/vcpkg.json | 5 +- .../vcpkg/ports/usd/portfile.cmake | 9 + external_imported/vcpkg/ports/usd/vcpkg.json | 2 +- .../vcpkg/ports/usockets/CMakeLists.txt | 14 +- .../vcpkg/ports/usockets/vcpkg.json | 2 + .../ports/utf8proc/export-cmake-targets.patch | 25 +- .../vcpkg/ports/utf8proc/portfile.cmake | 6 +- .../vcpkg/ports/utf8proc/vcpkg.json | 4 +- .../vcpkg/ports/utfcpp/portfile.cmake | 17 +- .../vcpkg/ports/utfcpp/vcpkg.json | 14 +- .../vcpkg/ports/uvatlas/openexr.patch | 12 + .../vcpkg/ports/uvatlas/portfile.cmake | 16 +- .../vcpkg/ports/uvatlas/vcpkg.json | 3 +- .../vcpkg/ports/uvw/CMakeLists.txt | 8 +- .../vcpkg/ports/uvw/portfile.cmake | 23 +- .../vcpkg/ports/uvw/uvw-config.cmake | 2 +- external_imported/vcpkg/ports/uvw/vcpkg.json | 15 +- .../vcpkg/ports/uwebsockets/portfile.cmake | 4 +- .../vcpkg/ports/uwebsockets/vcpkg.json | 3 +- external_imported/vcpkg/ports/v8/vcpkg.json | 5 +- .../vcpkg/ports/vamp-sdk/portfile.cmake | 9 +- .../vcpkg/ports/vamp-sdk/vcpkg.json | 9 +- .../ports/vc/Fix-internal-func-export.patch | 16 + .../vcpkg/ports/vc/portfile.cmake | 28 +- external_imported/vcpkg/ports/vc/vcpkg.json | 16 +- .../ports/vcglib/consume-vcpkg-eigen3.patch | 216 +- .../vcpkg/ports/vcglib/fix-build.patch | 13 + .../vcpkg/ports/vcglib/portfile.cmake | 12 +- .../vcpkg/ports/vcglib/vcpkg.json | 4 +- .../vcpkg/ports/vcpkg-cmake-config/README.md | 10 - .../vcpkg/ports/vcpkg-cmake-config/vcpkg.json | 5 +- .../vcpkg_cmake_config_fixup.cmake | 56 +- .../cmake_get_vars/CMakeLists.txt | 16 +- .../ports/vcpkg-cmake-get-vars/portfile.cmake | 14 + .../vcpkg-port-config.cmake | 2 + .../ports/vcpkg-cmake-get-vars/vcpkg.json | 13 + .../vcpkg_cmake_get_vars.cmake | 41 +- .../vcpkg/ports/vcpkg-cmake/README.md | 7 - .../vcpkg/ports/vcpkg-cmake/copyright | 23 - .../vcpkg/ports/vcpkg-cmake/portfile.cmake | 8 +- .../ports/vcpkg-cmake/vcpkg-port-config.cmake | 1 - .../vcpkg/ports/vcpkg-cmake/vcpkg.json | 3 +- .../ports/vcpkg-cmake/vcpkg_cmake_build.cmake | 125 +- .../vcpkg-cmake/vcpkg_cmake_configure.cmake | 294 +- .../vcpkg-cmake/vcpkg_cmake_install.cmake | 27 +- .../vcpkg-get-python-packages/portfile.cmake | 3 + .../vcpkg-get-python-packages/python310._pth | 7 + .../vcpkg-get-python-packages/vcpkg.json | 3 +- .../x_vcpkg_get_python_packages.cmake | 150 +- .../ports/vcpkg-gn/vcpkg-port-config.cmake | 3 +- .../vcpkg/ports/vcpkg-gn/vcpkg.json | 4 +- .../ports/vcpkg-gn/vcpkg_gn_configure.cmake | 35 +- .../ports/vcpkg-gn/vcpkg_gn_install.cmake | 32 +- .../ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake | 4 + .../vcpkg-pkgconfig-get-modules/README.md | 6 - .../vcpkg-pkgconfig-get-modules/vcpkg.json | 3 + .../x_vcpkg_pkgconfig_get_modules.cmake | 47 +- .../vcpkg/ports/vcpkg-qmake/copyright | 23 - .../vcpkg/ports/vcpkg-qmake/portfile.cmake | 4 +- .../ports/vcpkg-qmake/vcpkg-port-config.cmake | 2 +- .../vcpkg/ports/vcpkg-qmake/vcpkg.json | 9 +- .../vcpkg-qmake/vcpkg_qmake_configure.cmake | 34 +- .../vcpkg/ports/vcpkg-tool-gn/portfile.cmake | 62 + .../vcpkg/ports/vcpkg-tool-gn/vcpkg.json | 8 + .../fix_linker_detection.patch | 25 - .../ports/vcpkg-tool-meson/portfile.cmake | 11 +- .../vcpkg-tool-meson/vcpkg-port-config.cmake | 1 + .../vcpkg/ports/vcpkg-tool-meson/vcpkg.json | 4 +- .../ports/vcpkg-tool-ninja/portfile.cmake | 30 + .../vcpkg-tool-ninja/use-internal-re2c.patch | 13 + .../vcpkg-tool-ninja/vcpkg-port-config.cmake | 1 + .../vcpkg/ports/vcpkg-tool-ninja/vcpkg.json | 13 + .../vcpkg/ports/vectorclass/portfile.cmake | 14 +- .../vcpkg/ports/vectorclass/vcpkg.json | 16 +- .../vcpkg/ports/vkfft/portfile.cmake | 12 + .../vcpkg/ports/vkfft/vcpkg.json | 7 + .../vcpkg/ports/vlpp/fix-arm.patch | 34 + .../vcpkg/ports/vlpp/portfile.cmake | 1 + external_imported/vcpkg/ports/vlpp/vcpkg.json | 5 +- .../vcpkg/ports/volk/portfile.cmake | 4 +- external_imported/vcpkg/ports/volk/vcpkg.json | 1 + .../vcpkg/ports/vtk-m/vcpkg.json | 4 +- .../vcpkg/ports/vtk/fix-find-libharu.patch | 36 + .../vcpkg/ports/vtk/portfile.cmake | 2 + external_imported/vcpkg/ports/vtk/vcpkg.json | 9 +- .../vcpkg/ports/vulkan-headers/portfile.cmake | 6 +- .../vcpkg/ports/vulkan-headers/vcpkg.json | 2 +- .../vcpkg/ports/wavpack/OpenSSL.patch | 13 - .../ports/wavpack/fix-symbol-exports.patch | 22 - .../vcpkg/ports/wavpack/portfile.cmake | 18 +- .../vcpkg/ports/wavpack/vcpkg.json | 16 +- .../ports/wayland-protocols/portfile.cmake | 36 + .../vcpkg/ports/wayland-protocols/vcpkg.json | 10 + .../vcpkg/ports/wayland/portfile.cmake | 65 + .../vcpkg/ports/wayland/tests.patch | 30 + .../vcpkg/ports/wayland/vcpkg.json | 17 + .../vcpkg/ports/webview2/portfile.cmake | 55 + .../webview2/unofficial-webview2-config.cmake | 21 + .../vcpkg/ports/webview2/vcpkg.json | 12 + .../vcpkg/ports/winreg/portfile.cmake | 6 +- .../vcpkg/ports/winreg/vcpkg.json | 2 +- .../vcpkg/ports/winsock2/portfile.cmake | 5 + .../vcpkg/ports/winsock2/vcpkg.json | 3 +- .../vcpkg/ports/wolfmqtt/portfile.cmake | 29 + .../vcpkg/ports/wolfmqtt/vcpkg.json | 19 + .../vcpkg/ports/wolfssl/portfile.cmake | 38 + .../vcpkg/ports/wolfssl/vcpkg.json | 18 + .../vcpkg/ports/wolfssl/wolfssl_pr5529.diff | 68 + .../vcpkg/ports/wolftpm/portfile.cmake | 26 + .../vcpkg/ports/wolftpm/vcpkg.json | 19 + .../vcpkg/ports/workflow/portfile.cmake | 9 +- .../vcpkg/ports/workflow/vcpkg.json | 2 + .../ports/wpilib/fix-dependency-libuv.patch | 32 + .../vcpkg/ports/wpilib/portfile.cmake | 45 +- .../vcpkg/ports/wpilib/vcpkg.json | 15 +- .../vcpkg/ports/wren/portfile.cmake | 17 +- external_imported/vcpkg/ports/wren/vcpkg.json | 12 +- .../vcpkg/ports/wt/portfile.cmake | 4 +- external_imported/vcpkg/ports/wt/vcpkg.json | 3 +- .../vcpkg/ports/wtl/atlribbon.h-wtl66.patch | 17 + .../vcpkg/ports/wtl/portfile.cmake | 19 +- external_imported/vcpkg/ports/wtl/vcpkg.json | 7 +- .../vcpkg/ports/wxchartdir/portfile.cmake | 37 +- .../vcpkg/ports/wxchartdir/vcpkg.json | 12 +- .../vcpkg/ports/wxcharts/portfile.cmake | 18 + .../vcpkg/ports/wxcharts/vcpkg.json | 18 + .../wxwidgets/disable-platform-lib-dir.patch | 13 - .../ports/wxwidgets/example/CMakeLists.txt | 31 + .../vcpkg/ports/wxwidgets/fix-build.patch | 13 - .../ports/wxwidgets/fix-libs-export.patch | 21 + .../ports/wxwidgets/fix-linux-configure.patch | 49 - .../vcpkg/ports/wxwidgets/fix-pcre2.patch | 23 + .../ports/wxwidgets/gtk3-link-libraries.patch | 12 + .../ports/wxwidgets/install-layout.patch | 52 + .../ports/wxwidgets/nanosvg-ext-depend.patch | 42 + .../vcpkg/ports/wxwidgets/portfile.cmake | 158 +- .../wxwidgets/relocatable-wx-config.patch | 49 + external_imported/vcpkg/ports/wxwidgets/usage | 7 +- .../ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 94 +- .../vcpkg/ports/wxwidgets/vcpkg.json | 56 +- .../vcpkg/ports/x264/allow-clang-cl.patch | 16 + .../vcpkg/ports/x264/configure-as.patch | 10 + .../vcpkg/ports/x264/parallel-install.patch | 14 + .../vcpkg/ports/x264/portfile.cmake | 134 +- external_imported/vcpkg/ports/x264/vcpkg.json | 39 +- .../ports/x265/fix-pkgconfig-version.patch | 13 + .../vcpkg/ports/x265/portfile.cmake | 97 +- external_imported/vcpkg/ports/x265/vcpkg.json | 13 +- .../vcpkg/ports/xaudio2redist/portfile.cmake | 12 +- .../vcpkg/ports/xaudio2redist/vcpkg.json | 6 +- .../vcpkg/ports/xbyak/portfile.cmake | 6 +- .../vcpkg/ports/xbyak/vcpkg.json | 4 +- .../vcpkg/ports/xcb-proto/portfile.cmake | 49 + .../vcpkg/ports/xcb-proto/vcpkg.json | 18 + .../ports/xcb-render-util/portfile.cmake | 31 + .../vcpkg/ports/xcb-render-util/pthread.patch | 28 + .../vcpkg/ports/xcb-render-util/vcpkg.json | 10 + .../vcpkg/ports/xcb-util-m4/portfile.cmake | 15 + .../vcpkg/ports/xcb-util-m4/vcpkg.json | 7 + .../vcpkg/ports/xcb/configure.patch | 47 + .../vcpkg/ports/xcb/getpid_include.patch | 14 + .../vcpkg/ports/xcb/makefile.patch | 13 + .../vcpkg/ports/xcb/portfile.cmake | 107 + .../ports/xcb/use_xwindows_includes.patch | 21 + external_imported/vcpkg/ports/xcb/vcpkg.json | 22 + .../ports/xlnt/fix-missing-include.patch | 12 + .../vcpkg/ports/xlnt/portfile.cmake | 20 +- external_imported/vcpkg/ports/xlnt/vcpkg.json | 15 +- .../vcpkg/ports/xlsxio/export-targets.patch | 138 + .../vcpkg/ports/xlsxio/portfile.cmake | 28 +- .../vcpkg/ports/xlsxio/vcpkg.json | 10 + .../vcpkg/ports/xmlsec/portfile.cmake | 4 +- .../vcpkg/ports/xmlsec/vcpkg.json | 2 +- .../vcpkg/ports/xorg-macros/portfile.cmake | 67 + .../vcpkg/ports/xorg-macros/skip_rawcpp.patch | 43 + .../vcpkg/ports/xorg-macros/vcpkg.json | 8 + .../vcpkg/ports/xproto/portfile.cmake | 51 + .../vcpkg/ports/xproto/upstream-1.patch | 12 + .../vcpkg/ports/xproto/vcpkg.json | 15 + .../ports/xproto/vcxserver-xw32defs.patch | 22 + .../ports/xproto/windows-include-guards.patch | 41 + .../vcpkg/ports/xproto/windows-io.patch | 12 + .../vcpkg/ports/xproto/windows-long64.patch | 48 + .../vcpkg/ports/xproto/windows-none.patch | 85 + .../ports/xproto/windows_mean_and_lean.patch | 13 + .../vcpkg/ports/xsimd/portfile.cmake | 4 +- .../vcpkg/ports/xsimd/vcpkg.json | 3 +- .../vcpkg/ports/xtensor-blas/portfile.cmake | 4 +- .../vcpkg/ports/xtensor-blas/vcpkg.json | 3 +- .../vcpkg/ports/xtrans/portfile.cmake | 64 + .../vcpkg/ports/xtrans/symbols.patch | 15 + .../vcpkg/ports/xtrans/vcpkg.json | 10 + .../vcpkg/ports/xtrans/win32.patch | 58 + .../vcpkg/ports/yara/portfile.cmake | 4 +- external_imported/vcpkg/ports/yara/vcpkg.json | 2 +- .../ports/yasm/fix-arm-cross-build.patch | 94 + .../vcpkg/ports/yasm/portfile.cmake | 22 +- external_imported/vcpkg/ports/yasm/vcpkg.json | 11 +- .../yoga/Export-unofficial-yoga-config.patch | 33 + .../vcpkg/ports/yoga/portfile.cmake | 37 +- external_imported/vcpkg/ports/yoga/vcpkg.json | 14 +- .../vcpkg/ports/yyjson/portfile.cmake | 17 +- .../vcpkg/ports/yyjson/vcpkg.json | 24 +- .../vcpkg/ports/z3/portfile.cmake | 23 +- .../ports/z3/remove-flag-overrides.patch | 12 + external_imported/vcpkg/ports/z3/vcpkg.json | 14 +- .../ports/z4kn4fein-semver/portfile.cmake | 17 + .../vcpkg/ports/z4kn4fein-semver/vcpkg.json | 17 + .../vcpkg/ports/zeroc-ice/change_to_mt.ps1 | 53 + .../vcpkg/ports/zeroc-ice/mcppd_fix.patch | 24 + .../vcpkg/ports/zeroc-ice/md5i_fix.patch | 21 + .../vcpkg/ports/zeroc-ice/portfile.cmake | 306 ++ .../ports/zeroc-ice/prepare_for_build.cmake | 76 + .../vcpkg/ports/zeroc-ice/slice2swift.patch | 25 + .../vcpkg/ports/zeroc-ice/vcpkg.json | 122 + .../vcpkg/ports/zeromq/portfile.cmake | 6 +- .../vcpkg/ports/zeromq/vcpkg.json | 2 +- .../vcpkg/ports/zlib-ng/portfile.cmake | 12 +- .../vcpkg/ports/zlib-ng/vcpkg.json | 3 +- .../vcpkg/ports/zlib/CVE-2022-37434.patch | 17 + external_imported/vcpkg/ports/zlib/LICENSE | 20 - ..._mingw.patch => debug-postfix-mingw.patch} | 0 .../vcpkg/ports/zlib/portfile.cmake | 50 +- external_imported/vcpkg/ports/zlib/vcpkg.json | 10 +- .../vcpkg/ports/zookeeper/portfile.cmake | 29 +- .../vcpkg/ports/zookeeper/vcpkg.json | 15 +- .../vcpkg/ports/zopfli/portfile.cmake | 57 +- .../vcpkg/ports/zopfli/vcpkg.json | 17 +- .../vcpkg/ports/zpp-bits/portfile.cmake | 9 +- .../vcpkg/ports/zpp-bits/vcpkg.json | 2 +- .../vcpkg/ports/zserge-webview/portfile.cmake | 18 +- .../vcpkg/ports/zserge-webview/vcpkg.json | 7 +- external_imported/vcpkg/ports/zug/vcpkg.json | 1 + .../vcpkg/ports/zziplib/export-targets.patch | 73 + .../vcpkg/ports/zziplib/portfile.cmake | 3 + .../vcpkg/ports/zziplib/vcpkg.json | 1 + .../vcpkg/scripts/Get-Changelog.ps1 | 22 +- .../azure-pipelines/azure-pipelines.yml | 19 +- .../azure-pipelines/bootstrap-from-source.sh | 9 + .../azure-pipelines/linux/azure-pipelines.yml | 45 +- .../azure-pipelines/linux/create-image.ps1 | 8 +- .../azure-pipelines/linux/create-vmss.ps1 | 6 +- .../azure-pipelines/linux/provision-image.sh | 108 +- .../azure-pipelines/osx/azure-pipelines.yml | 43 +- .../vagrant-box-configuration.json | 4 +- .../azure-pipelines/test-modified-ports.ps1 | 9 +- .../windows-unstable/azure-pipelines.yml | 2 +- .../azure-pipelines/windows-unstable/job.yml | 22 +- .../windows/azure-pipelines.yml | 88 +- .../windows/bootstrap-from-source.cmd | 7 + .../azure-pipelines/windows/create-image.ps1 | 8 +- .../azure-pipelines/windows/create-vmss.ps1 | 6 +- .../windows/deploy-inteloneapi.ps1 | 2 +- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- .../windows/deploy-visual-studio.ps1 | 10 +- .../windows/deploy-windows-sdks.ps1 | 3 - .../windows/validate-version-files.ps1 | 29 + .../vcpkg/scripts/boost/generate-ports.ps1 | 30 +- .../boost/post-source-stubs/atomic.cmake | 6 +- .../boost/post-source-stubs/context.cmake | 9 +- .../boost/post-source-stubs/fiber.cmake | 7 +- .../boost/post-source-stubs/json.cmake | 7 +- .../scripts/boost/post-source-stubs/log.cmake | 9 +- .../boost/post-source-stubs/nowide.cmake | 7 +- .../boost/post-source-stubs/test.cmake | 7 +- .../boost/post-source-stubs/wave.cmake | 5 + external_imported/vcpkg/scripts/bootstrap.ps1 | 2 +- external_imported/vcpkg/scripts/bootstrap.sh | 14 +- .../vcpkg/scripts/build_info.cmake | 3 + .../buildsystems/make_wrapper/windres-rc | 41 +- .../scripts/buildsystems/msbuild/vcpkg.props | 24 +- .../buildsystems/msbuild/vcpkg.targets | 6 +- .../vcpkg/scripts/buildsystems/vcpkg.cmake | 43 +- .../vcpkg/scripts/ci.baseline.txt | 559 +-- .../vcpkg/scripts/cmake/execute_process.cmake | 9 - .../scripts/cmake/vcpkg_acquire_msys.cmake | 92 +- .../scripts/cmake/vcpkg_add_to_path.cmake | 24 - .../scripts/cmake/vcpkg_apply_patches.cmake | 16 - .../cmake/vcpkg_backup_restore_env_vars.cmake | 24 - .../scripts/cmake/vcpkg_build_cmake.cmake | 42 +- .../scripts/cmake/vcpkg_build_make.cmake | 55 - .../scripts/cmake/vcpkg_build_msbuild.cmake | 64 - .../scripts/cmake/vcpkg_build_ninja.cmake | 17 - .../scripts/cmake/vcpkg_build_nmake.cmake | 85 +- .../scripts/cmake/vcpkg_build_qmake.cmake | 12 - .../vcpkg_buildpath_length_warning.cmake | 14 - .../scripts/cmake/vcpkg_check_features.cmake | 134 - .../scripts/cmake/vcpkg_check_linkage.cmake | 36 - .../vcpkg_clean_executables_in_bin.cmake | 23 - .../scripts/cmake/vcpkg_clean_msbuild.cmake | 15 - .../cmake/vcpkg_common_definitions.cmake | 38 +- .../scripts/cmake/vcpkg_configure_cmake.cmake | 163 +- .../scripts/cmake/vcpkg_configure_gn.cmake | 37 +- .../scripts/cmake/vcpkg_configure_make.cmake | 351 +- .../scripts/cmake/vcpkg_configure_meson.cmake | 107 +- .../scripts/cmake/vcpkg_configure_qmake.cmake | 121 +- .../vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake | 26 - .../cmake/vcpkg_copy_tool_dependencies.cmake | 21 - .../scripts/cmake/vcpkg_copy_tools.cmake | 34 - .../cmake/vcpkg_download_distfile.cmake | 90 +- .../cmake/vcpkg_execute_build_process.cmake | 43 +- .../vcpkg_execute_in_download_mode.cmake | 19 - .../vcpkg_execute_required_process.cmake | 70 +- ...cpkg_execute_required_process_repeat.cmake | 23 +- .../cmake/vcpkg_extract_source_archive.cmake | 86 +- .../vcpkg_extract_source_archive_ex.cmake | 24 - .../cmake/vcpkg_fail_port_install.cmake | 43 - .../cmake/vcpkg_find_acquire_program.cmake | 131 +- .../scripts/cmake/vcpkg_find_fortran.cmake | 23 - .../cmake/vcpkg_fixup_cmake_targets.cmake | 59 - .../scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 49 +- .../scripts/cmake/vcpkg_from_bitbucket.cmake | 58 - .../vcpkg/scripts/cmake/vcpkg_from_git.cmake | 53 +- .../scripts/cmake/vcpkg_from_github.cmake | 76 - .../scripts/cmake/vcpkg_from_gitlab.cmake | 116 +- .../cmake/vcpkg_from_sourceforge.cmake | 71 - ...g_get_program_files_platform_bitness.cmake | 13 - .../scripts/cmake/vcpkg_get_windows_sdk.cmake | 11 - .../scripts/cmake/vcpkg_host_path_list.cmake | 29 +- .../scripts/cmake/vcpkg_install_cmake.cmake | 26 - .../cmake/vcpkg_install_copyright.cmake | 42 + .../scripts/cmake/vcpkg_install_gn.cmake | 28 - .../scripts/cmake/vcpkg_install_make.cmake | 24 - .../scripts/cmake/vcpkg_install_meson.cmake | 20 - .../scripts/cmake/vcpkg_install_msbuild.cmake | 93 - .../scripts/cmake/vcpkg_install_nmake.cmake | 66 - .../scripts/cmake/vcpkg_install_qmake.cmake | 24 - .../vcpkg/scripts/cmake/vcpkg_list.cmake | 92 - .../cmake/vcpkg_minimum_required.cmake | 15 - .../scripts/cmake/vcpkg_replace_string.cmake | 10 - .../scripts/cmake/z_vcpkg_apply_patches.cmake | 30 - .../scripts/cmake/z_vcpkg_fixup_rpath.cmake | 57 + .../z_vcpkg_forward_output_variable.cmake | 36 - .../cmake/z_vcpkg_function_arguments.cmake | 27 - .../cmake/z_vcpkg_get_cmake_vars.cmake | 34 - .../cmake/z_vcpkg_prettify_command_line.cmake | 19 - .../cmake/z_vcpkg_setup_pkgconfig_path.cmake | 47 + .../scripts/get_cmake_vars/CMakeLists.txt | 7 +- .../compile_wrapper_consider_clang-cl.patch | 12 + external_imported/vcpkg/scripts/ports.cmake | 11 +- .../vcpkg/scripts/templates/portfile.in.cmake | 15 +- .../vcpkg/scripts/templates/vcpkg.json.in | 2 +- .../test_ports/cmake-user/portfile.cmake | 86 +- .../cmake-user/project/CMakeLists.txt | 50 +- .../project/FindZLIBviaPkgConfig.cmake | 11 + .../scripts/test_ports/cmake-user/vcpkg.json | 76 +- .../cmake/fix-dependency-libuv.patch | 28 + .../scripts/test_ports/cmake/portfile.cmake | 1 + .../vcpkg/scripts/test_ports/cmake/vcpkg.json | 3 +- .../test_ports/unit-test-cmake/portfile.cmake | 43 +- .../test-vcpkg_backup_restore_env_vars.cmake | 38 + .../test-vcpkg_host_path_list.cmake | 66 +- .../test-z_vcpkg_setup_pkgconfig_path.cmake | 22 + .../test_ports/unit-test-cmake/vcpkg.json | 16 +- .../test_ports/vcpkg-ci-arrow/portfile.cmake | 10 + .../test_ports/vcpkg-ci-arrow/vcpkg.json | 20 + .../test_ports/vcpkg-ci-llvm/vcpkg.json | 2 + .../test_ports/vcpkg-ci-opencv/vcpkg.json | 6 +- .../vcpkg-ci-openimageio/portfile.cmake | 1 + .../vcpkg-ci-openimageio/vcpkg.json | 22 + .../vcpkg-ci-wxwidgets/portfile.cmake | 34 + .../test_ports/vcpkg-ci-wxwidgets/vcpkg.json | 39 + .../vcpkg/scripts/toolchains/linux.cmake | 12 + .../vcpkg/scripts/toolchains/osx.cmake | 37 +- .../vcpkg/scripts/toolchains/uwp.cmake | 93 + .../vcpkg/scripts/toolchains/windows.cmake | 32 + .../vcpkg/scripts/vcpkgTools.xml | 127 +- .../community/wasm32-emscripten.cmake | 19 +- .../community/x64-linux-dynamic.cmake | 7 + external_imported/vcpkg/versions/7-/7zip.json | 5 + .../vcpkg/versions/a-/ableton.json | 14 + .../vcpkg/versions/a-/abseil.json | 5 + external_imported/vcpkg/versions/a-/ace.json | 5 + .../vcpkg/versions/a-/activemq-cpp.json | 5 + .../vcpkg/versions/a-/air-ctl.json | 34 + .../vcpkg/versions/a-/aixlog.json | 5 + .../vcpkg/versions/a-/akali.json | 10 + .../vcpkg/versions/a-/alpaca.json | 9 + .../vcpkg/versions/a-/alpaka.json | 9 + .../vcpkg/versions/a-/ampl-mp.json | 5 + .../vcpkg/versions/a-/angelscript.json | 5 + .../vcpkg/versions/a-/angle.json | 5 + .../vcpkg/versions/a-/antlr4.json | 10 + .../vcpkg/versions/a-/anyrpc.json | 5 + external_imported/vcpkg/versions/a-/aom.json | 5 + .../vcpkg/versions/a-/apr-util.json | 5 + external_imported/vcpkg/versions/a-/apr.json | 20 + external_imported/vcpkg/versions/a-/apsi.json | 5 + external_imported/vcpkg/versions/a-/argh.json | 5 + .../vcpkg/versions/a-/argon2.json | 9 + .../vcpkg/versions/a-/argparse.json | 5 + .../vcpkg/versions/a-/aricpp.json | 5 + .../vcpkg/versions/a-/armadillo.json | 5 + .../vcpkg/versions/a-/arrayfire.json | 10 + .../vcpkg/versions/a-/arrow.json | 25 + .../vcpkg/versions/a-/ashes.json | 10 + .../vcpkg/versions/a-/asio-grpc.json | 20 + external_imported/vcpkg/versions/a-/asio.json | 10 + .../vcpkg/versions/a-/asiosdk.json | 5 + .../vcpkg/versions/a-/assimp.json | 10 + external_imported/vcpkg/versions/a-/atk.json | 15 + .../vcpkg/versions/a-/atkmm.json | 5 + .../vcpkg/versions/a-/aubio.json | 10 + .../vcpkg/versions/a-/avisynthplus.json | 10 + .../vcpkg/versions/a-/aws-c-common.json | 5 + .../vcpkg/versions/a-/aws-c-io.json | 5 + external_imported/vcpkg/versions/a-/azmq.json | 5 + .../versions/a-/azure-c-shared-utility.json | 5 + .../vcpkg/versions/a-/azure-core-cpp.json | 20 + .../azure-core-tracing-opentelemetry-cpp.json | 19 + .../vcpkg/versions/a-/azure-identity-cpp.json | 5 + .../vcpkg/versions/a-/azure-iot-sdk-c.json | 5 + .../a-/azure-security-attestation-cpp.json | 15 + ...re-security-keyvault-certificates-cpp.json | 5 + .../azure-security-keyvault-secrets-cpp.json | 5 + .../versions/a-/azure-storage-blobs-cpp.json | 15 + .../versions/a-/azure-storage-common-cpp.json | 10 + .../vcpkg/versions/a-/azure-uamqp-c.json | 5 + .../vcpkg/versions/a-/azure-uhttp-c.json | 5 + .../vcpkg/versions/a-/azure-umqtt-c.json | 5 + external_imported/vcpkg/versions/b-/b64.json | 5 + .../vcpkg/versions/b-/basisu.json | 5 + .../vcpkg/versions/b-/bdwgc.json | 10 + .../vcpkg/versions/b-/bento4.json | 10 + .../vcpkg/versions/b-/bext-sml.json | 5 + .../vcpkg/versions/b-/bext-ut.json | 5 + .../vcpkg/versions/b-/bfgroup-lyra.json | 5 + .../vcpkg/versions/b-/bitmagic.json | 5 + .../vcpkg/versions/b-/bitserializer.json | 5 + .../vcpkg/versions/b-/blake3.json | 14 + .../vcpkg/versions/b-/blaze.json | 5 + .../vcpkg/versions/b-/blend2d.json | 5 + .../vcpkg/versions/b-/boinc.json | 15 + .../vcpkg/versions/b-/boost-accumulators.json | 10 + .../vcpkg/versions/b-/boost-algorithm.json | 10 + .../vcpkg/versions/b-/boost-align.json | 10 + .../vcpkg/versions/b-/boost-any.json | 10 + .../vcpkg/versions/b-/boost-array.json | 10 + .../vcpkg/versions/b-/boost-asio.json | 10 + .../vcpkg/versions/b-/boost-assert.json | 10 + .../vcpkg/versions/b-/boost-assign.json | 10 + .../vcpkg/versions/b-/boost-atomic.json | 10 + .../vcpkg/versions/b-/boost-beast.json | 10 + .../vcpkg/versions/b-/boost-bimap.json | 10 + .../vcpkg/versions/b-/boost-bind.json | 10 + .../vcpkg/versions/b-/boost-build.json | 20 + .../versions/b-/boost-callable-traits.json | 10 + .../vcpkg/versions/b-/boost-chrono.json | 10 + .../versions/b-/boost-circular-buffer.json | 10 + .../versions/b-/boost-compatibility.json | 10 + .../vcpkg/versions/b-/boost-compute.json | 10 + .../versions/b-/boost-concept-check.json | 10 + .../vcpkg/versions/b-/boost-config.json | 10 + .../versions/b-/boost-container-hash.json | 10 + .../vcpkg/versions/b-/boost-container.json | 10 + .../vcpkg/versions/b-/boost-context.json | 15 + .../vcpkg/versions/b-/boost-contract.json | 10 + .../vcpkg/versions/b-/boost-conversion.json | 10 + .../vcpkg/versions/b-/boost-convert.json | 10 + .../vcpkg/versions/b-/boost-core.json | 10 + .../vcpkg/versions/b-/boost-coroutine.json | 10 + .../vcpkg/versions/b-/boost-coroutine2.json | 10 + .../vcpkg/versions/b-/boost-crc.json | 10 + .../vcpkg/versions/b-/boost-date-time.json | 10 + .../vcpkg/versions/b-/boost-describe.json | 10 + .../vcpkg/versions/b-/boost-detail.json | 10 + .../vcpkg/versions/b-/boost-dll.json | 10 + .../versions/b-/boost-dynamic-bitset.json | 10 + .../vcpkg/versions/b-/boost-endian.json | 10 + .../vcpkg/versions/b-/boost-exception.json | 10 + .../vcpkg/versions/b-/boost-fiber.json | 10 + .../vcpkg/versions/b-/boost-filesystem.json | 10 + .../vcpkg/versions/b-/boost-flyweight.json | 10 + .../vcpkg/versions/b-/boost-foreach.json | 10 + .../vcpkg/versions/b-/boost-format.json | 10 + .../versions/b-/boost-function-types.json | 10 + .../vcpkg/versions/b-/boost-function.json | 10 + .../vcpkg/versions/b-/boost-functional.json | 10 + .../vcpkg/versions/b-/boost-fusion.json | 10 + .../vcpkg/versions/b-/boost-geometry.json | 10 + .../vcpkg/versions/b-/boost-gil.json | 10 + .../versions/b-/boost-graph-parallel.json | 10 + .../vcpkg/versions/b-/boost-graph.json | 10 + .../vcpkg/versions/b-/boost-hana.json | 10 + .../vcpkg/versions/b-/boost-heap.json | 10 + .../vcpkg/versions/b-/boost-histogram.json | 10 + .../vcpkg/versions/b-/boost-hof.json | 10 + .../vcpkg/versions/b-/boost-icl.json | 10 + .../vcpkg/versions/b-/boost-integer.json | 10 + .../vcpkg/versions/b-/boost-interprocess.json | 10 + .../vcpkg/versions/b-/boost-interval.json | 10 + .../vcpkg/versions/b-/boost-intrusive.json | 10 + .../vcpkg/versions/b-/boost-io.json | 10 + .../vcpkg/versions/b-/boost-iostreams.json | 10 + .../vcpkg/versions/b-/boost-iterator.json | 10 + .../vcpkg/versions/b-/boost-json.json | 10 + .../vcpkg/versions/b-/boost-lambda.json | 10 + .../vcpkg/versions/b-/boost-lambda2.json | 10 + .../vcpkg/versions/b-/boost-leaf.json | 10 + .../vcpkg/versions/b-/boost-lexical-cast.json | 10 + .../versions/b-/boost-local-function.json | 10 + .../vcpkg/versions/b-/boost-locale.json | 10 + .../vcpkg/versions/b-/boost-lockfree.json | 10 + .../vcpkg/versions/b-/boost-log.json | 10 + .../vcpkg/versions/b-/boost-logic.json | 10 + .../vcpkg/versions/b-/boost-math.json | 10 + .../vcpkg/versions/b-/boost-metaparse.json | 10 + .../b-/boost-modular-build-helper.json | 55 + .../vcpkg/versions/b-/boost-move.json | 10 + .../vcpkg/versions/b-/boost-mp11.json | 10 + .../vcpkg/versions/b-/boost-mpi.json | 10 + .../vcpkg/versions/b-/boost-mpl.json | 10 + .../vcpkg/versions/b-/boost-msm.json | 10 + .../vcpkg/versions/b-/boost-multi-array.json | 10 + .../vcpkg/versions/b-/boost-multi-index.json | 10 + .../versions/b-/boost-multiprecision.json | 10 + .../vcpkg/versions/b-/boost-nowide.json | 10 + .../versions/b-/boost-numeric-conversion.json | 10 + .../vcpkg/versions/b-/boost-odeint.json | 10 + .../vcpkg/versions/b-/boost-optional.json | 10 + .../vcpkg/versions/b-/boost-outcome.json | 10 + .../versions/b-/boost-parameter-python.json | 10 + .../vcpkg/versions/b-/boost-parameter.json | 10 + .../vcpkg/versions/b-/boost-pfr.json | 10 + .../vcpkg/versions/b-/boost-phoenix.json | 10 + .../versions/b-/boost-poly-collection.json | 10 + .../vcpkg/versions/b-/boost-polygon.json | 10 + .../vcpkg/versions/b-/boost-pool.json | 10 + .../vcpkg/versions/b-/boost-predef.json | 10 + .../vcpkg/versions/b-/boost-preprocessor.json | 10 + .../vcpkg/versions/b-/boost-process.json | 10 + .../versions/b-/boost-program-options.json | 10 + .../b-/boost-property-map-parallel.json | 10 + .../vcpkg/versions/b-/boost-property-map.json | 10 + .../versions/b-/boost-property-tree.json | 10 + .../vcpkg/versions/b-/boost-proto.json | 10 + .../versions/b-/boost-ptr-container.json | 10 + .../vcpkg/versions/b-/boost-python.json | 10 + .../vcpkg/versions/b-/boost-qvm.json | 10 + .../vcpkg/versions/b-/boost-random.json | 10 + .../vcpkg/versions/b-/boost-range.json | 10 + .../vcpkg/versions/b-/boost-ratio.json | 10 + .../vcpkg/versions/b-/boost-rational.json | 10 + .../vcpkg/versions/b-/boost-regex.json | 15 + .../versions/b-/boost-safe-numerics.json | 10 + .../vcpkg/versions/b-/boost-scope-exit.json | 10 + .../versions/b-/boost-serialization.json | 10 + .../vcpkg/versions/b-/boost-signals2.json | 10 + .../vcpkg/versions/b-/boost-smart-ptr.json | 10 + .../vcpkg/versions/b-/boost-sort.json | 10 + .../vcpkg/versions/b-/boost-spirit.json | 10 + .../vcpkg/versions/b-/boost-stacktrace.json | 10 + .../vcpkg/versions/b-/boost-statechart.json | 10 + .../versions/b-/boost-static-assert.json | 10 + .../versions/b-/boost-static-string.json | 10 + .../versions/b-/boost-stl-interfaces.json | 10 + .../vcpkg/versions/b-/boost-system.json | 10 + .../vcpkg/versions/b-/boost-test.json | 10 + .../vcpkg/versions/b-/boost-thread.json | 10 + .../versions/b-/boost-throw-exception.json | 10 + .../vcpkg/versions/b-/boost-timer.json | 10 + .../vcpkg/versions/b-/boost-tokenizer.json | 10 + .../vcpkg/versions/b-/boost-tti.json | 10 + .../vcpkg/versions/b-/boost-tuple.json | 10 + .../vcpkg/versions/b-/boost-type-erasure.json | 10 + .../vcpkg/versions/b-/boost-type-index.json | 10 + .../vcpkg/versions/b-/boost-type-traits.json | 10 + .../vcpkg/versions/b-/boost-typeof.json | 10 + .../vcpkg/versions/b-/boost-ublas.json | 10 + .../vcpkg/versions/b-/boost-uninstall.json | 10 + .../vcpkg/versions/b-/boost-units.json | 10 + .../vcpkg/versions/b-/boost-unordered.json | 10 + .../vcpkg/versions/b-/boost-utility.json | 10 + .../vcpkg/versions/b-/boost-uuid.json | 10 + .../vcpkg/versions/b-/boost-variant.json | 10 + .../vcpkg/versions/b-/boost-variant2.json | 10 + .../versions/b-/boost-vcpkg-helpers.json | 10 + .../vcpkg/versions/b-/boost-vmd.json | 10 + .../vcpkg/versions/b-/boost-wave.json | 10 + .../vcpkg/versions/b-/boost-winapi.json | 10 + .../vcpkg/versions/b-/boost-xpressive.json | 10 + .../vcpkg/versions/b-/boost-yap.json | 10 + .../vcpkg/versions/b-/boost.json | 10 + .../vcpkg/versions/b-/boringssl.json | 5 + .../vcpkg/versions/b-/botan.json | 10 + .../vcpkg/versions/b-/breakpad.json | 5 + .../vcpkg/versions/b-/brotli.json | 5 + external_imported/vcpkg/versions/b-/brpc.json | 15 + .../vcpkg/versions/b-/brunocodutra-metal.json | 5 + .../vcpkg/versions/b-/brynet.json | 5 + .../versions/b-/bshoshany-thread-pool.json | 20 + .../b-/buck-yeh-bux-mariadb-client.json | 10 + .../versions/b-/buck-yeh-bux-sqlite.json | 9 + .../vcpkg/versions/b-/buck-yeh-bux.json | 20 + .../vcpkg/versions/b-/bullet3.json | 5 + .../vcpkg/versions/b-/bustache.json | 5 + .../vcpkg/versions/baseline.json | 2828 +++++++------ .../vcpkg/versions/c-/c-ares.json | 5 + .../vcpkg/versions/c-/c4core.json | 5 + .../vcpkg/versions/c-/c89stringutils.json | 5 + external_imported/vcpkg/versions/c-/c9y.json | 14 + external_imported/vcpkg/versions/c-/caf.json | 10 + .../vcpkg/versions/c-/caffe2.json | 5 + .../vcpkg/versions/c-/cairo.json | 15 + .../vcpkg/versions/c-/camport3.json | 5 + .../vcpkg/versions/c-/capnproto.json | 5 + .../vcpkg/versions/c-/capstone.json | 5 + .../vcpkg/versions/c-/catch2.json | 30 + external_imported/vcpkg/versions/c-/ccd.json | 5 + .../vcpkg/versions/c-/ccfits.json | 5 + .../vcpkg/versions/c-/cctag.json | 15 + .../vcpkg/versions/c-/celero.json | 5 + .../vcpkg/versions/c-/cereal.json | 10 + .../vcpkg/versions/c-/ceres.json | 15 + external_imported/vcpkg/versions/c-/cgal.json | 30 + .../vcpkg/versions/c-/cgltf.json | 5 + external_imported/vcpkg/versions/c-/cgns.json | 10 + .../vcpkg/versions/c-/chartdir.json | 10 + .../vcpkg/versions/c-/check.json | 10 + .../vcpkg/versions/c-/chromium-base.json | 5 + .../vcpkg/versions/c-/civetweb.json | 5 + .../vcpkg/versions/c-/cjson.json | 5 + .../vcpkg/versions/c-/clfft.json | 5 + external_imported/vcpkg/versions/c-/cli.json | 10 + .../vcpkg/versions/c-/cli11.json | 5 + .../vcpkg/versions/c-/clipboardxx.json | 9 + .../vcpkg/versions/c-/cmakerc.json | 9 + .../vcpkg/versions/c-/cnats.json | 5 + .../vcpkg/versions/c-/cocoyaxi.json | 5 + .../vcpkg/versions/c-/color-console.json | 5 - .../vcpkg/versions/c-/comms-ublox.json | 5 + .../vcpkg/versions/c-/comms.json | 5 + .../vcpkg/versions/c-/commsdsl.json | 5 + .../vcpkg/versions/c-/concurrencpp.json | 5 + .../vcpkg/versions/c-/configcat.json | 9 + .../vcpkg/versions/c-/console-bridge.json | 5 + .../vcpkg/versions/c-/constexpr.json | 5 + .../vcpkg/versions/c-/convectionkernels.json | 9 + .../vcpkg/versions/c-/corrade.json | 5 + .../vcpkg/versions/c-/cpp-httplib.json | 5 + .../vcpkg/versions/c-/cpp-ipc.json | 5 + .../vcpkg/versions/c-/cpp-peglib.json | 5 + .../vcpkg/versions/c-/cppcms.json | 10 + .../vcpkg/versions/c-/cppcodec.json | 5 + .../vcpkg/versions/c-/cppgraphqlgen.json | 20 + .../vcpkg/versions/c-/cpprestsdk.json | 10 + .../vcpkg/versions/c-/cppwinrt.json | 5 + external_imported/vcpkg/versions/c-/cpr.json | 20 + .../vcpkg/versions/c-/cpu-features.json | 5 + .../vcpkg/versions/c-/cpuid.json | 5 + .../vcpkg/versions/c-/cpuinfo.json | 10 + .../vcpkg/versions/c-/crashpad.json | 25 + .../vcpkg/versions/c-/crashrpt.json | 5 + .../vcpkg/versions/c-/crc32c.json | 5 + .../vcpkg/versions/c-/crfsuite.json | 5 + external_imported/vcpkg/versions/c-/crow.json | 5 + .../vcpkg/versions/c-/cryptopp.json | 5 + external_imported/vcpkg/versions/c-/ctp.json | 5 + external_imported/vcpkg/versions/c-/ctre.json | 5 + .../vcpkg/versions/c-/cubeb.json | 9 + external_imported/vcpkg/versions/c-/cuda.json | 10 +- .../vcpkg/versions/c-/cudnn.json | 15 + .../vcpkg/versions/c-/cunit.json | 5 + external_imported/vcpkg/versions/c-/curl.json | 35 + external_imported/vcpkg/versions/c-/czmq.json | 5 + .../vcpkg/versions/d-/darknet.json | 5 + .../vcpkg/versions/d-/dartsim.json | 10 + .../vcpkg/versions/d-/dav1d.json | 10 + .../versions/d-/daw-header-libraries.json | 15 + .../vcpkg/versions/d-/daw-json-link.json | 15 + .../vcpkg/versions/d-/daw-utf-range.json | 5 + .../vcpkg/versions/d-/dbow3.json | 5 + external_imported/vcpkg/versions/d-/dbus.json | 14 + .../vcpkg/versions/d-/dcmtk.json | 15 + .../vcpkg/versions/d-/detours.json | 10 + .../vcpkg/versions/d-/devicenameresolver.json | 5 + .../vcpkg/versions/d-/directx-dxc.json | 14 + .../vcpkg/versions/d-/directx-headers.json | 10 + .../vcpkg/versions/d-/directxmath.json | 5 + .../vcpkg/versions/d-/directxmesh.json | 10 + .../vcpkg/versions/d-/directxsdk.json | 5 - .../vcpkg/versions/d-/directxtex.json | 15 + .../vcpkg/versions/d-/directxtk.json | 15 + .../vcpkg/versions/d-/directxtk12.json | 20 + .../vcpkg/versions/d-/discordcoreapi.json | 35 + .../vcpkg/versions/d-/dlfcn-win32.json | 5 + external_imported/vcpkg/versions/d-/dlib.json | 15 + .../vcpkg/versions/d-/doctest.json | 5 + external_imported/vcpkg/versions/d-/dpdk.json | 30 + external_imported/vcpkg/versions/d-/dpp.json | 29 + .../vcpkg/versions/d-/draco.json | 5 + .../vcpkg/versions/d-/drlibs.json | 5 + .../vcpkg/versions/d-/drogon.json | 5 + .../vcpkg/versions/d-/dstorage.json | 10 + .../vcpkg/versions/d-/duckx.json | 10 + .../vcpkg/versions/d-/dv-processing.json | 29 + .../vcpkg/versions/d-/dxsdk-d3dx.json | 5 + external_imported/vcpkg/versions/d-/dxut.json | 10 + .../vcpkg/versions/e-/eastl.json | 5 + .../vcpkg/versions/e-/edflib.json | 9 + .../vcpkg/versions/e-/effects11.json | 10 + .../versions/e-/effolkronium-random.json | 5 + .../vcpkg/versions/e-/elfutils.json | 10 + external_imported/vcpkg/versions/e-/entt.json | 20 + .../vcpkg/versions/e-/epsilon.json | 5 + .../vcpkg/versions/e-/ereignis.json | 9 + external_imported/vcpkg/versions/e-/eve.json | 10 + external_imported/vcpkg/versions/e-/evpp.json | 10 + .../vcpkg/versions/e-/expected-lite.json | 10 + .../vcpkg/versions/e-/ezfoundation.json | 9 + .../vcpkg/versions/f-/fakeit.json | 10 + external_imported/vcpkg/versions/f-/fann.json | 5 + .../vcpkg/versions/f-/fast-float.json | 5 + .../vcpkg/versions/f-/fastcgi.json | 5 + .../vcpkg/versions/f-/fastrtps.json | 5 + .../vcpkg/versions/f-/fawdlstty-libfv.json | 14 + .../vcpkg/versions/f-/fbthrift.json | 10 + .../vcpkg/versions/f-/ffmpeg.json | 30 + .../vcpkg/versions/f-/fftw3.json | 5 + .../vcpkg/versions/f-/fixed-string.json | 5 + .../vcpkg/versions/f-/flann.json | 5 + .../vcpkg/versions/f-/flashlight-cpu.json | 5 + .../vcpkg/versions/f-/flashlight-cuda.json | 5 + external_imported/vcpkg/versions/f-/flat.json | 14 + .../vcpkg/versions/f-/flatbuffers.json | 5 + .../vcpkg/versions/f-/flecs.json | 9 + external_imported/vcpkg/versions/f-/fltk.json | 5 + .../vcpkg/versions/f-/fluidsynth.json | 15 + external_imported/vcpkg/versions/f-/fmt.json | 10 + .../vcpkg/versions/f-/folly.json | 20 + .../vcpkg/versions/f-/font-util.json | 9 + .../vcpkg/versions/f-/fontconfig.json | 20 + .../vcpkg/versions/f-/fplus.json | 5 + .../vcpkg/versions/f-/freealut.json | 10 + .../vcpkg/versions/f-/freeimage.json | 10 + .../vcpkg/versions/f-/freerdp.json | 5 + .../vcpkg/versions/f-/freetds.json | 10 + .../vcpkg/versions/f-/freetype-gl.json | 10 + .../vcpkg/versions/f-/freetype.json | 15 + .../vcpkg/versions/f-/freexl.json | 5 + .../vcpkg/versions/f-/fribidi.json | 5 + .../vcpkg/versions/f-/frozen.json | 5 + external_imported/vcpkg/versions/f-/ftgl.json | 10 + .../vcpkg/versions/f-/ftxui.json | 5 + .../vcpkg/versions/f-/fuzzylite.json | 5 + .../vcpkg/versions/g-/gainput.json | 5 + .../vcpkg/versions/g-/gamedev-framework.json | 5 + .../versions/g-/gamenetworkingsockets.json | 5 + .../vcpkg/versions/g-/gamma.json | 5 + .../vcpkg/versions/g-/gazebo.json | 20 + external_imported/vcpkg/versions/g-/gcem.json | 5 + external_imported/vcpkg/versions/g-/gdal.json | 60 + external_imported/vcpkg/versions/g-/gdcm.json | 5 + .../vcpkg/versions/g-/gdk-pixbuf.json | 30 + .../vcpkg/versions/g-/geographiclib.json | 15 + external_imported/vcpkg/versions/g-/geos.json | 15 + .../vcpkg/versions/g-/getopt-win32.json | 10 + .../vcpkg/versions/g-/getopt.json | 5 + .../vcpkg/versions/g-/gklib.json | 19 + external_imported/vcpkg/versions/g-/glad.json | 10 +- .../vcpkg/versions/g-/glfw3.json | 5 + external_imported/vcpkg/versions/g-/glib.json | 30 + external_imported/vcpkg/versions/g-/glog.json | 30 + .../vcpkg/versions/g-/glslang.json | 5 + external_imported/vcpkg/versions/g-/gmp.json | 20 + .../versions/g-/gobject-introspection.json | 10 + .../vcpkg/versions/g-/google-cloud-cpp.json | 50 + .../vcpkg/versions/g-/gperf.json | 5 + .../vcpkg/versions/g-/gpgmm.json | 9 + .../vcpkg/versions/g-/gppanel.json | 5 + .../vcpkg/versions/g-/graphene.json | 5 + .../vcpkg/versions/g-/graphviz.json | 5 + external_imported/vcpkg/versions/g-/grpc.json | 35 + .../vcpkg/versions/g-/grppi.json | 5 + external_imported/vcpkg/versions/g-/gsl.json | 5 + .../vcpkg/versions/g-/gstreamer.json | 15 + .../vcpkg/versions/g-/gtest.json | 10 + external_imported/vcpkg/versions/g-/gtk.json | 15 + external_imported/vcpkg/versions/g-/gtl.json | 5 + external_imported/vcpkg/versions/g-/gts.json | 15 + .../vcpkg/versions/g-/guile.json | 9 + .../vcpkg/versions/g-/guilite.json | 5 + .../vcpkg/versions/g-/gul14.json | 9 + .../vcpkg/versions/g-/gumbo.json | 5 + .../vcpkg/versions/h-/halide.json | 5 + .../vcpkg/versions/h-/hareflow.json | 9 + .../vcpkg/versions/h-/harfbuzz.json | 30 + .../vcpkg/versions/h-/hash-library.json | 19 + external_imported/vcpkg/versions/h-/hdf5.json | 15 + external_imported/vcpkg/versions/h-/hexl.json | 5 + .../vcpkg/versions/h-/hidapi.json | 5 + .../vcpkg/versions/h-/highfive.json | 5 + .../vcpkg/versions/h-/hiredis.json | 5 + external_imported/vcpkg/versions/h-/hpx.json | 10 + .../vcpkg/versions/h-/hunspell.json | 5 + .../vcpkg/versions/h-/hwloc.json | 5 + .../vcpkg/versions/h-/hyperscan.json | 5 + external_imported/vcpkg/versions/i-/icu.json | 5 + .../vcpkg/versions/i-/ideviceinstaller.json | 5 + .../vcpkg/versions/i-/ignition-cmake0.json | 5 + .../vcpkg/versions/i-/ignition-cmake2.json | 10 + .../vcpkg/versions/i-/ignition-common1.json | 5 + .../vcpkg/versions/i-/ignition-common3.json | 10 + .../versions/i-/ignition-fuel-tools1.json | 5 + .../versions/i-/ignition-fuel-tools4.json | 5 + .../vcpkg/versions/i-/ignition-math4.json | 5 + .../vcpkg/versions/i-/ignition-math6.json | 5 + .../versions/i-/ignition-modularscripts.json | 10 + .../vcpkg/versions/i-/ignition-msgs1.json | 10 + .../vcpkg/versions/i-/ignition-msgs5.json | 10 + .../vcpkg/versions/i-/ignition-msgs6.json | 10 + .../vcpkg/versions/i-/ignition-plugin1.json | 5 + .../versions/i-/ignition-transport4.json | 5 + .../versions/i-/ignition-transport8.json | 10 + .../versions/i-/ignition-transport9.json | 5 + .../vcpkg/versions/i-/igraph.json | 25 + external_imported/vcpkg/versions/i-/iir1.json | 5 + .../vcpkg/versions/i-/ijg-libjpeg.json | 5 + .../vcpkg/versions/i-/ilmbase.json | 5 + .../vcpkg/versions/i-/imgui-sfml.json | 5 + .../vcpkg/versions/i-/imgui.json | 15 + .../vcpkg/versions/i-/implot.json | 5 + .../vcpkg/versions/i-/influxdb-cxx.json | 5 + external_imported/vcpkg/versions/i-/inih.json | 5 + .../vcpkg/versions/i-/iniparser.json | 5 + .../vcpkg/versions/i-/intelrdfpmathlib.json | 5 + external_imported/vcpkg/versions/i-/isal.json | 15 + .../vcpkg/versions/i-/ixwebsocket.json | 10 + .../vcpkg/versions/j-/jack2.json | 5 + .../vcpkg/versions/j-/jansson.json | 10 + .../vcpkg/versions/j-/jasper.json | 15 + .../vcpkg/versions/j-/jemalloc.json | 10 + .../vcpkg/versions/j-/json-c.json | 15 + .../vcpkg/versions/j-/jsoncons.json | 5 + .../vcpkg/versions/j-/jsonnet.json | 10 + .../vcpkg/versions/j-/jwt-cpp.json | 5 + .../vcpkg/versions/j-/jxrlib.json | 5 + .../vcpkg/versions/k-/kangaru.json | 10 + .../vcpkg/versions/k-/kf5archive.json | 5 + .../vcpkg/versions/k-/kf5attica.json | 5 + .../vcpkg/versions/k-/kf5auth.json | 5 + .../vcpkg/versions/k-/kf5bookmarks.json | 5 + .../vcpkg/versions/k-/kf5codecs.json | 10 + .../vcpkg/versions/k-/kf5completion.json | 5 + .../vcpkg/versions/k-/kf5config.json | 5 + .../vcpkg/versions/k-/kf5configwidgets.json | 5 + .../vcpkg/versions/k-/kf5coreaddons.json | 5 + .../vcpkg/versions/k-/kf5crash.json | 5 + .../vcpkg/versions/k-/kf5dbusaddons.json | 5 + .../vcpkg/versions/k-/kf5declarative.json | 5 + .../vcpkg/versions/k-/kf5diagram.json | 5 + .../vcpkg/versions/k-/kf5globalaccel.json | 15 + .../vcpkg/versions/k-/kf5guiaddons.json | 5 + .../vcpkg/versions/k-/kf5holidays.json | 5 + .../vcpkg/versions/k-/kf5i18n.json | 5 + .../vcpkg/versions/k-/kf5iconthemes.json | 5 + .../vcpkg/versions/k-/kf5itemmodels.json | 5 + .../vcpkg/versions/k-/kf5itemviews.json | 5 + .../vcpkg/versions/k-/kf5jobwidgets.json | 5 + .../vcpkg/versions/k-/kf5kcmutils.json | 5 + .../vcpkg/versions/k-/kf5kio.json | 5 + .../vcpkg/versions/k-/kf5newstuff.json | 5 + .../vcpkg/versions/k-/kf5notifications.json | 5 + .../vcpkg/versions/k-/kf5package.json | 5 + .../vcpkg/versions/k-/kf5plotting.json | 5 + .../vcpkg/versions/k-/kf5service.json | 5 + .../vcpkg/versions/k-/kf5solid.json | 5 + .../vcpkg/versions/k-/kf5sonnet.json | 5 + .../versions/k-/kf5syntaxhighlighting.json | 5 + .../vcpkg/versions/k-/kf5textwidgets.json | 5 + .../vcpkg/versions/k-/kf5wallet.json | 5 + .../vcpkg/versions/k-/kf5widgetsaddons.json | 5 + .../vcpkg/versions/k-/kf5windowsystem.json | 5 + .../vcpkg/versions/k-/kf5xmlgui.json | 5 + external_imported/vcpkg/versions/k-/kfr.json | 5 + .../vcpkg/versions/k-/kinectsdk1.json | 5 + .../vcpkg/versions/k-/kinectsdk2.json | 5 + external_imported/vcpkg/versions/k-/ktx.json | 10 + .../vcpkg/versions/k-/kubazip.json | 5 + .../vcpkg/versions/l-/lapack-reference.json | 5 + external_imported/vcpkg/versions/l-/lcm.json | 10 + external_imported/vcpkg/versions/l-/lcms.json | 5 + external_imported/vcpkg/versions/l-/lerc.json | 10 + .../vcpkg/versions/l-/libao.json | 5 - .../vcpkg/versions/l-/libarchive.json | 12 +- .../vcpkg/versions/l-/libass.json | 5 + .../vcpkg/versions/l-/libatomic-ops.json | 5 + .../vcpkg/versions/l-/libavif.json | 5 + .../vcpkg/versions/l-/libbf.json | 5 + .../vcpkg/versions/l-/libcaer.json | 24 + .../vcpkg/versions/l-/libcbor.json | 5 + .../vcpkg/versions/l-/libcds.json | 5 + .../vcpkg/versions/l-/libcerf.json | 5 + .../vcpkg/versions/l-/libcopp.json | 5 + .../vcpkg/versions/l-/libcuckoo.json | 5 + .../vcpkg/versions/l-/libdatachannel.json | 20 + .../vcpkg/versions/l-/libdc1394.json | 5 + .../vcpkg/versions/l-/libe57.json | 5 + .../vcpkg/versions/l-/libffi.json | 10 + .../vcpkg/versions/l-/libflac.json | 10 + .../vcpkg/versions/l-/libfontenc.json | 9 + .../vcpkg/versions/l-/libfreenect2.json | 10 + .../vcpkg/versions/l-/libfs.json | 9 + .../vcpkg/versions/l-/libgcrypt.json | 5 + .../vcpkg/versions/l-/libgd.json | 5 + .../vcpkg/versions/l-/libgeotiff.json | 5 + .../vcpkg/versions/l-/libgo.json | 5 + .../vcpkg/versions/l-/libgpg-error.json | 5 + .../vcpkg/versions/l-/libgpiod.json | 10 + .../vcpkg/versions/l-/libharu.json | 10 + .../vcpkg/versions/l-/libheif.json | 10 + .../vcpkg/versions/l-/libhsplasma.json | 5 + .../vcpkg/versions/l-/libhv.json | 10 + .../vcpkg/versions/l-/libhydrogen.json | 10 + .../vcpkg/versions/l-/libice.json | 9 + .../vcpkg/versions/l-/libiconv.json | 5 + .../vcpkg/versions/l-/libigl.json | 5 + .../vcpkg/versions/l-/libilbc.json | 5 + .../vcpkg/versions/l-/libirecovery.json | 5 + .../vcpkg/versions/l-/libjpeg-turbo.json | 10 + .../vcpkg/versions/l-/libjuice.json | 20 + .../vcpkg/versions/l-/liblas.json | 5 + .../vcpkg/versions/l-/liblbfgs.json | 5 + .../vcpkg/versions/l-/liblsquic.json | 9 + .../vcpkg/versions/l-/liblzma.json | 5 + .../vcpkg/versions/l-/libmariadb.json | 15 + .../vcpkg/versions/l-/libmicrodns.json | 9 + .../vcpkg/versions/l-/libmodplug.json | 5 + .../vcpkg/versions/l-/libmount.json | 5 + .../vcpkg/versions/l-/libmt32emu.json | 5 + .../vcpkg/versions/l-/libmysql.json | 10 + .../vcpkg/versions/l-/libnice.json | 5 + .../vcpkg/versions/l-/libopensp.json | 7 +- .../vcpkg/versions/l-/libosmium.json | 5 + .../vcpkg/versions/l-/libpff.json | 5 + .../vcpkg/versions/l-/libpng.json | 15 + .../vcpkg/versions/l-/libpq.json | 15 + .../vcpkg/versions/l-/libpqxx.json | 5 + .../vcpkg/versions/l-/libproxy.json | 15 + .../vcpkg/versions/l-/librabbitmq.json | 5 + .../vcpkg/versions/l-/libraw.json | 15 + .../vcpkg/versions/l-/librdkafka.json | 15 + .../vcpkg/versions/l-/librttopo.json | 5 + .../vcpkg/versions/l-/libsigcpp.json | 5 + .../vcpkg/versions/l-/libslirp.json | 5 + .../vcpkg/versions/l-/libsm.json | 9 + .../vcpkg/versions/l-/libsndfile.json | 5 + .../vcpkg/versions/l-/libsodium.json | 10 + .../vcpkg/versions/l-/libspatialindex.json | 5 + .../vcpkg/versions/l-/libspatialite.json | 20 + .../vcpkg/versions/l-/libsquish.json | 10 + .../vcpkg/versions/l-/libsrt.json | 15 + .../vcpkg/versions/l-/libsrtp.json | 5 + .../vcpkg/versions/l-/libtcod.json | 40 +- .../vcpkg/versions/l-/libtheora.json | 5 + .../vcpkg/versions/l-/libtorrent.json | 10 + .../vcpkg/versions/l-/libunibreak.json | 10 + .../vcpkg/versions/l-/libunistring.json | 5 + .../vcpkg/versions/l-/liburing.json | 15 + .../vcpkg/versions/l-/libusb.json | 10 + .../vcpkg/versions/l-/libuv.json | 10 + .../vcpkg/versions/l-/libvpx.json | 15 + .../vcpkg/versions/l-/libwebp.json | 15 + .../vcpkg/versions/l-/libx11.json | 14 + .../vcpkg/versions/l-/libxau.json | 9 + .../vcpkg/versions/l-/libxdamage.json | 9 + .../vcpkg/versions/l-/libxdmcp.json | 9 + .../vcpkg/versions/l-/libxext.json | 9 + .../vcpkg/versions/l-/libxfixes.json | 9 + .../vcpkg/versions/l-/libxi.json | 9 + .../vcpkg/versions/l-/libxkbcommon.json | 9 + .../vcpkg/versions/l-/libxkbfile.json | 9 + .../vcpkg/versions/l-/libxml2.json | 15 + .../vcpkg/versions/l-/libxmlmm.json | 10 + .../vcpkg/versions/l-/libxpm.json | 14 + .../vcpkg/versions/l-/libxrandr.json | 9 + .../vcpkg/versions/l-/libxrender.json | 9 + .../vcpkg/versions/l-/libxres.json | 9 + .../vcpkg/versions/l-/libxslt.json | 25 + .../vcpkg/versions/l-/libzip.json | 10 + .../vcpkg/versions/l-/libzippp.json | 5 + .../vcpkg/versions/l-/linmath.json | 9 + .../vcpkg/versions/l-/live555.json | 10 + .../vcpkg/versions/l-/llfio.json | 25 + external_imported/vcpkg/versions/l-/llvm.json | 20 + external_imported/vcpkg/versions/l-/lmdb.json | 10 + .../vcpkg/versions/l-/lockpp.json | 9 + .../vcpkg/versions/l-/log4cxx.json | 5 + external_imported/vcpkg/versions/l-/lua.json | 5 + .../vcpkg/versions/l-/luajit.json | 25 + .../vcpkg/versions/l-/luasec.json | 5 + .../vcpkg/versions/l-/luasocket.json | 10 + external_imported/vcpkg/versions/l-/lz4.json | 5 + .../vcpkg/versions/m-/magic-enum.json | 10 + .../vcpkg/versions/m-/magnum.json | 10 + .../vcpkg/versions/m-/mailio.json | 2 +- .../vcpkg/versions/m-/mapnik.json | 5 + .../vcpkg/versions/m-/marble.json | 10 + .../vcpkg/versions/m-/matchit.json | 9 + .../vcpkg/versions/m-/materialx.json | 9 + .../vcpkg/versions/m-/mathgl.json | 10 + .../vcpkg/versions/m-/matio.json | 5 + .../vcpkg/versions/m-/matplotplusplus.json | 5 + .../vcpkg/versions/m-/mbedtls.json | 5 + .../vcpkg/versions/m-/mchehab-zbar.json | 9 + external_imported/vcpkg/versions/m-/mdns.json | 5 + .../vcpkg/versions/m-/mdnsresponder.json | 5 + external_imported/vcpkg/versions/m-/mesa.json | 15 + .../vcpkg/versions/m-/meschach.json | 5 + .../vcpkg/versions/m-/metis.json | 5 + .../vcpkg/versions/m-/mgnlibs.json | 5 + .../versions/m-/milerius-sfml-imgui.json | 5 + .../vcpkg/versions/m-/mimalloc.json | 5 + .../vcpkg/versions/m-/minimp3.json | 5 + .../vcpkg/versions/m-/minio-cpp.json | 15 + .../vcpkg/versions/m-/minizip.json | 5 + .../vcpkg/versions/m-/mmloader.json | 5 + external_imported/vcpkg/versions/m-/mnn.json | 5 + .../vcpkg/versions/m-/mongo-cxx-driver.json | 5 + .../vcpkg/versions/m-/mongoose.json | 5 + .../vcpkg/versions/m-/moos-core.json | 5 + .../vcpkg/versions/m-/mosquitto.json | 5 + .../vcpkg/versions/m-/mp-units.json | 5 + .../vcpkg/versions/m-/mp3lame.json | 5 + external_imported/vcpkg/versions/m-/mpfr.json | 10 + .../vcpkg/versions/m-/mpg123.json | 10 + external_imported/vcpkg/versions/m-/mpi.json | 5 + external_imported/vcpkg/versions/m-/mpir.json | 5 + .../vcpkg/versions/m-/mpmcqueue.json | 5 + .../vcpkg/versions/m-/mqtt-cpp.json | 5 + .../vcpkg/versions/m-/ms-gltf.json | 10 + .../vcpkg/versions/m-/msdfgen.json | 5 + external_imported/vcpkg/versions/m-/msix.json | 5 + .../vcpkg/versions/m-/msmpi.json | 5 + .../vcpkg/versions/m-/mygui.json | 5 + .../versions/m-/mysql-connector-cpp.json | 19 + .../vcpkg/versions/n-/nameof.json | 5 + .../vcpkg/versions/n-/nanobench.json | 5 + .../vcpkg/versions/n-/nanoflann.json | 5 + .../vcpkg/versions/n-/nanogui.json | 10 + .../vcpkg/versions/n-/nanosvg.json | 9 + external_imported/vcpkg/versions/n-/ncnn.json | 9 + .../vcpkg/versions/n-/ncurses.json | 5 + .../n-/ned14-internal-quickcpplib.json | 25 + .../vcpkg/versions/n-/nethost.json | 5 + .../vcpkg/versions/n-/nghttp2.json | 5 + .../vcpkg/versions/n-/nghttp3.json | 14 + .../vcpkg/versions/n-/ngspice.json | 5 + .../vcpkg/versions/n-/nifticlib.json | 5 + .../vcpkg/versions/n-/nlohmann-json.json | 10 + .../vcpkg/versions/n-/nlopt.json | 5 + external_imported/vcpkg/versions/n-/nng.json | 5 + .../vcpkg/versions/n-/nowide.json | 5 + .../vcpkg/versions/n-/nrf-ble-driver.json | 5 + external_imported/vcpkg/versions/n-/nspr.json | 10 + external_imported/vcpkg/versions/n-/nss.json | 5 + .../vcpkg/versions/n-/nu-book-zxing-cpp.json | 5 + .../vcpkg/versions/n-/nuklear.json | 5 + .../vcpkg/versions/n-/nuspell.json | 20 + external_imported/vcpkg/versions/n-/nvtt.json | 5 + .../vcpkg/versions/o-/oatpp-consul.json | 5 + .../vcpkg/versions/o-/oatpp-curl.json | 5 + .../vcpkg/versions/o-/oatpp-libressl.json | 5 + .../vcpkg/versions/o-/oatpp-mongo.json | 5 + .../vcpkg/versions/o-/oatpp-postgresql.json | 5 + .../vcpkg/versions/o-/oatpp-sqlite.json | 5 + .../vcpkg/versions/o-/oatpp-ssdp.json | 5 + .../vcpkg/versions/o-/oatpp-swagger.json | 5 + .../vcpkg/versions/o-/oatpp-zlib.json | 5 + .../vcpkg/versions/o-/oatpp.json | 5 + .../vcpkg/versions/o-/octomap.json | 5 + .../vcpkg/versions/o-/ogre-next.json | 5 + external_imported/vcpkg/versions/o-/ogre.json | 15 + .../vcpkg/versions/o-/onednn.json | 5 + .../vcpkg/versions/o-/openal-soft.json | 35 + .../vcpkg/versions/o-/openblas.json | 15 + .../vcpkg/versions/o-/opencascade.json | 15 + .../vcpkg/versions/o-/opencc.json | 20 + .../vcpkg/versions/o-/opencensus-cpp.json | 10 + .../vcpkg/versions/o-/opencolorio.json | 5 + .../vcpkg/versions/o-/openctm.json | 9 + .../vcpkg/versions/o-/opencv.json | 10 + .../vcpkg/versions/o-/opencv2.json | 20 + .../vcpkg/versions/o-/opencv3.json | 37 +- .../vcpkg/versions/o-/opencv4.json | 62 +- .../vcpkg/versions/o-/openexr.json | 20 + .../vcpkg/versions/o-/openfbx.json | 9 + .../vcpkg/versions/o-/opengl.json | 5 + .../vcpkg/versions/o-/openimageio.json | 10 + .../vcpkg/versions/o-/openjpeg.json | 5 + .../vcpkg/versions/o-/openldap.json | 9 + .../vcpkg/versions/o-/openmpi.json | 5 + .../vcpkg/versions/o-/openmvg.json | 5 + .../vcpkg/versions/o-/openmvs.json | 10 + .../vcpkg/versions/o-/openni2.json | 5 + .../vcpkg/versions/o-/openscap.json | 10 + .../vcpkg/versions/o-/openssl.json | 50 + .../vcpkg/versions/o-/opentelemetry-cpp.json | 20 + .../vcpkg/versions/o-/opentracing.json | 5 + .../vcpkg/versions/o-/openvdb.json | 5 + .../vcpkg/versions/o-/openvpn3.json | 10 + external_imported/vcpkg/versions/o-/opus.json | 10 + external_imported/vcpkg/versions/o-/orc.json | 15 + external_imported/vcpkg/versions/o-/osg.json | 30 + .../vcpkg/versions/o-/osgearth.json | 25 + external_imported/vcpkg/versions/o-/otl.json | 5 + .../vcpkg/versions/o-/outcome.json | 15 + .../vcpkg/versions/p-/pagmo2.json | 5 + .../vcpkg/versions/p-/paho-mqtt.json | 5 + .../vcpkg/versions/p-/paho-mqttpp3.json | 5 + .../vcpkg/versions/p-/pango.json | 10 + .../vcpkg/versions/p-/pangolin.json | 5 + .../vcpkg/versions/p-/pangomm.json | 5 + .../vcpkg/versions/p-/paraview.json | 5 + .../vcpkg/versions/p-/parmetis.json | 5 + .../vcpkg/versions/p-/pcapplusplus.json | 5 + external_imported/vcpkg/versions/p-/pcre.json | 15 + .../vcpkg/versions/p-/pcre2.json | 5 + external_imported/vcpkg/versions/p-/pdal.json | 15 + .../vcpkg/versions/p-/pegtl.json | 5 + .../vcpkg/versions/p-/pffft.json | 5 + .../vcpkg/versions/p-/physfs.json | 5 + .../vcpkg/versions/p-/physx.json | 15 + .../vcpkg/versions/p-/pipewire.json | 14 + .../vcpkg/versions/p-/pixel.json | 5 + .../vcpkg/versions/p-/pixman.json | 10 + .../vcpkg/versions/p-/pkgconf.json | 5 + external_imported/vcpkg/versions/p-/plog.json | 10 + external_imported/vcpkg/versions/p-/pmdk.json | 5 + external_imported/vcpkg/versions/p-/poco.json | 5 + .../vcpkg/versions/p-/podofo.json | 15 + .../vcpkg/versions/p-/polymorphic-value.json | 5 + .../vcpkg/versions/p-/poppler.json | 5 + .../vcpkg/versions/p-/portable-snippets.json | 5 + external_imported/vcpkg/versions/p-/proj.json | 15 + .../vcpkg/versions/p-/prometheus-cpp.json | 5 + .../vcpkg/versions/p-/protobuf.json | 25 + .../vcpkg/versions/p-/protopuf.json | 5 + .../vcpkg/versions/p-/protozero.json | 5 + .../vcpkg/versions/p-/proxy.json | 9 + .../vcpkg/versions/p-/proxygen.json | 10 + .../vcpkg/versions/p-/pthread-stubs.json | 9 + .../vcpkg/versions/p-/pthreadpool.json | 5 + .../vcpkg/versions/p-/pthreads.json | 5 + .../vcpkg/versions/p-/pugixml.json | 10 + .../vcpkg/versions/p-/pybind11.json | 10 + .../vcpkg/versions/p-/pystring.json | 5 + .../vcpkg/versions/p-/python2.json | 5 + .../vcpkg/versions/p-/python3.json | 20 + external_imported/vcpkg/versions/q-/qca.json | 5 + .../vcpkg/versions/q-/qnnpack.json | 5 + .../vcpkg/versions/q-/qpid-proton.json | 25 + .../q-/qt-advanced-docking-system.json | 5 + external_imported/vcpkg/versions/q-/qt.json | 15 + .../vcpkg/versions/q-/qt5-3d.json | 20 + .../vcpkg/versions/q-/qt5-activeqt.json | 15 + .../vcpkg/versions/q-/qt5-androidextras.json | 15 + .../vcpkg/versions/q-/qt5-base.json | 30 + .../vcpkg/versions/q-/qt5-charts.json | 15 + .../vcpkg/versions/q-/qt5-connectivity.json | 15 + .../vcpkg/versions/q-/qt5-datavis3d.json | 15 + .../vcpkg/versions/q-/qt5-declarative.json | 15 + .../vcpkg/versions/q-/qt5-doc.json | 15 + .../vcpkg/versions/q-/qt5-gamepad.json | 15 + .../versions/q-/qt5-graphicaleffects.json | 15 + .../vcpkg/versions/q-/qt5-imageformats.json | 25 + .../vcpkg/versions/q-/qt5-location.json | 15 + .../vcpkg/versions/q-/qt5-macextras.json | 15 + .../vcpkg/versions/q-/qt5-mqtt.json | 15 + .../vcpkg/versions/q-/qt5-multimedia.json | 15 + .../vcpkg/versions/q-/qt5-networkauth.json | 15 + .../vcpkg/versions/q-/qt5-purchasing.json | 15 + .../vcpkg/versions/q-/qt5-quickcontrols.json | 15 + .../vcpkg/versions/q-/qt5-quickcontrols2.json | 15 + .../vcpkg/versions/q-/qt5-remoteobjects.json | 15 + .../vcpkg/versions/q-/qt5-script.json | 15 + .../vcpkg/versions/q-/qt5-scxml.json | 15 + .../vcpkg/versions/q-/qt5-sensors.json | 15 + .../vcpkg/versions/q-/qt5-serialbus.json | 15 + .../vcpkg/versions/q-/qt5-serialport.json | 15 + .../vcpkg/versions/q-/qt5-speech.json | 15 + .../vcpkg/versions/q-/qt5-svg.json | 15 + .../vcpkg/versions/q-/qt5-tools.json | 20 + .../vcpkg/versions/q-/qt5-translations.json | 15 + .../versions/q-/qt5-virtualkeyboard.json | 15 + .../vcpkg/versions/q-/qt5-wayland.json | 15 + .../vcpkg/versions/q-/qt5-webchannel.json | 15 + .../vcpkg/versions/q-/qt5-webengine.json | 30 + .../vcpkg/versions/q-/qt5-webglplugin.json | 15 + .../vcpkg/versions/q-/qt5-websockets.json | 15 + .../vcpkg/versions/q-/qt5-webview.json | 15 + .../vcpkg/versions/q-/qt5-winextras.json | 15 + .../vcpkg/versions/q-/qt5-x11extras.json | 15 + .../vcpkg/versions/q-/qt5-xmlpatterns.json | 15 + external_imported/vcpkg/versions/q-/qt5.json | 15 + .../vcpkg/versions/q-/qt5compat.json | 15 + .../vcpkg/versions/q-/qtactiveqt.json | 15 + .../versions/q-/qtapplicationmanager.json | 20 + .../vcpkg/versions/q-/qtbase.json | 35 + .../vcpkg/versions/q-/qtcharts.json | 15 + .../vcpkg/versions/q-/qtcoap.json | 15 + .../vcpkg/versions/q-/qtconnectivity.json | 15 + .../vcpkg/versions/q-/qtdatavis3d.json | 15 + .../vcpkg/versions/q-/qtdeclarative.json | 15 + .../vcpkg/versions/q-/qtdeviceutilities.json | 15 + .../vcpkg/versions/q-/qtdoc.json | 15 + .../vcpkg/versions/q-/qtimageformats.json | 15 + .../versions/q-/qtinterfaceframework.json | 25 + .../vcpkg/versions/q-/qtkeychain-qt6.json | 5 + .../vcpkg/versions/q-/qtkeychain.json | 10 + .../vcpkg/versions/q-/qtlocation.json | 10 + .../vcpkg/versions/q-/qtlottie.json | 15 + .../vcpkg/versions/q-/qtmqtt.json | 15 + .../vcpkg/versions/q-/qtmultimedia.json | 20 + .../vcpkg/versions/q-/qtnetworkauth.json | 15 + .../vcpkg/versions/q-/qtopcua.json | 15 + .../vcpkg/versions/q-/qtpositioning.json | 15 + .../vcpkg/versions/q-/qtquick3d.json | 20 + .../vcpkg/versions/q-/qtquickcontrols2.json | 5 + .../vcpkg/versions/q-/qtquicktimeline.json | 15 + .../vcpkg/versions/q-/qtremoteobjects.json | 15 + .../vcpkg/versions/q-/qtscxml.json | 15 + .../vcpkg/versions/q-/qtsensors.json | 15 + .../vcpkg/versions/q-/qtserialbus.json | 15 + .../vcpkg/versions/q-/qtserialport.json | 15 + .../vcpkg/versions/q-/qtshadertools.json | 15 + .../vcpkg/versions/q-/qtsvg.json | 15 + .../vcpkg/versions/q-/qttools.json | 20 + .../vcpkg/versions/q-/qttranslations.json | 15 + .../vcpkg/versions/q-/qtvirtualkeyboard.json | 15 + .../vcpkg/versions/q-/qtwayland.json | 15 + .../vcpkg/versions/q-/qtwebchannel.json | 15 + .../vcpkg/versions/q-/qtwebengine.json | 30 + .../vcpkg/versions/q-/qtwebsockets.json | 15 + .../vcpkg/versions/q-/qtwebview.json | 15 + .../vcpkg/versions/q-/quantlib.json | 15 + .../vcpkg/versions/q-/quazip.json | 10 + .../vcpkg/versions/q-/quill.json | 25 + .../vcpkg/versions/q-/quirc.json | 5 + .../vcpkg/versions/r-/random123.json | 9 + .../vcpkg/versions/r-/range-v3.json | 5 + .../vcpkg/versions/r-/rapidcsv.json | 5 + .../vcpkg/versions/r-/rapidjson.json | 20 + .../vcpkg/versions/r-/raylib.json | 5 + .../vcpkg/versions/r-/rbdl-orb.json | 5 + external_imported/vcpkg/versions/r-/rbdl.json | 10 + .../vcpkg/versions/r-/readline-unix.json | 5 + .../vcpkg/versions/r-/readline-win32.json | 5 + .../vcpkg/versions/r-/readosm.json | 5 + .../vcpkg/versions/r-/realsense2.json | 5 + .../vcpkg/versions/r-/recast.json | 5 + .../vcpkg/versions/r-/redis-plus-plus.json | 5 + .../vcpkg/versions/r-/refl-cpp.json | 10 + .../vcpkg/versions/r-/rendergraph.json | 5 + .../vcpkg/versions/r-/restinio.json | 20 + .../vcpkg/versions/r-/rhash.json | 10 + .../vcpkg/versions/r-/rioki-glow.json | 9 + .../vcpkg/versions/r-/rmlui.json | 5 + .../vcpkg/versions/r-/roaring.json | 5 + .../vcpkg/versions/r-/robin-map.json | 12 +- external_imported/vcpkg/versions/r-/rsig.json | 14 + .../vcpkg/versions/r-/rsm-binary-io.json | 5 + .../vcpkg/versions/r-/rtabmap.json | 5 + .../vcpkg/versions/r-/rtmidi.json | 20 + external_imported/vcpkg/versions/r-/rttr.json | 5 + .../vcpkg/versions/r-/rubberband.json | 9 + .../vcpkg/versions/r-/rxcpp.json | 5 + .../vcpkg/versions/r-/rxspencer.json | 5 + external_imported/vcpkg/versions/r-/ryml.json | 5 + external_imported/vcpkg/versions/s-/sail.json | 5 + .../vcpkg/versions/s-/saucer.json | 24 + .../vcpkg/versions/s-/sciplot.json | 15 + .../vcpkg/versions/s-/sdformat9.json | 10 + external_imported/vcpkg/versions/s-/sdl1.json | 10 + .../vcpkg/versions/s-/sdl2-image.json | 15 + .../vcpkg/versions/s-/sdl2-mixer.json | 10 + .../vcpkg/versions/s-/sdl2-ttf.json | 5 + external_imported/vcpkg/versions/s-/sdl2.json | 35 + .../vcpkg/versions/s-/sdl2pp.json | 15 + external_imported/vcpkg/versions/s-/seal.json | 5 + .../vcpkg/versions/s-/secp256k1.json | 10 + .../vcpkg/versions/s-/sentry-native.json | 15 + .../vcpkg/versions/s-/septag-dmon.json | 9 + .../vcpkg/versions/s-/sfgui.json | 5 + external_imported/vcpkg/versions/s-/sfml.json | 10 + .../vcpkg/versions/s-/shaderc.json | 5 + .../vcpkg/versions/s-/shaderwriter.json | 10 + .../versions/s-/shiftmedia-libgcrypt.json | 9 + .../versions/s-/shiftmedia-libgnutls.json | 9 + .../vcpkg/versions/s-/simage.json | 10 + .../vcpkg/versions/s-/simbody.json | 5 + .../vcpkg/versions/s-/simdjson.json | 15 + external_imported/vcpkg/versions/s-/skia.json | 20 + .../vcpkg/versions/s-/sleepy-discord.json | 5 - .../vcpkg/versions/s-/snappy.json | 10 + .../vcpkg/versions/s-/so5extra.json | 10 + .../vcpkg/versions/s-/sobjectizer.json | 10 + .../vcpkg/versions/s-/socket-io-client.json | 10 + .../vcpkg/versions/s-/sockpp.json | 5 + .../vcpkg/versions/s-/soil2.json | 5 + external_imported/vcpkg/versions/s-/sol2.json | 5 + .../vcpkg/versions/s-/solid3.json | 5 + external_imported/vcpkg/versions/s-/soxr.json | 5 + .../vcpkg/versions/s-/spdk-isal.json | 5 + .../vcpkg/versions/s-/spdlog.json | 5 + .../vcpkg/versions/s-/spectra.json | 5 + .../vcpkg/versions/s-/speex.json | 10 + .../vcpkg/versions/s-/speexdsp.json | 10 + .../vcpkg/versions/s-/spirv-headers.json | 5 + .../vcpkg/versions/s-/spirv-tools.json | 5 + external_imported/vcpkg/versions/s-/spix.json | 5 + .../vcpkg/versions/s-/sqlcipher.json | 5 + .../vcpkg/versions/s-/sqlite3.json | 15 + .../vcpkg/versions/s-/sqlitecpp.json | 5 + .../versions/s-/sqlpp11-connector-mysql.json | 5 + .../s-/sqlpp11-connector-sqlite3.json | 5 + .../vcpkg/versions/s-/sqlpp11.json | 10 + .../vcpkg/versions/s-/srell.json | 5 + .../vcpkg/versions/s-/status-code.json | 10 + external_imported/vcpkg/versions/s-/stb.json | 15 + .../vcpkg/versions/s-/stduuid.json | 9 + .../vcpkg/versions/s-/stftpitchshift.json | 14 + .../vcpkg/versions/s-/string-theory.json | 5 + .../vcpkg/versions/s-/stronk.json | 9 + .../vcpkg/versions/s-/stxxl.json | 5 + .../vcpkg/versions/s-/sundials.json | 5 + .../vcpkg/versions/s-/superlu.json | 5 + .../vcpkg/versions/s-/symengine.json | 5 + external_imported/vcpkg/versions/s-/szip.json | 10 + .../vcpkg/versions/t-/taglib.json | 5 + .../vcpkg/versions/t-/taskflow.json | 5 + external_imported/vcpkg/versions/t-/tbb.json | 5 + .../vcpkg/versions/t-/tclap.json | 5 + .../vcpkg/versions/t-/teemo.json | 5 + .../vcpkg/versions/t-/tensorpipe.json | 10 + .../vcpkg/versions/t-/termcolor.json | 5 + .../vcpkg/versions/t-/tesseract.json | 20 + external_imported/vcpkg/versions/t-/tgui.json | 5 + .../vcpkg/versions/t-/theia.json | 5 + external_imported/vcpkg/versions/t-/thor.json | 10 + .../vcpkg/versions/t-/thrift.json | 5 + .../vcpkg/versions/t-/tidy-html5.json | 10 + external_imported/vcpkg/versions/t-/tiff.json | 20 + .../vcpkg/versions/t-/tinydir.json | 5 + .../vcpkg/versions/t-/tinyobjloader.json | 5 + .../vcpkg/versions/t-/tinyspline.json | 5 + .../vcpkg/versions/t-/tinyutf8.json | 5 + .../vcpkg/versions/t-/tinyxml2.json | 5 + external_imported/vcpkg/versions/t-/tmx.json | 5 + .../vcpkg/versions/t-/tmxlite.json | 5 + .../vcpkg/versions/t-/toml11.json | 5 + .../vcpkg/versions/t-/tomlplusplus.json | 5 + .../vcpkg/versions/t-/tracy.json | 15 + .../vcpkg/versions/t-/trantor.json | 5 + external_imported/vcpkg/versions/t-/tre.json | 5 + .../vcpkg/versions/t-/tree-sitter.json | 9 + .../vcpkg/versions/t-/triton.json | 10 + .../vcpkg/versions/t-/turbobase64.json | 5 + .../vcpkg/versions/u-/unixodbc.json | 10 + .../vcpkg/versions/u-/unrar.json | 5 + external_imported/vcpkg/versions/u-/upb.json | 10 + .../vcpkg/versions/u-/urdfdom-headers.json | 5 + .../vcpkg/versions/u-/urdfdom.json | 5 + external_imported/vcpkg/versions/u-/usd.json | 5 + .../vcpkg/versions/u-/usockets.json | 10 + .../vcpkg/versions/u-/utf8proc.json | 10 + .../vcpkg/versions/u-/utfcpp.json | 5 + .../vcpkg/versions/u-/uvatlas.json | 15 + external_imported/vcpkg/versions/u-/uvw.json | 15 + .../vcpkg/versions/u-/uwebsockets.json | 5 + external_imported/vcpkg/versions/v-/v8.json | 5 + .../vcpkg/versions/v-/vamp-sdk.json | 10 + external_imported/vcpkg/versions/v-/vc.json | 10 + .../vcpkg/versions/v-/vcglib.json | 5 + .../vcpkg/versions/v-/vcpkg-cmake-config.json | 5 + .../versions/v-/vcpkg-cmake-get-vars.json | 14 + .../vcpkg/versions/v-/vcpkg-cmake.json | 50 + .../v-/vcpkg-get-python-packages.json | 15 + .../vcpkg/versions/v-/vcpkg-gn.json | 5 + .../v-/vcpkg-pkgconfig-get-modules.json | 5 + .../vcpkg/versions/v-/vcpkg-qmake.json | 10 + .../vcpkg/versions/v-/vcpkg-tool-gn.json | 9 + .../vcpkg/versions/v-/vcpkg-tool-meson.json | 10 + .../vcpkg/versions/v-/vcpkg-tool-ninja.json | 14 + .../vcpkg/versions/v-/vectorclass.json | 5 + .../vcpkg/versions/v-/vkfft.json | 9 + external_imported/vcpkg/versions/v-/vlpp.json | 5 + external_imported/vcpkg/versions/v-/volk.json | 5 + .../vcpkg/versions/v-/vtk-m.json | 5 + external_imported/vcpkg/versions/v-/vtk.json | 5 + .../vcpkg/versions/v-/vulkan-headers.json | 5 + .../vcpkg/versions/w-/wavpack.json | 10 + .../vcpkg/versions/w-/wayland-protocols.json | 9 + .../vcpkg/versions/w-/wayland.json | 9 + .../vcpkg/versions/w-/webview2.json | 9 + .../vcpkg/versions/w-/winreg.json | 15 + .../vcpkg/versions/w-/winsock2.json | 5 + .../vcpkg/versions/w-/wolfmqtt.json | 19 + .../vcpkg/versions/w-/wolfssl.json | 19 + .../vcpkg/versions/w-/wolftpm.json | 19 + .../vcpkg/versions/w-/workflow.json | 5 + .../vcpkg/versions/w-/wpilib.json | 5 + external_imported/vcpkg/versions/w-/wren.json | 5 + external_imported/vcpkg/versions/w-/wt.json | 5 + external_imported/vcpkg/versions/w-/wtl.json | 10 + .../vcpkg/versions/w-/wxchartdir.json | 5 + .../vcpkg/versions/w-/wxcharts.json | 19 + .../vcpkg/versions/w-/wxwidgets.json | 55 + external_imported/vcpkg/versions/x-/x264.json | 15 + external_imported/vcpkg/versions/x-/x265.json | 10 + .../vcpkg/versions/x-/xaudio2redist.json | 10 + .../vcpkg/versions/x-/xbyak.json | 5 + .../vcpkg/versions/x-/xcb-proto.json | 9 + .../vcpkg/versions/x-/xcb-render-util.json | 9 + .../vcpkg/versions/x-/xcb-util-m4.json | 9 + external_imported/vcpkg/versions/x-/xcb.json | 9 + external_imported/vcpkg/versions/x-/xlnt.json | 5 + .../vcpkg/versions/x-/xlsxio.json | 5 + .../vcpkg/versions/x-/xmlsec.json | 5 + .../vcpkg/versions/x-/xorg-macros.json | 9 + .../vcpkg/versions/x-/xproto.json | 9 + .../vcpkg/versions/x-/xsimd.json | 5 + .../vcpkg/versions/x-/xtensor-blas.json | 5 + .../vcpkg/versions/x-/xtrans.json | 9 + external_imported/vcpkg/versions/y-/yara.json | 5 + external_imported/vcpkg/versions/y-/yasm.json | 10 + external_imported/vcpkg/versions/y-/yoga.json | 5 + .../vcpkg/versions/y-/yyjson.json | 15 + external_imported/vcpkg/versions/z-/z3.json | 25 + .../vcpkg/versions/z-/z4kn4fein-semver.json | 9 + .../vcpkg/versions/z-/zeroc-ice.json | 19 + .../vcpkg/versions/z-/zeromq.json | 5 + .../vcpkg/versions/z-/zlib-ng.json | 10 + external_imported/vcpkg/versions/z-/zlib.json | 10 + .../vcpkg/versions/z-/zookeeper.json | 5 + .../vcpkg/versions/z-/zopfli.json | 5 + .../vcpkg/versions/z-/zpp-bits.json | 5 + .../vcpkg/versions/z-/zserge-webview.json | 5 + external_imported/vcpkg/versions/z-/zug.json | 5 + .../vcpkg/versions/z-/zziplib.json | 5 + 4234 files changed, 59137 insertions(+), 32667 deletions(-) mode change 100644 => 100755 external_imported/sentry-native/external/crashpad/infra/config/main.star mode change 100644 => 100755 external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py create mode 100644 external_imported/vcpkg/.github/workflows/validateDocs.yml create mode 100644 external_imported/vcpkg/SECURITY.md create mode 100644 external_imported/vcpkg/docs/commands/common-options.md create mode 100644 external_imported/vcpkg/docs/commands/install.md create mode 100644 external_imported/vcpkg/docs/commands/integrate.md create mode 100644 external_imported/vcpkg/docs/commands/remove.md create mode 100644 external_imported/vcpkg/docs/commands/search.md create mode 100644 external_imported/vcpkg/docs/commands/update-baseline.md create mode 100644 external_imported/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md create mode 100644 external_imported/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md create mode 100644 external_imported/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md rename external_imported/vcpkg/docs/maintainers/ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/vcpkg_cmake_get_vars.md (84%) delete mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md delete mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md delete mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md rename external_imported/vcpkg/{ports/vcpkg-get-python-packages/README.md => docs/maintainers/ports/vcpkg-get-python-packages.md} (100%) create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn.md create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md rename external_imported/vcpkg/{ports/vcpkg-qmake/README.md => docs/maintainers/ports/vcpkg-qmake.md} (100%) create mode 100644 external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md create mode 100644 external_imported/vcpkg/docs/maintainers/vcpkg_cmake_build.md create mode 100644 external_imported/vcpkg/docs/maintainers/vcpkg_cmake_configure.md create mode 100644 external_imported/vcpkg/docs/maintainers/vcpkg_cmake_install.md create mode 100644 external_imported/vcpkg/docs/maintainers/vcpkg_install_copyright.md delete mode 100755 external_imported/vcpkg/docs/regenerate.ps1 create mode 100644 external_imported/vcpkg/docs/users/buildsystems/cmake-integration.md create mode 100644 external_imported/vcpkg/docs/users/buildsystems/export-command.md create mode 100644 external_imported/vcpkg/docs/users/buildsystems/integration.md create mode 100644 external_imported/vcpkg/docs/users/buildsystems/manual-integration.md create mode 100644 external_imported/vcpkg/docs/users/buildsystems/msbuild-integration.md delete mode 100644 external_imported/vcpkg/docs/users/integration.md create mode 100644 external_imported/vcpkg/ports/ableton/correct_cmake_include_directory.patch create mode 100644 external_imported/vcpkg/ports/ableton/portfile.cmake create mode 100644 external_imported/vcpkg/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch create mode 100644 external_imported/vcpkg/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch create mode 100644 external_imported/vcpkg/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch create mode 100644 external_imported/vcpkg/ports/ableton/vcpkg.json create mode 100644 external_imported/vcpkg/ports/air-ctl/portfile.cmake create mode 100644 external_imported/vcpkg/ports/air-ctl/vcpkg.json create mode 100644 external_imported/vcpkg/ports/alpaca/portfile.cmake create mode 100644 external_imported/vcpkg/ports/alpaca/vcpkg.json create mode 100644 external_imported/vcpkg/ports/alpaka/portfile.cmake create mode 100644 external_imported/vcpkg/ports/alpaka/usage create mode 100644 external_imported/vcpkg/ports/alpaka/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/angelscript/LICENSE create mode 100644 external_imported/vcpkg/ports/antlr4/fix_LNK2001.patch delete mode 100644 external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch create mode 100644 external_imported/vcpkg/ports/anyrpc/mingw.patch create mode 100644 external_imported/vcpkg/ports/apr-util/unglue.patch create mode 100644 external_imported/vcpkg/ports/apr/fix-configcmake.patch create mode 100644 external_imported/vcpkg/ports/apr/unglue.patch delete mode 100644 external_imported/vcpkg/ports/argh/remove_unnamespaced_license_file.patch create mode 100644 external_imported/vcpkg/ports/argon2/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/argon2/portfile.cmake create mode 100644 external_imported/vcpkg/ports/argon2/thread-header.patch create mode 100644 external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake create mode 100644 external_imported/vcpkg/ports/argon2/vcpkg.json create mode 100644 external_imported/vcpkg/ports/argon2/visibility.patch create mode 100644 external_imported/vcpkg/ports/arrayfire/fix-dependency-clfft.patch create mode 100644 external_imported/vcpkg/ports/arrow/cuda-ptr.patch create mode 100644 external_imported/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch delete mode 100644 external_imported/vcpkg/ports/arrow/fix-dependencies.patch rename external_imported/vcpkg/ports/arrow/{all.patch => msvc-static-name.patch} (100%) create mode 100644 external_imported/vcpkg/ports/arrow/static-link-libs.patch create mode 100644 external_imported/vcpkg/ports/arrow/usage-parquet delete mode 100644 external_imported/vcpkg/ports/assimp/irrlicht.patch delete mode 100644 external_imported/vcpkg/ports/atkmm/COPYING create mode 100644 external_imported/vcpkg/ports/avisynthplus/clang-cl.patch delete mode 100644 external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch create mode 100644 external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/bento4/LICENSE delete mode 100644 external_imported/vcpkg/ports/bento4/fix-install-and-c4996-error.patch create mode 100644 external_imported/vcpkg/ports/bento4/fix-install.patch create mode 100644 external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch create mode 100644 external_imported/vcpkg/ports/blake3/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/blake3/portfile.cmake create mode 100644 external_imported/vcpkg/ports/blake3/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/blaze/fix-vm-build.patch delete mode 100644 external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch delete mode 100644 external_imported/vcpkg/ports/boost-atomic/0001-fix-compilation-for-uwp.patch delete mode 100644 external_imported/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch delete mode 100644 external_imported/vcpkg/ports/boost-fiber/fix-build-numa.patch delete mode 100644 external_imported/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch rename external_imported/vcpkg/ports/boost-locale/{0001-Fix-boost-ICU-support.patch => fix-dependencies.patch} (52%) delete mode 100644 external_imported/vcpkg/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch delete mode 100644 external_imported/vcpkg/ports/boost-process/fix_include.patch delete mode 100644 external_imported/vcpkg/ports/boringssl/0002-disable-waring-4065.patch create mode 100644 external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch create mode 100644 external_imported/vcpkg/ports/botan/arm64-windows.patch delete mode 100644 external_imported/vcpkg/ports/breakpad/fix-unordered_map.patch create mode 100644 external_imported/vcpkg/ports/brpc/brpc-1783.diff rename external_imported/vcpkg/ports/brpc/{fix_boost_ptr.patch => fix-boost-ptr.patch} (92%) create mode 100644 external_imported/vcpkg/ports/brpc/fix-build.patch delete mode 100644 external_imported/vcpkg/ports/brpc/fix_thrift.patch create mode 100644 external_imported/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake create mode 100644 external_imported/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json create mode 100644 external_imported/vcpkg/ports/buck-yeh-bux/fix-clang-cl.patch delete mode 100644 external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch delete mode 100644 external_imported/vcpkg/ports/bustache/LICENSE create mode 100644 external_imported/vcpkg/ports/c-ares/guard-imported-lib.patch create mode 100644 external_imported/vcpkg/ports/c-ares/usage create mode 100644 external_imported/vcpkg/ports/c89stringutils/no_flags.patch create mode 100644 external_imported/vcpkg/ports/c9y/portfile.cmake create mode 100644 external_imported/vcpkg/ports/c9y/vcpkg.json create mode 100644 external_imported/vcpkg/ports/caf/fix_cxx17.patch create mode 100644 external_imported/vcpkg/ports/caffe2/fix-isgloginitialized.patch create mode 100644 external_imported/vcpkg/ports/cairo/fix_clang-cl_build.patch create mode 100644 external_imported/vcpkg/ports/cairo/mingw-dllexport.patch create mode 100644 external_imported/vcpkg/ports/catch2/fix-uwp-build.patch create mode 100644 external_imported/vcpkg/ports/cctag/0001-fix-osx.patch create mode 100644 external_imported/vcpkg/ports/cctag/0002-find-tbb.patch create mode 100644 external_imported/vcpkg/ports/celero/fix-bin-install-path.patch delete mode 100644 external_imported/vcpkg/ports/ceres/0004_fix_lib_path_linux.patch create mode 100644 external_imported/vcpkg/ports/civetweb/disable_warnings.patch create mode 100644 external_imported/vcpkg/ports/clipboardxx/portfile.cmake create mode 100644 external_imported/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in create mode 100644 external_imported/vcpkg/ports/clipboardxx/vcpkg.json create mode 100644 external_imported/vcpkg/ports/cmakerc/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cmakerc/vcpkg.json create mode 100644 external_imported/vcpkg/ports/comms-ublox/copyright delete mode 100644 external_imported/vcpkg/ports/comms-ublox/fix-comms.patch create mode 100644 external_imported/vcpkg/ports/configcat/portfile.cmake create mode 100644 external_imported/vcpkg/ports/configcat/vcpkg.json create mode 100644 external_imported/vcpkg/ports/convectionkernels/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/convectionkernels/portfile.cmake create mode 100644 external_imported/vcpkg/ports/convectionkernels/vcpkg.json create mode 100644 external_imported/vcpkg/ports/corrade/build-corrade-rc-always.patch create mode 100644 external_imported/vcpkg/ports/cppcms/fix_narrowing_error.patch create mode 100644 external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch create mode 100644 external_imported/vcpkg/ports/cppcodec/0001-Fix-62.patch create mode 100644 external_imported/vcpkg/ports/cpprestsdk/fix_narrowing.patch create mode 100644 external_imported/vcpkg/ports/cppwinrt/cppwinrt-config.cmake create mode 100644 external_imported/vcpkg/ports/cppwinrt/usage create mode 100644 external_imported/vcpkg/ports/cpr/disable_werror.patch create mode 100644 external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch create mode 100644 external_imported/vcpkg/ports/cpuid/fix-build.patch create mode 100644 external_imported/vcpkg/ports/crashrpt/002-fix-wtl-includepath.patch create mode 100644 external_imported/vcpkg/ports/crashrpt/003-add-definition-UNICODE.patch create mode 100644 external_imported/vcpkg/ports/crc32c/fix_clang-cl.patch create mode 100644 external_imported/vcpkg/ports/cubeb/portfile.cmake create mode 100644 external_imported/vcpkg/ports/cubeb/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/dav1d/patch_underscore_prefix.patch create mode 100644 external_imported/vcpkg/ports/dbus/cmake.dep.patch create mode 100644 external_imported/vcpkg/ports/dbus/getpeereid.patch create mode 100644 external_imported/vcpkg/ports/dbus/pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/dbus/portfile.cmake create mode 100644 external_imported/vcpkg/ports/dbus/rdynamic.patch create mode 100644 external_imported/vcpkg/ports/dbus/rt_pc_link.patch create mode 100644 external_imported/vcpkg/ports/dbus/vcpkg.json create mode 100644 external_imported/vcpkg/ports/dcmtk/windows-patch.patch create mode 100644 external_imported/vcpkg/ports/detours/usage create mode 100644 external_imported/vcpkg/ports/directx-dxc/directx-dxc-config.cmake.in create mode 100644 external_imported/vcpkg/ports/directx-dxc/portfile.cmake create mode 100644 external_imported/vcpkg/ports/directx-dxc/vcpkg.json create mode 100644 external_imported/vcpkg/ports/dlib/fix-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch delete mode 100644 external_imported/vcpkg/ports/dlib/force_finding_packages.patch delete mode 100644 external_imported/vcpkg/ports/dpdk/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/dpdk/FindNuma.cmake delete mode 100644 external_imported/vcpkg/ports/dpdk/dpdkConfig.cmake create mode 100644 external_imported/vcpkg/ports/dpdk/enable-either-static-or-shared-build.patch create mode 100644 external_imported/vcpkg/ports/dpdk/fix-dependencies.patch create mode 100644 external_imported/vcpkg/ports/dpdk/no-absolute-driver-path.patch create mode 100644 external_imported/vcpkg/ports/dpdk/remove-examples-src-from-datadir.patch create mode 100644 external_imported/vcpkg/ports/dpdk/stop-building-apps.patch create mode 100644 external_imported/vcpkg/ports/dpp/make-pkgconfig-required.patch create mode 100644 external_imported/vcpkg/ports/dpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/dpp/usage create mode 100644 external_imported/vcpkg/ports/dpp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/drogon/redis.patch delete mode 100644 external_imported/vcpkg/ports/drogon/static-brotli.patch delete mode 100644 external_imported/vcpkg/ports/drogon/use-libmariadb.patch create mode 100644 external_imported/vcpkg/ports/duckx/fix_dependencies.patch create mode 100644 external_imported/vcpkg/ports/dv-processing/portfile.cmake create mode 100644 external_imported/vcpkg/ports/dv-processing/vcpkg.json create mode 100644 external_imported/vcpkg/ports/eastl/fix-error-C2039.diff create mode 100644 external_imported/vcpkg/ports/edflib/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/edflib/portfile.cmake create mode 100644 external_imported/vcpkg/ports/edflib/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/embree2/cmake_policy.patch delete mode 100644 external_imported/vcpkg/ports/embree2/portfile.cmake delete mode 100644 external_imported/vcpkg/ports/embree2/vcpkg.json create mode 100644 external_imported/vcpkg/ports/ereignis/portfile.cmake create mode 100644 external_imported/vcpkg/ports/ereignis/vcpkg.json create mode 100644 external_imported/vcpkg/ports/evpp/Add-static-shared-handling.patch create mode 100644 external_imported/vcpkg/ports/evpp/Export-unofficial-target.patch create mode 100644 external_imported/vcpkg/ports/evpp/compile-features.patch create mode 100644 external_imported/vcpkg/ports/ezfoundation/ezFoundation_vcpkg.patch create mode 100644 external_imported/vcpkg/ports/ezfoundation/portfile.cmake create mode 100644 external_imported/vcpkg/ports/ezfoundation/vcpkg.json create mode 100644 external_imported/vcpkg/ports/fastcgi/dll.patch create mode 100644 external_imported/vcpkg/ports/fawdlstty-libfv/portfile.cmake create mode 100644 external_imported/vcpkg/ports/fawdlstty-libfv/vcpkg.json create mode 100644 external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch create mode 100644 external_imported/vcpkg/ports/fbthrift/fix-glog.patch create mode 100644 external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch create mode 100644 external_imported/vcpkg/ports/ffmpeg/0021-fix-sdl2-version-check.patch create mode 100644 external_imported/vcpkg/ports/fftw3/bigobj.patch create mode 100644 external_imported/vcpkg/ports/flat/portfile.cmake create mode 100644 external_imported/vcpkg/ports/flat/vcpkg.json create mode 100644 external_imported/vcpkg/ports/flecs/portfile.cmake create mode 100644 external_imported/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/flecs/vcpkg.json rename external_imported/vcpkg/ports/fluidsynth/{separate-gentables.patch => gentables.patch} (55%) create mode 100644 external_imported/vcpkg/ports/fmt/fix-format-conflict.patch delete mode 100644 external_imported/vcpkg/ports/fmt/fix-invalid-command.patch create mode 100644 external_imported/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/font-util/build.patch create mode 100644 external_imported/vcpkg/ports/font-util/portfile.cmake create mode 100644 external_imported/vcpkg/ports/font-util/vcpkg.json create mode 100644 external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch create mode 100644 external_imported/vcpkg/ports/fontconfig/fix-preprocessor-clang-cl.patch create mode 100644 external_imported/vcpkg/ports/fontconfig/libgetopt.patch create mode 100644 external_imported/vcpkg/ports/freeimage/remove_auto_ptr.patch create mode 100644 external_imported/vcpkg/ports/freetds/disable-tests.patch create mode 100644 external_imported/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch create mode 100644 external_imported/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch create mode 100644 external_imported/vcpkg/ports/freetype-gl/0003-Add-exports.patch create mode 100644 external_imported/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/freetype-gl/0005-add-version.patch delete mode 100644 external_imported/vcpkg/ports/freetype-gl/glew.patch create mode 100644 external_imported/vcpkg/ports/freetype/bzip2.patch create mode 100644 external_imported/vcpkg/ports/freetype/error-strings.patch delete mode 100644 external_imported/vcpkg/ports/freetype/fix-bzip2-pc.patch delete mode 100644 external_imported/vcpkg/ports/ftgl/Fix-headersFilePath.patch create mode 100644 external_imported/vcpkg/ports/fuzzylite/no-werror.patch create mode 100644 external_imported/vcpkg/ports/gazebo/fix-tbb.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0002-Fix-build.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0004-Fix-cfitsio.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0007-Control-tools.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0009-atlbase.patch delete mode 100644 external_imported/vcpkg/ports/gdal/0010-symprefix.patch delete mode 100644 external_imported/vcpkg/ports/gdal/dependency_win.cmake create mode 100644 external_imported/vcpkg/ports/gdal/find-link-libraries.patch create mode 100644 external_imported/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch delete mode 100644 external_imported/vcpkg/ports/gdk-pixbuf/fix_build.patch delete mode 100644 external_imported/vcpkg/ports/geographiclib/cxx-library-only.patch create mode 100644 external_imported/vcpkg/ports/geos/fix_clang-cl.patch delete mode 100644 external_imported/vcpkg/ports/geos/install-hpp-files.patch create mode 100644 external_imported/vcpkg/ports/getopt-win32/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/gklib/build-fixes.patch create mode 100644 external_imported/vcpkg/ports/gklib/fix-mingw.patch create mode 100644 external_imported/vcpkg/ports/gklib/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gklib/vcpkg.json create mode 100644 external_imported/vcpkg/ports/glog/fix_cplusplus_macro.patch create mode 100644 external_imported/vcpkg/ports/glog/fix_crosscompile_symbolize.patch delete mode 100644 external_imported/vcpkg/ports/glog/fix_log_every_n.patch delete mode 100644 external_imported/vcpkg/ports/glog/nogdi-nominmax.patch delete mode 100644 external_imported/vcpkg/ports/glslang/always-install-resource-limits.patch delete mode 100644 external_imported/vcpkg/ports/glslang/glslang-config.cmake create mode 100644 external_imported/vcpkg/ports/glslang/usage create mode 100644 external_imported/vcpkg/ports/gmp/usage create mode 100644 external_imported/vcpkg/ports/gobject-introspection/0003-fix-paths.patch create mode 100644 external_imported/vcpkg/ports/gobject-introspection/python.patch create mode 100644 external_imported/vcpkg/ports/gpgmm/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gpgmm/vcpkg.json create mode 100644 external_imported/vcpkg/ports/gppanel/use-complex-header.patch create mode 100644 external_imported/vcpkg/ports/graphene/fix_clang-cl.patch delete mode 100644 external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch delete mode 100644 external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch delete mode 100644 external_imported/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch delete mode 100644 external_imported/vcpkg/ports/grpc/00013-build-upbdefs.patch create mode 100644 external_imported/vcpkg/ports/grpc/00015-disable-download-archive.patch create mode 100644 external_imported/vcpkg/ports/grppi/tbb.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl-good.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/fix-clang-cl.patch create mode 100644 external_imported/vcpkg/ports/gstreamer/plugins-base-x11.patch delete mode 100644 external_imported/vcpkg/ports/gtest/remove-werror.patch create mode 100644 external_imported/vcpkg/ports/gts/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/gts/fix-M_PI-in-windows.patch create mode 100644 external_imported/vcpkg/ports/gts/fix-dllexport.patch create mode 100644 external_imported/vcpkg/ports/gts/fix-dllexport_2.patch delete mode 100644 external_imported/vcpkg/ports/gts/fix-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/gts/fix_missing_extern.patch delete mode 100644 external_imported/vcpkg/ports/gts/glib2.patch create mode 100644 external_imported/vcpkg/ports/gts/predicates_init.h delete mode 100644 external_imported/vcpkg/ports/gts/support-unix.patch create mode 100644 external_imported/vcpkg/ports/gts/usage create mode 100644 external_imported/vcpkg/ports/guile/portfile.cmake create mode 100644 external_imported/vcpkg/ports/guile/vcpkg.json create mode 100644 external_imported/vcpkg/ports/gul14/portfile.cmake create mode 100644 external_imported/vcpkg/ports/gul14/vcpkg.json create mode 100644 external_imported/vcpkg/ports/hareflow/portfile.cmake create mode 100644 external_imported/vcpkg/ports/hareflow/vcpkg.json delete mode 100755 external_imported/vcpkg/ports/harfbuzz/0001-circumvent-samefile-error.patch delete mode 100644 external_imported/vcpkg/ports/harfbuzz/0002-fix-uwp-build.patch delete mode 100644 external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff create mode 100644 external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch create mode 100644 external_imported/vcpkg/ports/hash-library/001-fix-macos.patch create mode 100644 external_imported/vcpkg/ports/hash-library/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/hash-library/portfile.cmake create mode 100644 external_imported/vcpkg/ports/hash-library/vcpkg.json create mode 100644 external_imported/vcpkg/ports/highfive/fix_compiler_flags.patch delete mode 100644 external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch create mode 100644 external_imported/vcpkg/ports/hpx/fix-debug.patch create mode 100644 external_imported/vcpkg/ports/hpx/fix-export.patch create mode 100644 external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch create mode 100644 external_imported/vcpkg/ports/hpx/format.patch create mode 100644 external_imported/vcpkg/ports/hpx/usage create mode 100644 external_imported/vcpkg/ports/hunspell/0005-autotools-subdirs.patch create mode 100644 external_imported/vcpkg/ports/icu/check-autoconf-archive.patch create mode 100644 external_imported/vcpkg/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch create mode 100644 external_imported/vcpkg/ports/ignition-common3/fix-dependencies.patch rename external_imported/vcpkg/ports/ignition-modularscripts/{ignition_modular_library.cmake => vcpkg-port-config.cmake} (81%) create mode 100644 external_imported/vcpkg/ports/ignition-msgs1/fix-Add_std_string.patch create mode 100644 external_imported/vcpkg/ports/ignition-msgs5/02-Add_std_string.patch create mode 100644 external_imported/vcpkg/ports/ignition-msgs6/01-Add_std_string.patch create mode 100644 external_imported/vcpkg/ports/igraph/glpk-uwp.patch create mode 100644 external_imported/vcpkg/ports/iir1/fix-shared-static.patch delete mode 100644 external_imported/vcpkg/ports/influxdb-cxx/include-stringview.patch delete mode 100644 external_imported/vcpkg/ports/isal/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/isal/osx-asm-sysroot.patch create mode 100644 external_imported/vcpkg/ports/isal/unofficial-isal-config.cmake create mode 100644 external_imported/vcpkg/ports/jansson/fix-linker-flags.patch delete mode 100644 external_imported/vcpkg/ports/jemalloc/fix-cmakelists.patch create mode 100644 external_imported/vcpkg/ports/jemalloc/fix-configure-ac.patch delete mode 100644 external_imported/vcpkg/ports/jemalloc/fix-static-build.patch delete mode 100644 external_imported/vcpkg/ports/jemalloc/fix-utilities.patch create mode 100644 external_imported/vcpkg/ports/jemalloc/preprocessor.patch create mode 100644 external_imported/vcpkg/ports/json-c/fix-clang-cl.patch create mode 100644 external_imported/vcpkg/ports/jsonnet/0005-use-upstream-rapidyaml.patch create mode 100644 external_imported/vcpkg/ports/kf5globalaccel/make_x11_required.patch create mode 100644 external_imported/vcpkg/ports/kinectsdk1/Config.cmake.in create mode 100644 external_imported/vcpkg/ports/kinectsdk2/Config.cmake.in create mode 100644 external_imported/vcpkg/ports/lapack-reference/lapacke.patch create mode 100644 external_imported/vcpkg/ports/lcm/disable-docs.patch create mode 100644 external_imported/vcpkg/ports/lcms/cpp17.patch delete mode 100644 external_imported/vcpkg/ports/lerc/enable_static_build.patch delete mode 100644 external_imported/vcpkg/ports/lerc/install_lib_to_archive_path.patch rename external_imported/vcpkg/ports/libarchive/{fix-dependencies.patch => fix-deps.patch} (62%) create mode 100644 external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch create mode 100644 external_imported/vcpkg/ports/libcaer/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libcaer/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libcopp/fix-x86-windows.patch create mode 100644 external_imported/vcpkg/ports/libdc1394/fix-macosx.patch create mode 100644 external_imported/vcpkg/ports/libfontenc/build.patch create mode 100644 external_imported/vcpkg/ports/libfontenc/configure.ac.patch create mode 100644 external_imported/vcpkg/ports/libfontenc/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libfontenc/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libfreenect2/fix-macbuild.patch create mode 100644 external_imported/vcpkg/ports/libfs/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libfs/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/libgd/intrin.patch delete mode 100644 external_imported/vcpkg/ports/libgd/no-write-source-dir.patch create mode 100644 external_imported/vcpkg/ports/libgeotiff/public-dependencies.patch create mode 100644 external_imported/vcpkg/ports/libgo/Add-target-include-directory.patch create mode 100644 external_imported/vcpkg/ports/libgpg-error/TargetPlatformMinVersion.patch delete mode 100644 external_imported/vcpkg/ports/libharu/add-boolean-typedef.patch create mode 100644 external_imported/vcpkg/ports/libharu/export-targets.patch delete mode 100644 external_imported/vcpkg/ports/libharu/fix-build-fail.patch create mode 100644 external_imported/vcpkg/ports/libharu/fix-include-path.patch delete mode 100644 external_imported/vcpkg/ports/libharu/tiff.patch delete mode 100644 external_imported/vcpkg/ports/libhv/fix-find_package.patch create mode 100644 external_imported/vcpkg/ports/libhv/fix-include_header.patch create mode 100644 external_imported/vcpkg/ports/libhydrogen/no-arch.patch create mode 100644 external_imported/vcpkg/ports/libhydrogen/remove-tests.patch create mode 100644 external_imported/vcpkg/ports/libice/fix_build.patch create mode 100644 external_imported/vcpkg/ports/libice/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libice/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libilbc/absl.patch create mode 100644 external_imported/vcpkg/ports/liblas/fix-cmake-config.patch create mode 100644 external_imported/vcpkg/ports/liblas/misc-fixes.patch create mode 100644 external_imported/vcpkg/ports/liblas/usage create mode 100644 external_imported/vcpkg/ports/liblsquic/disable-asan.patch create mode 100644 external_imported/vcpkg/ports/liblsquic/portfile.cmake create mode 100644 external_imported/vcpkg/ports/liblsquic/vcpkg.json create mode 100644 external_imported/vcpkg/ports/liblzma/build-tools.patch delete mode 100644 external_imported/vcpkg/ports/libmariadb/arm64.patch delete mode 100644 external_imported/vcpkg/ports/libmariadb/export-cmake-targets.patch create mode 100644 external_imported/vcpkg/ports/libmariadb/fix-CMakeLists.patch delete mode 100644 external_imported/vcpkg/ports/libmariadb/no-extra-static-lib.patch create mode 100644 external_imported/vcpkg/ports/libmicrodns/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libmicrodns/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch create mode 100644 external_imported/vcpkg/ports/libopensp/opensp.pc.in create mode 100644 external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch delete mode 100644 external_imported/vcpkg/ports/libpng/pkgconfig.2.patch create mode 100644 external_imported/vcpkg/ports/libpng/usage create mode 100644 external_imported/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/libpq/libpq.props.in delete mode 100644 external_imported/vcpkg/ports/libpq/patches/linux/configure.patch delete mode 100644 external_imported/vcpkg/ports/libpq/patches/mingw/link-with-crypt32.patch create mode 100644 external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch delete mode 100644 external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch create mode 100644 external_imported/vcpkg/ports/librabbitmq/fix-link-header-files.patch create mode 100644 external_imported/vcpkg/ports/libraw/remove_register_cpp.patch create mode 100644 external_imported/vcpkg/ports/librdkafka/fix_curl.patch delete mode 100644 external_imported/vcpkg/ports/libsigcpp/fix-usage-in-static-build.patch delete mode 100644 external_imported/vcpkg/ports/libsigcpp/version.patch create mode 100644 external_imported/vcpkg/ports/libsm/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libsm/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libsm/windows.patch create mode 100644 external_imported/vcpkg/ports/libspatialindex/mingw.patch create mode 100644 external_imported/vcpkg/ports/libspatialite/fix-mingw.patch create mode 100644 external_imported/vcpkg/ports/libunibreak/libunibreak-config.cmake.in delete mode 100644 external_imported/vcpkg/ports/libunistring/fix-for-automake-1.16.4.patch create mode 100644 external_imported/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch create mode 100644 external_imported/vcpkg/ports/liburing/disable-tests-and-examples.patch delete mode 100644 external_imported/vcpkg/ports/liburing/fix-spec-version.patch delete mode 100644 external_imported/vcpkg/ports/libuv/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/libuv/fix-build-type.patch delete mode 100644 external_imported/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake create mode 100644 external_imported/vcpkg/ports/libuv/usage delete mode 100644 external_imported/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake rename external_imported/vcpkg/ports/libvpx/{0003-add-uwp-and-v142-support.patch => 0003-add-uwp-v142-and-v143-support.patch} (87%) delete mode 100644 external_imported/vcpkg/ports/libwebp/0001-build.patch delete mode 100644 external_imported/vcpkg/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch create mode 100644 external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch delete mode 100644 external_imported/vcpkg/ports/libwebp/0003-always-mux.patch create mode 100644 external_imported/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/libwebp/0004-add-missing-linked-library.patch delete mode 100644 external_imported/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch create mode 100644 external_imported/vcpkg/ports/libwebp/0010-fix_build.patch create mode 100644 external_imported/vcpkg/ports/libx11/cl.build.patch create mode 100644 external_imported/vcpkg/ports/libx11/dllimport.patch create mode 100644 external_imported/vcpkg/ports/libx11/io_include.patch create mode 100644 external_imported/vcpkg/ports/libx11/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libx11/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/libx11/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libx11/vcxserver.patch create mode 100644 external_imported/vcpkg/ports/libxau/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxau/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxdamage/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxdamage/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxdmcp/configure.ac.patch create mode 100644 external_imported/vcpkg/ports/libxdmcp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxdmcp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxext/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxext/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxfixes/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxfixes/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxi/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxi/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxkbcommon/build.patch create mode 100644 external_imported/vcpkg/ports/libxkbcommon/fix_msvc_build.patch create mode 100644 external_imported/vcpkg/ports/libxkbcommon/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxkbcommon/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxkbfile/fix_u_char.patch create mode 100644 external_imported/vcpkg/ports/libxkbfile/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxkbfile/symbol_visibility.patch create mode 100644 external_imported/vcpkg/ports/libxkbfile/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxml2/disable-docs.patch create mode 100644 external_imported/vcpkg/ports/libxmlmm/unofficial-libxmlmm-config.cmake create mode 100644 external_imported/vcpkg/ports/libxpm/fix-dependency-gettext.patch create mode 100644 external_imported/vcpkg/ports/libxpm/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxpm/remove_strings_h.patch create mode 100644 external_imported/vcpkg/ports/libxpm/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxrandr/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxrandr/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxrender/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxrender/vcpkg.json create mode 100644 external_imported/vcpkg/ports/libxres/build.patch create mode 100644 external_imported/vcpkg/ports/libxres/portfile.cmake create mode 100644 external_imported/vcpkg/ports/libxres/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch delete mode 100644 external_imported/vcpkg/ports/libxslt/0002-Fix-lzma.patch delete mode 100644 external_imported/vcpkg/ports/libxslt/0003-Fix-configure.patch create mode 100644 external_imported/vcpkg/ports/libxslt/fix-gcrypt-deps.patch create mode 100644 external_imported/vcpkg/ports/libxslt/libexslt-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/libxslt/msvc-no-suffix.patch delete mode 100644 external_imported/vcpkg/ports/libxslt/only_build_one_lib_type.patch create mode 100644 external_imported/vcpkg/ports/libxslt/python3.patch create mode 100644 external_imported/vcpkg/ports/libxslt/skip-install-docs.patch create mode 100644 external_imported/vcpkg/ports/libxslt/usage create mode 100644 external_imported/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/linmath/portfile.cmake create mode 100644 external_imported/vcpkg/ports/linmath/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch delete mode 100644 external_imported/vcpkg/ports/llvm/0003-fix-openmp-debug.patch create mode 100644 external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch delete mode 100644 external_imported/vcpkg/ports/llvm/0011-fix-libxml2.patch create mode 100644 external_imported/vcpkg/ports/lockpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/lockpp/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/log4cxx/pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/log4cxx/threadutility.patch create mode 100644 external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt delete mode 100644 external_imported/vcpkg/ports/luajit/002-fix-crt-linkage.patch create mode 100644 external_imported/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch rename external_imported/vcpkg/ports/luajit/{001-fix-build-path.patch => 004-fix-build-path-and-crt-linkage.patch} (68%) create mode 100755 external_imported/vcpkg/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch create mode 100644 external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch create mode 100755 external_imported/vcpkg/ports/magnum/005-fix-find-sdl2.patch create mode 100644 external_imported/vcpkg/ports/matchit/portfile.cmake create mode 100644 external_imported/vcpkg/ports/matchit/usage create mode 100644 external_imported/vcpkg/ports/matchit/vcpkg.json create mode 100644 external_imported/vcpkg/ports/materialx/portfile.cmake create mode 100644 external_imported/vcpkg/ports/materialx/vcpkg.json create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/c99.patch create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/issue219.patch create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/windows.patch create mode 100644 external_imported/vcpkg/ports/mchehab-zbar/x64.patch create mode 100644 external_imported/vcpkg/ports/mesa/clover.patch delete mode 100644 external_imported/vcpkg/ports/mesa/d3d10sw.patch create mode 100644 external_imported/vcpkg/ports/mesa/def-fixes.patch delete mode 100644 external_imported/vcpkg/ports/mesa/radv-msvc-llvm13-2.patch delete mode 100644 external_imported/vcpkg/ports/mesa/swr-llvm13.patch delete mode 100644 external_imported/vcpkg/ports/mesa/swr-msvc-2.patch delete mode 100644 external_imported/vcpkg/ports/mesa/swravx512-post-static-link.patch create mode 100644 external_imported/vcpkg/ports/metis/build-fixes.patch delete mode 100644 external_imported/vcpkg/ports/metis/disable-programs.patch delete mode 100644 external_imported/vcpkg/ports/metis/enable-install.patch delete mode 100644 external_imported/vcpkg/ports/metis/fix-INT_MIN_define.patch delete mode 100644 external_imported/vcpkg/ports/metis/fix-gklib-vs14-math.patch delete mode 100644 external_imported/vcpkg/ports/metis/fix-linux-build-error.patch delete mode 100644 external_imported/vcpkg/ports/metis/fix-metis-vs14-math.patch delete mode 100644 external_imported/vcpkg/ports/metis/fix-runtime-install-destination.patch delete mode 100644 external_imported/vcpkg/ports/metis/install-metisConfig.patch delete mode 100644 external_imported/vcpkg/ports/minio-cpp/fix_cmake_file.patch create mode 100644 external_imported/vcpkg/ports/minizip/0004-define.patch delete mode 100644 external_imported/vcpkg/ports/mosquitto/0001-add-archive-destination-to-install.patch delete mode 100644 external_imported/vcpkg/ports/mp-units/cmake.patch create mode 100644 external_imported/vcpkg/ports/mpfr/usage create mode 100644 external_imported/vcpkg/ports/mpg123/fix-m1-build.patch delete mode 100644 external_imported/vcpkg/ports/mpg123/no-executables.patch create mode 100644 external_imported/vcpkg/ports/msmpi/mpi-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/mygui/Install-tools.patch create mode 100644 external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch create mode 100644 external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch create mode 100644 external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch create mode 100644 external_imported/vcpkg/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in create mode 100644 external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake create mode 100644 external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json create mode 100644 external_imported/vcpkg/ports/nanobench/fix-cmakefile.patch create mode 100644 external_imported/vcpkg/ports/nanogui/fix-glad-dependence.patch create mode 100644 external_imported/vcpkg/ports/nanosvg/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/nanosvg/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nanosvg/vcpkg.json create mode 100644 external_imported/vcpkg/ports/ncnn/portfile.cmake create mode 100644 external_imported/vcpkg/ports/ncnn/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/nethost/0002-settings-cmake.patch create mode 100644 external_imported/vcpkg/ports/nghttp3/portfile.cmake create mode 100644 external_imported/vcpkg/ports/nghttp3/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch create mode 100644 external_imported/vcpkg/ports/nvtt/fix-release-flags.patch create mode 100644 external_imported/vcpkg/ports/ogre/fix-cmake-feature-summary.patch delete mode 100644 external_imported/vcpkg/ports/ogre/fix-findimgui.patch create mode 100644 external_imported/vcpkg/ports/ogre/fix-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/openal-soft/0001-fix-mingw-x86-build.patch delete mode 100644 external_imported/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch create mode 100644 external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch create mode 100644 external_imported/vcpkg/ports/opencc/fix-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch create mode 100644 external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/openctm/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/openctm/portfile.cmake create mode 100644 external_imported/vcpkg/ports/openctm/vcpkg.json rename external_imported/vcpkg/ports/opencv2/{0002-install-options.patch => 0001-install-options.patch} (92%) rename external_imported/vcpkg/ports/opencv2/{fix-path-contains-++-error.patch => 0002-fix-paths-containing-symbols.patch} (94%) create mode 100644 external_imported/vcpkg/ports/opencv2/0006-fix-jasper.patch create mode 100644 external_imported/vcpkg/ports/opencv2/0007-fix-config.patch create mode 100644 external_imported/vcpkg/ports/opencv2/0019-fix-openexr.patch create mode 100644 external_imported/vcpkg/ports/opencv2/usage.in create mode 100644 external_imported/vcpkg/ports/opencv3/0013-fix-ceres.patch create mode 100644 external_imported/vcpkg/ports/opencv3/0016-fix-freetype-contrib.patch create mode 100644 external_imported/vcpkg/ports/opencv3/0018-fix-depend-tesseract.patch create mode 100644 external_imported/vcpkg/ports/opencv3/usage.in rename external_imported/vcpkg/ports/opencv4/{0005-fix-eigen.patch => 0004-fix-eigen.patch} (100%) rename external_imported/vcpkg/ports/opencv4/{0004-fix-policy-CMP0057.patch => 0005-fix-policy-CMP0057.patch} (100%) create mode 100644 external_imported/vcpkg/ports/opencv4/0013-fix-ceres.patch delete mode 100644 external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch delete mode 100644 external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0014-fix-ogre.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch create mode 100644 external_imported/vcpkg/ports/opencv4/0018-fix-depend-tesseract.patch create mode 100644 external_imported/vcpkg/ports/opencv4/usage.in delete mode 100644 external_imported/vcpkg/ports/openexr/0001-remove_find_package_macro.patch delete mode 100644 external_imported/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch delete mode 100644 external_imported/vcpkg/ports/openexr/0003-remove_symlinks.patch delete mode 100644 external_imported/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch create mode 100644 external_imported/vcpkg/ports/openexr/usage delete mode 100644 external_imported/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake create mode 100644 external_imported/vcpkg/ports/openfbx/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/openfbx/portfile.cmake create mode 100644 external_imported/vcpkg/ports/openfbx/unofficial-openfbxConfig.cmake.in create mode 100644 external_imported/vcpkg/ports/openfbx/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/openimageio/fix-config-cmake.patch create mode 100644 external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch delete mode 100644 external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch create mode 100644 external_imported/vcpkg/ports/openimageio/fix-static-ffmpeg.patch create mode 100644 external_imported/vcpkg/ports/openimageio/imath-version-guard.patch create mode 100644 external_imported/vcpkg/ports/openimageio/usage delete mode 100644 external_imported/vcpkg/ports/openjpeg/Enable-tools-of-each-features.patch create mode 100644 external_imported/vcpkg/ports/openjpeg/arm.patch delete mode 100644 external_imported/vcpkg/ports/openjpeg/dll.location.patch delete mode 100644 external_imported/vcpkg/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch create mode 100644 external_imported/vcpkg/ports/openjpeg/fix-static.patch create mode 100644 external_imported/vcpkg/ports/openjpeg/no-wx.patch create mode 100644 external_imported/vcpkg/ports/openldap/m4.patch create mode 100644 external_imported/vcpkg/ports/openldap/openssl.patch create mode 100644 external_imported/vcpkg/ports/openldap/portfile.cmake create mode 100644 external_imported/vcpkg/ports/openldap/subdirs.patch create mode 100644 external_imported/vcpkg/ports/openldap/usage create mode 100644 external_imported/vcpkg/ports/openldap/vcpkg.json create mode 100644 external_imported/vcpkg/ports/openmvg/no-absolute-paths.patch delete mode 100644 external_imported/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch create mode 100644 external_imported/vcpkg/ports/openmvs/no-absolute-paths.patch create mode 100644 external_imported/vcpkg/ports/openssl/windows/flags.patch create mode 100644 external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch delete mode 100644 external_imported/vcpkg/ports/orc/0005-disable-tzdata.patch create mode 100644 external_imported/vcpkg/ports/orc/fix-linux-error.patch delete mode 100644 external_imported/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch delete mode 100644 external_imported/vcpkg/ports/osg/fix-curl.patch delete mode 100644 external_imported/vcpkg/ports/osg/fix-dependency-coin.patch delete mode 100644 external_imported/vcpkg/ports/osg/fix-example-application.patch delete mode 100644 external_imported/vcpkg/ports/osg/fix-liblas.patch create mode 100644 external_imported/vcpkg/ports/osg/fix-nvtt-squish.patch delete mode 100644 external_imported/vcpkg/ports/osg/fix-nvtt.patch create mode 100644 external_imported/vcpkg/ports/osg/link-libraries.patch create mode 100644 external_imported/vcpkg/ports/osg/openexr3.patch create mode 100644 external_imported/vcpkg/ports/osg/plugin-pdb-install.patch delete mode 100644 external_imported/vcpkg/ports/osg/remove-prefix.patch delete mode 100644 external_imported/vcpkg/ports/osg/static.patch create mode 100644 external_imported/vcpkg/ports/osg/unofficial-export.patch create mode 100644 external_imported/vcpkg/ports/osg/unofficial-osg-config.cmake create mode 100644 external_imported/vcpkg/ports/osg/usage delete mode 100644 external_imported/vcpkg/ports/osgearth/StaticOSG.patch delete mode 100644 external_imported/vcpkg/ports/osgearth/blend2d-fix.patch rename external_imported/vcpkg/ports/osgearth/{make-all-find-packages-required.patch => find-package.patch} (52%) delete mode 100644 external_imported/vcpkg/ports/osgearth/fix-dependency-osg.patch delete mode 100644 external_imported/vcpkg/ports/osgearth/fix-gcc11-compilation.patch delete mode 100644 external_imported/vcpkg/ports/osgearth/fix-imgui.patch create mode 100644 external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch create mode 100644 external_imported/vcpkg/ports/osgearth/link-libraries.patch create mode 100644 external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch create mode 100644 external_imported/vcpkg/ports/outcome/fix-find-library.patch create mode 100644 external_imported/vcpkg/ports/outcome/fix-status-code-include.patch delete mode 100644 external_imported/vcpkg/ports/outcome/outcome-prune-sources.patch delete mode 100644 external_imported/vcpkg/ports/pagmo2/disable-C4701.patch delete mode 100644 external_imported/vcpkg/ports/pagmo2/disable-md-override.patch create mode 100644 external_imported/vcpkg/ports/pagmo2/disable-werror.patch create mode 100644 external_imported/vcpkg/ports/pagmo2/doxygen.patch delete mode 100644 external_imported/vcpkg/ports/paho-mqtt/fix-install-path.patch delete mode 100644 external_imported/vcpkg/ports/paho-mqtt/remove_compiler_options.patch delete mode 100644 external_imported/vcpkg/ports/paho-mqttpp3/fix-include-path.patch delete mode 100644 external_imported/vcpkg/ports/pangomm/COPYING create mode 100644 external_imported/vcpkg/ports/parmetis/build-fixes.patch delete mode 100644 external_imported/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch delete mode 100644 external_imported/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch delete mode 100644 external_imported/vcpkg/ports/parmetis/fix-metis-vs14-math.patch delete mode 100644 external_imported/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch delete mode 100644 external_imported/vcpkg/ports/parmetis/fix-root-cmakelist.patch create mode 100644 external_imported/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch create mode 100644 external_imported/vcpkg/ports/pcre2/no-static-suffix.patch delete mode 100644 external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch delete mode 100644 external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch create mode 100644 external_imported/vcpkg/ports/pdal/cmake-project-include.cmake delete mode 100644 external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch create mode 100644 external_imported/vcpkg/ports/pffft/fix-invalid-command.patch create mode 100644 external_imported/vcpkg/ports/pipewire/portfile.cmake create mode 100644 external_imported/vcpkg/ports/pipewire/vcpkg.json create mode 100644 external_imported/vcpkg/ports/pixman/fix_clang-cl.patch create mode 100644 external_imported/vcpkg/ports/pixman/missing_intrin_include.patch create mode 100644 external_imported/vcpkg/ports/plog/usage create mode 100644 external_imported/vcpkg/ports/podofo/fix-compiler.patch create mode 100644 external_imported/vcpkg/ports/podofo/install-cmake-config.patch delete mode 100644 external_imported/vcpkg/ports/polymorphic-value/001_no_catch_submodule.patch delete mode 100644 external_imported/vcpkg/ports/polymorphic-value/002_fixed_config.patch create mode 100644 external_imported/vcpkg/ports/proj/remove-doc.patch create mode 100644 external_imported/vcpkg/ports/protobuf/compile_options.patch delete mode 100644 external_imported/vcpkg/ports/protozero/fix-builderror.patch create mode 100644 external_imported/vcpkg/ports/protozero/fix-no-tests.patch create mode 100644 external_imported/vcpkg/ports/proxy/portfile.cmake create mode 100644 external_imported/vcpkg/ports/proxy/vcpkg.json create mode 100644 external_imported/vcpkg/ports/pthread-stubs/portfile.cmake create mode 100644 external_imported/vcpkg/ports/pthread-stubs/vcpkg.json rename external_imported/vcpkg/ports/pthreads/{vcpkg-cmake-wrapper.cmake => PThreads4WConfig.cmake} (75%) create mode 100644 external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthread.cmake create mode 100644 external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads-windows.cmake create mode 100644 external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads.cmake create mode 100644 external_imported/vcpkg/ports/pugixml/dllexport.patch create mode 100644 external_imported/vcpkg/ports/pybind11/fix-usage.patch create mode 100644 external_imported/vcpkg/ports/python3/0011-dont-skip-rpath.patch create mode 100644 external_imported/vcpkg/ports/python3/usage.unix create mode 100644 external_imported/vcpkg/ports/python3/usage.win create mode 100644 external_imported/vcpkg/ports/qnnpack/fix-arm64-osx.patch create mode 100644 external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch delete mode 100644 external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake delete mode 100644 external_imported/vcpkg/ports/qt-advanced-docking-system/hardcode_version.patch delete mode 100644 external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes_latest.cmake delete mode 100644 external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch delete mode 100644 external_imported/vcpkg/ports/qt5-declarative/limits_include.patch delete mode 100644 external_imported/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch create mode 100644 external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch create mode 100644 external_imported/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch create mode 100644 external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff create mode 100644 external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake delete mode 100644 external_imported/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake delete mode 100644 external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch create mode 100644 external_imported/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch create mode 100644 external_imported/vcpkg/ports/qtbase/installed_dir.patch create mode 100644 external_imported/vcpkg/ports/qtbase/qtpaths.debug.bat create mode 100644 external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat rename external_imported/vcpkg/ports/qtimageformats/{no_target_promotion.patch => no_target_promotion_latest.patch} (68%) create mode 100644 external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt delete mode 100644 external_imported/vcpkg/ports/qttools/no_src_changes.patch create mode 100644 external_imported/vcpkg/ports/qtwebengine/0ce5e91.diff delete mode 100644 external_imported/vcpkg/ports/quill/fix-c4189-warning.patch create mode 100644 external_imported/vcpkg/ports/random123/portfile.cmake create mode 100644 external_imported/vcpkg/ports/random123/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff create mode 100644 external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch create mode 100644 external_imported/vcpkg/ports/rioki-glow/portfile.cmake create mode 100644 external_imported/vcpkg/ports/rioki-glow/vcpkg.json create mode 100644 external_imported/vcpkg/ports/rsig/portfile.cmake create mode 100644 external_imported/vcpkg/ports/rsig/usage create mode 100644 external_imported/vcpkg/ports/rsig/vcpkg.json create mode 100644 external_imported/vcpkg/ports/rtabmap/0002-fix-opencv46.patch rename external_imported/vcpkg/ports/rtabmap/{fix-qt.patch => 0003-fix-qt.patch} (65%) delete mode 100644 external_imported/vcpkg/ports/rtmidi/fix-POSIXname.patch create mode 100644 external_imported/vcpkg/ports/rtmidi/fix-cmake-usage.patch create mode 100644 external_imported/vcpkg/ports/rubberband/portfile.cmake create mode 100644 external_imported/vcpkg/ports/rubberband/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/rxcpp/support_find_package.patch create mode 100644 external_imported/vcpkg/ports/rxspencer/disable-docs-and-tests.patch create mode 100644 external_imported/vcpkg/ports/saucer/fix-source-generation.patch create mode 100644 external_imported/vcpkg/ports/saucer/portfile.cmake create mode 100644 external_imported/vcpkg/ports/saucer/unofficial-webview2.patch create mode 100644 external_imported/vcpkg/ports/saucer/vcpkg.json create mode 100644 external_imported/vcpkg/ports/sdl1/sdl-config.patch create mode 100644 external_imported/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in delete mode 100644 external_imported/vcpkg/ports/sdl2-mixer/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch create mode 100644 external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch create mode 100644 external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/sdl2-mixer/usage delete mode 100644 external_imported/vcpkg/ports/sdl2-ttf/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/sdl2-ttf/fix-pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/sdl2-ttf/usage delete mode 100644 external_imported/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch delete mode 100644 external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch delete mode 100644 external_imported/vcpkg/ports/secp256k1/libsecp256k1-config.h delete mode 100644 external_imported/vcpkg/ports/secp256k1/secp256k1-config.cmake create mode 100644 external_imported/vcpkg/ports/septag-dmon/portfile.cmake create mode 100644 external_imported/vcpkg/ports/septag-dmon/vcpkg.json create mode 100644 external_imported/vcpkg/ports/sfgui/002-add-limits-header.patch create mode 100644 external_imported/vcpkg/ports/sfml/fix-dependencies.patch delete mode 100644 external_imported/vcpkg/ports/sfml/stb_include.patch delete mode 100644 external_imported/vcpkg/ports/sfml/use-system-freetype.patch create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgcrypt/portfile.cmake create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgcrypt/vcpkg.json create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgnutls/external-libtasn1.patch create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgnutls/pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake create mode 100644 external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/skia/add-missing-tuple.patch create mode 100644 external_imported/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch create mode 100644 external_imported/vcpkg/ports/skia/fontconfig.gn create mode 100644 external_imported/vcpkg/ports/skia/use_vcpkg_fontconfig.patch create mode 100644 external_imported/vcpkg/ports/snappy/fix_clang-cl_build.patch create mode 100644 external_imported/vcpkg/ports/snappy/snappy.pc.in delete mode 100644 external_imported/vcpkg/ports/socket-io-client/fix-file-not-found.patch delete mode 100644 external_imported/vcpkg/ports/soil2/LICENSE create mode 100644 external_imported/vcpkg/ports/solid3/no-sse.patch rename external_imported/vcpkg/ports/soxr/{003_detect_arm_on_windows.patch => 003_detect_arm.patch} (90%) delete mode 100644 external_imported/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch delete mode 100644 external_imported/vcpkg/ports/speex/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/speex/fix-vla-check.patch create mode 100644 external_imported/vcpkg/ports/speex/subdirs.patch delete mode 100644 external_imported/vcpkg/ports/sqlpp11/fix-dependency.patch create mode 100644 external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch create mode 100644 external_imported/vcpkg/ports/stduuid/fix-install-directory.patch create mode 100644 external_imported/vcpkg/ports/stduuid/fix-libuuid-dependency.patch create mode 100644 external_imported/vcpkg/ports/stduuid/portfile.cmake create mode 100644 external_imported/vcpkg/ports/stduuid/vcpkg.json create mode 100644 external_imported/vcpkg/ports/stftpitchshift/portfile.cmake create mode 100644 external_imported/vcpkg/ports/stftpitchshift/vcpkg.json create mode 100644 external_imported/vcpkg/ports/stronk/portfile.cmake create mode 100644 external_imported/vcpkg/ports/stronk/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/symengine/fix-build.patch delete mode 100644 external_imported/vcpkg/ports/tbb/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/tbb/fix-static-build.patch delete mode 100644 external_imported/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch delete mode 100644 external_imported/vcpkg/ports/tbb/usage delete mode 100644 external_imported/vcpkg/ports/tensorpipe/fix-cmakelists.patch delete mode 100644 external_imported/vcpkg/ports/tensorpipe/support-pybind11.patch create mode 100644 external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch create mode 100644 external_imported/vcpkg/ports/tesseract/fix-depend-libarchive.patch delete mode 100644 external_imported/vcpkg/ports/tesseract/fix-tiff-linkage.patch delete mode 100644 external_imported/vcpkg/ports/tesseract/fix-timeval.patch create mode 100644 external_imported/vcpkg/ports/tgui/devendor-stb.patch delete mode 100644 external_imported/vcpkg/ports/tgui/fix-usage.patch create mode 100644 external_imported/vcpkg/ports/tgui/usage create mode 100644 external_imported/vcpkg/ports/thrift/pc-suffix.patch create mode 100644 external_imported/vcpkg/ports/tidy-html5/debug-postfix.patch create mode 100644 external_imported/vcpkg/ports/tidy-html5/disable-doc.patch create mode 100644 external_imported/vcpkg/ports/tidy-html5/static-vs-shared.patch create mode 100644 external_imported/vcpkg/ports/tiff/android-libm.patch delete mode 100644 external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch delete mode 100644 external_imported/vcpkg/ports/tinyutf8/fixbuild.patch create mode 100644 external_imported/vcpkg/ports/tmx/libxml2.patch create mode 100644 external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch create mode 100644 external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch delete mode 100644 external_imported/vcpkg/ports/trantor/vcpkg.patch create mode 100644 external_imported/vcpkg/ports/tre/fix-config.patch create mode 100644 external_imported/vcpkg/ports/tree-sitter/CMakeLists.txt create mode 100644 external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch create mode 100644 external_imported/vcpkg/ports/tree-sitter/portfile.cmake create mode 100644 external_imported/vcpkg/ports/tree-sitter/vcpkg.json rename external_imported/vcpkg/ports/triton/{003-fix-capstone-5.patch => 002-fix-capstone-5.patch} (100%) delete mode 100644 external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch create mode 100644 external_imported/vcpkg/ports/triton/003-fix-python.patch delete mode 100644 external_imported/vcpkg/ports/triton/004-fix-python.patch create mode 100644 external_imported/vcpkg/ports/upb/0001-make-cmakelists-py.patch create mode 100644 external_imported/vcpkg/ports/upb/0002-fix-uwp.patch delete mode 100644 external_imported/vcpkg/ports/upb/add-all-libs-target.patch delete mode 100644 external_imported/vcpkg/ports/upb/add-cmake-install.patch delete mode 100644 external_imported/vcpkg/ports/upb/fix-cmakelists.patch delete mode 100644 external_imported/vcpkg/ports/upb/fix-uwp.patch create mode 100644 external_imported/vcpkg/ports/upb/upb-config-vcpkg-tools.cmake delete mode 100644 external_imported/vcpkg/ports/urdfdom/0002_fix_exports.patch delete mode 100644 external_imported/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch create mode 100644 external_imported/vcpkg/ports/uvatlas/openexr.patch create mode 100644 external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch create mode 100644 external_imported/vcpkg/ports/vcglib/fix-build.patch delete mode 100644 external_imported/vcpkg/ports/vcpkg-cmake-config/README.md rename external_imported/vcpkg/ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/cmake_get_vars/CMakeLists.txt (89%) create mode 100644 external_imported/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json rename external_imported/vcpkg/ports/{vcpkg-cmake => vcpkg-cmake-get-vars}/vcpkg_cmake_get_vars.cmake (62%) delete mode 100644 external_imported/vcpkg/ports/vcpkg-cmake/README.md delete mode 100644 external_imported/vcpkg/ports/vcpkg-cmake/copyright create mode 100644 external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth create mode 100644 external_imported/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake delete mode 100644 external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/README.md delete mode 100644 external_imported/vcpkg/ports/vcpkg-qmake/copyright create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-gn/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-gn/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/vcpkg-tool-meson/fix_linker_detection.patch create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-ninja/use-internal-re2c.patch create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake create mode 100644 external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vkfft/portfile.cmake create mode 100644 external_imported/vcpkg/ports/vkfft/vcpkg.json create mode 100644 external_imported/vcpkg/ports/vlpp/fix-arm.patch create mode 100644 external_imported/vcpkg/ports/vtk/fix-find-libharu.patch delete mode 100644 external_imported/vcpkg/ports/wavpack/OpenSSL.patch delete mode 100644 external_imported/vcpkg/ports/wavpack/fix-symbol-exports.patch create mode 100644 external_imported/vcpkg/ports/wayland-protocols/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wayland-protocols/vcpkg.json create mode 100644 external_imported/vcpkg/ports/wayland/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wayland/tests.patch create mode 100644 external_imported/vcpkg/ports/wayland/vcpkg.json create mode 100644 external_imported/vcpkg/ports/webview2/portfile.cmake create mode 100644 external_imported/vcpkg/ports/webview2/unofficial-webview2-config.cmake create mode 100644 external_imported/vcpkg/ports/webview2/vcpkg.json create mode 100644 external_imported/vcpkg/ports/wolfmqtt/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wolfmqtt/vcpkg.json create mode 100644 external_imported/vcpkg/ports/wolfssl/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wolfssl/vcpkg.json create mode 100644 external_imported/vcpkg/ports/wolfssl/wolfssl_pr5529.diff create mode 100644 external_imported/vcpkg/ports/wolftpm/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wolftpm/vcpkg.json create mode 100644 external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch create mode 100644 external_imported/vcpkg/ports/wtl/atlribbon.h-wtl66.patch create mode 100644 external_imported/vcpkg/ports/wxcharts/portfile.cmake create mode 100644 external_imported/vcpkg/ports/wxcharts/vcpkg.json delete mode 100644 external_imported/vcpkg/ports/wxwidgets/disable-platform-lib-dir.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/example/CMakeLists.txt delete mode 100644 external_imported/vcpkg/ports/wxwidgets/fix-build.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/fix-libs-export.patch delete mode 100644 external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/fix-pcre2.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/gtk3-link-libraries.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/install-layout.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch create mode 100644 external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch create mode 100644 external_imported/vcpkg/ports/x264/allow-clang-cl.patch create mode 100644 external_imported/vcpkg/ports/x264/configure-as.patch create mode 100644 external_imported/vcpkg/ports/x264/parallel-install.patch create mode 100644 external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch create mode 100644 external_imported/vcpkg/ports/xcb-proto/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xcb-proto/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xcb-render-util/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xcb-render-util/pthread.patch create mode 100644 external_imported/vcpkg/ports/xcb-render-util/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xcb-util-m4/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xcb-util-m4/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xcb/configure.patch create mode 100644 external_imported/vcpkg/ports/xcb/getpid_include.patch create mode 100644 external_imported/vcpkg/ports/xcb/makefile.patch create mode 100644 external_imported/vcpkg/ports/xcb/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xcb/use_xwindows_includes.patch create mode 100644 external_imported/vcpkg/ports/xcb/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xlnt/fix-missing-include.patch create mode 100644 external_imported/vcpkg/ports/xlsxio/export-targets.patch create mode 100644 external_imported/vcpkg/ports/xorg-macros/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xorg-macros/skip_rawcpp.patch create mode 100644 external_imported/vcpkg/ports/xorg-macros/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xproto/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xproto/upstream-1.patch create mode 100644 external_imported/vcpkg/ports/xproto/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xproto/vcxserver-xw32defs.patch create mode 100644 external_imported/vcpkg/ports/xproto/windows-include-guards.patch create mode 100644 external_imported/vcpkg/ports/xproto/windows-io.patch create mode 100644 external_imported/vcpkg/ports/xproto/windows-long64.patch create mode 100644 external_imported/vcpkg/ports/xproto/windows-none.patch create mode 100644 external_imported/vcpkg/ports/xproto/windows_mean_and_lean.patch create mode 100644 external_imported/vcpkg/ports/xtrans/portfile.cmake create mode 100644 external_imported/vcpkg/ports/xtrans/symbols.patch create mode 100644 external_imported/vcpkg/ports/xtrans/vcpkg.json create mode 100644 external_imported/vcpkg/ports/xtrans/win32.patch create mode 100644 external_imported/vcpkg/ports/yasm/fix-arm-cross-build.patch create mode 100644 external_imported/vcpkg/ports/yoga/Export-unofficial-yoga-config.patch create mode 100644 external_imported/vcpkg/ports/z3/remove-flag-overrides.patch create mode 100644 external_imported/vcpkg/ports/z4kn4fein-semver/portfile.cmake create mode 100644 external_imported/vcpkg/ports/z4kn4fein-semver/vcpkg.json create mode 100644 external_imported/vcpkg/ports/zeroc-ice/change_to_mt.ps1 create mode 100644 external_imported/vcpkg/ports/zeroc-ice/mcppd_fix.patch create mode 100644 external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch create mode 100644 external_imported/vcpkg/ports/zeroc-ice/portfile.cmake create mode 100644 external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake create mode 100644 external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch create mode 100644 external_imported/vcpkg/ports/zeroc-ice/vcpkg.json create mode 100644 external_imported/vcpkg/ports/zlib/CVE-2022-37434.patch delete mode 100644 external_imported/vcpkg/ports/zlib/LICENSE rename external_imported/vcpkg/ports/zlib/{add_debug_postfix_on_mingw.patch => debug-postfix-mingw.patch} (100%) create mode 100644 external_imported/vcpkg/ports/zziplib/export-targets.patch create mode 100755 external_imported/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh create mode 100644 external_imported/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd create mode 100644 external_imported/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 create mode 100644 external_imported/vcpkg/scripts/boost/post-source-stubs/wave.cmake mode change 100644 => 100755 external_imported/vcpkg/scripts/buildsystems/make_wrapper/windres-rc mode change 100755 => 100644 external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake create mode 100644 external_imported/vcpkg/scripts/cmake/vcpkg_install_copyright.cmake create mode 100644 external_imported/vcpkg/scripts/cmake/z_vcpkg_fixup_rpath.cmake create mode 100644 external_imported/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake create mode 100644 external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch create mode 100644 external_imported/vcpkg/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch create mode 100644 external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake create mode 100644 external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json create mode 100644 external_imported/vcpkg/scripts/toolchains/uwp.cmake create mode 100644 external_imported/vcpkg/triplets/community/x64-linux-dynamic.cmake create mode 100644 external_imported/vcpkg/versions/a-/ableton.json create mode 100644 external_imported/vcpkg/versions/a-/air-ctl.json create mode 100644 external_imported/vcpkg/versions/a-/alpaca.json create mode 100644 external_imported/vcpkg/versions/a-/alpaka.json create mode 100644 external_imported/vcpkg/versions/a-/argon2.json create mode 100644 external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json create mode 100644 external_imported/vcpkg/versions/b-/blake3.json create mode 100644 external_imported/vcpkg/versions/b-/buck-yeh-bux-sqlite.json create mode 100644 external_imported/vcpkg/versions/c-/c9y.json create mode 100644 external_imported/vcpkg/versions/c-/clipboardxx.json create mode 100644 external_imported/vcpkg/versions/c-/cmakerc.json create mode 100644 external_imported/vcpkg/versions/c-/configcat.json create mode 100644 external_imported/vcpkg/versions/c-/convectionkernels.json create mode 100644 external_imported/vcpkg/versions/c-/cubeb.json create mode 100644 external_imported/vcpkg/versions/d-/dbus.json create mode 100644 external_imported/vcpkg/versions/d-/directx-dxc.json create mode 100644 external_imported/vcpkg/versions/d-/dpp.json create mode 100644 external_imported/vcpkg/versions/d-/dv-processing.json create mode 100644 external_imported/vcpkg/versions/e-/edflib.json create mode 100644 external_imported/vcpkg/versions/e-/ereignis.json create mode 100644 external_imported/vcpkg/versions/e-/ezfoundation.json create mode 100644 external_imported/vcpkg/versions/f-/fawdlstty-libfv.json create mode 100644 external_imported/vcpkg/versions/f-/flat.json create mode 100644 external_imported/vcpkg/versions/f-/flecs.json create mode 100644 external_imported/vcpkg/versions/f-/font-util.json create mode 100644 external_imported/vcpkg/versions/g-/gklib.json create mode 100644 external_imported/vcpkg/versions/g-/gpgmm.json create mode 100644 external_imported/vcpkg/versions/g-/guile.json create mode 100644 external_imported/vcpkg/versions/g-/gul14.json create mode 100644 external_imported/vcpkg/versions/h-/hareflow.json create mode 100644 external_imported/vcpkg/versions/h-/hash-library.json create mode 100644 external_imported/vcpkg/versions/l-/libcaer.json create mode 100644 external_imported/vcpkg/versions/l-/libfontenc.json create mode 100644 external_imported/vcpkg/versions/l-/libfs.json create mode 100644 external_imported/vcpkg/versions/l-/libice.json create mode 100644 external_imported/vcpkg/versions/l-/liblsquic.json create mode 100644 external_imported/vcpkg/versions/l-/libmicrodns.json create mode 100644 external_imported/vcpkg/versions/l-/libsm.json create mode 100644 external_imported/vcpkg/versions/l-/libx11.json create mode 100644 external_imported/vcpkg/versions/l-/libxau.json create mode 100644 external_imported/vcpkg/versions/l-/libxdamage.json create mode 100644 external_imported/vcpkg/versions/l-/libxdmcp.json create mode 100644 external_imported/vcpkg/versions/l-/libxext.json create mode 100644 external_imported/vcpkg/versions/l-/libxfixes.json create mode 100644 external_imported/vcpkg/versions/l-/libxi.json create mode 100644 external_imported/vcpkg/versions/l-/libxkbcommon.json create mode 100644 external_imported/vcpkg/versions/l-/libxkbfile.json create mode 100644 external_imported/vcpkg/versions/l-/libxpm.json create mode 100644 external_imported/vcpkg/versions/l-/libxrandr.json create mode 100644 external_imported/vcpkg/versions/l-/libxrender.json create mode 100644 external_imported/vcpkg/versions/l-/libxres.json create mode 100644 external_imported/vcpkg/versions/l-/linmath.json create mode 100644 external_imported/vcpkg/versions/l-/lockpp.json create mode 100644 external_imported/vcpkg/versions/m-/matchit.json create mode 100644 external_imported/vcpkg/versions/m-/materialx.json create mode 100644 external_imported/vcpkg/versions/m-/mchehab-zbar.json create mode 100644 external_imported/vcpkg/versions/m-/mysql-connector-cpp.json create mode 100644 external_imported/vcpkg/versions/n-/nanosvg.json create mode 100644 external_imported/vcpkg/versions/n-/ncnn.json create mode 100644 external_imported/vcpkg/versions/n-/nghttp3.json create mode 100644 external_imported/vcpkg/versions/o-/openctm.json create mode 100644 external_imported/vcpkg/versions/o-/openfbx.json create mode 100644 external_imported/vcpkg/versions/o-/openldap.json create mode 100644 external_imported/vcpkg/versions/p-/pipewire.json create mode 100644 external_imported/vcpkg/versions/p-/proxy.json create mode 100644 external_imported/vcpkg/versions/p-/pthread-stubs.json create mode 100644 external_imported/vcpkg/versions/r-/random123.json create mode 100644 external_imported/vcpkg/versions/r-/rioki-glow.json create mode 100644 external_imported/vcpkg/versions/r-/rsig.json create mode 100644 external_imported/vcpkg/versions/r-/rubberband.json create mode 100644 external_imported/vcpkg/versions/s-/saucer.json create mode 100644 external_imported/vcpkg/versions/s-/septag-dmon.json create mode 100644 external_imported/vcpkg/versions/s-/shiftmedia-libgcrypt.json create mode 100644 external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json mode change 100644 => 100755 external_imported/vcpkg/versions/s-/spdlog.json create mode 100644 external_imported/vcpkg/versions/s-/stduuid.json create mode 100644 external_imported/vcpkg/versions/s-/stftpitchshift.json create mode 100644 external_imported/vcpkg/versions/s-/stronk.json create mode 100644 external_imported/vcpkg/versions/t-/tree-sitter.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-gn.json create mode 100644 external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json create mode 100644 external_imported/vcpkg/versions/v-/vkfft.json create mode 100644 external_imported/vcpkg/versions/w-/wayland-protocols.json create mode 100644 external_imported/vcpkg/versions/w-/wayland.json create mode 100644 external_imported/vcpkg/versions/w-/webview2.json create mode 100644 external_imported/vcpkg/versions/w-/wolfmqtt.json create mode 100644 external_imported/vcpkg/versions/w-/wolfssl.json create mode 100644 external_imported/vcpkg/versions/w-/wolftpm.json create mode 100644 external_imported/vcpkg/versions/w-/wxcharts.json create mode 100644 external_imported/vcpkg/versions/x-/xcb-proto.json create mode 100644 external_imported/vcpkg/versions/x-/xcb-render-util.json create mode 100644 external_imported/vcpkg/versions/x-/xcb-util-m4.json create mode 100644 external_imported/vcpkg/versions/x-/xcb.json create mode 100644 external_imported/vcpkg/versions/x-/xorg-macros.json create mode 100644 external_imported/vcpkg/versions/x-/xproto.json create mode 100644 external_imported/vcpkg/versions/x-/xtrans.json create mode 100644 external_imported/vcpkg/versions/z-/z4kn4fein-semver.json create mode 100644 external_imported/vcpkg/versions/z-/zeroc-ice.json diff --git a/external_imported/sentry-native/external/crashpad/infra/config/main.star b/external_imported/sentry-native/external/crashpad/infra/config/main.star old mode 100644 new mode 100755 diff --git a/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py b/external_imported/sentry-native/external/crashpad/third_party/mini_chromium/mini_chromium/build/ios/sdk_info.py old mode 100644 new mode 100755 diff --git a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md index 765f870c1..5f0199cab 100644 --- a/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md +++ b/external_imported/vcpkg/.github/ISSUE_TEMPLATE/report-package-build-failure.md @@ -2,22 +2,32 @@ name: Report package build failure about: Let us know about build failures in ports. title: "[] build failure" -labels: port bug +labels: category:port-bug assignees: '' --- + + + **Host Environment** + - OS: [e.g. Windows/Linux etc...] - Compiler: revision **To Reproduce** + Steps to reproduce the behavior: + `./vcpkg install xxxx` **Failure logs** --Cut and paste the appropriate build messages from the console output. --Please attach any additional failure logs mentioned in the console output. + +- Cut and paste the appropriate build messages from the console output. +- Attach ***every failure log file*** mentioned in the console output. + + **Additional context** + Add any other context about the problem here, such as what you have already tried to resolve the issue. diff --git a/external_imported/vcpkg/.github/workflows/trustedPR.yml b/external_imported/vcpkg/.github/workflows/trustedPR.yml index c2d860493..aa9cb6cd1 100644 --- a/external_imported/vcpkg/.github/workflows/trustedPR.yml +++ b/external_imported/vcpkg/.github/workflows/trustedPR.yml @@ -8,9 +8,14 @@ on: types: - completed +permissions: + contents: read + jobs: comment: - runs-on: ubuntu-latest + permissions: + pull-requests: write + runs-on: ubuntu-22.04 if: > ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} diff --git a/external_imported/vcpkg/.github/workflows/untrustedPR.yml b/external_imported/vcpkg/.github/workflows/untrustedPR.yml index dc47a1964..4784bc485 100644 --- a/external_imported/vcpkg/.github/workflows/untrustedPR.yml +++ b/external_imported/vcpkg/.github/workflows/untrustedPR.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -17,15 +17,7 @@ jobs: # fetch-depth 50 tries to ensure we capture the whole history of the branch fetch-depth: 50 - - uses: actions/cache@v2 - id: cache - with: - path: | - ./vcpkg - key: ${{ runner.os }}-${{ hashFiles('scripts/bootstrap*') }} - - name: bootstrap - if: steps.cache.outputs.cache-hit != 'true' run: ./bootstrap-vcpkg.sh - name: Save PR number @@ -38,8 +30,14 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com + git --version + + export VCPKG_ROOT=. + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake - git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files + cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license + cat .github-pr.changed-manifest-files | while read filename; do match=$(grep -oiP '"license": ".*\K(AGPL-1\.0|AGPL-3\.0|BSD-2-Clause-FreeBSD|BSD-2-Clause-NetBSD|bzip2-1\.0\.5|eCos-2\.0|GFDL-1\.1|GFDL-1\.2|GFDL-1\.3|GPL-1\.0|GPL-1\.0\+|GPL-2\.0|GPL-2\.0\+|GPL-2\.0-with-autoconf-exception|GPL-2\.0-with-bison-exception|GPL-2\.0-with-classpath-exception|GPL-2\.0-with-font-exception|GPL-2\.0-with-GCC-exception|GPL-3\.0|GPL-3\.0\+|GPL-3\.0-with-autoconf-exception|GPL-3\.0-with-GCC-exception|LGPL-2\.0|LGPL-2\.0\+|LGPL-2\.1|LGPL-2\.1\+|LGPL-3\.0|LGPL-3\.0\+|Nunit|StandardML-NJ|wxWindows)(?=[ "])' "$filename" || true); if [ ! -z "$match" ]; then echo " - \`$filename\` (has deprecated license \`$match\`)" ; fi ; done > .github-pr.deprecated-license ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u @@ -63,6 +61,7 @@ jobs: const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim() const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim() + const deprecated_license = (await fs.readFile('.github-pr.deprecated-license', 'utf8')).trim() let approve = true; var output = '' @@ -112,13 +111,19 @@ jobs: output += `The following files are affected:\n${cmake}\n` output += "\n\n" } - if (missing_license !== "") { - output += 'You have modified or added at least one vcpkg.json where a "license" field is missing.\n' + if (missing_license !== "" || deprecated_license !== "") { + output += 'You have modified or added at least one vcpkg.json where you should check the `license` field.\n' output += "
\n\n" - - output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n' - output += missing_license - output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n" + if (missing_license !== "") { + output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n' + output += missing_license + output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n\n" + } + if (deprecated_license !== "") { + output += 'If you feel able to do so, please consider replacing the deprecated license identifiers in the following files:\n' + output += deprecated_license + output += "\n\nDeprecated and non deprecated license identifiers can be found [here](https://spdx.github.io/spdx-spec/SPDX-license-list/#a3-deprecated-licenses)\n" + } output += "
\n\n" } diff --git a/external_imported/vcpkg/.github/workflows/validateDocs.yml b/external_imported/vcpkg/.github/workflows/validateDocs.yml new file mode 100644 index 000000000..3a8565480 --- /dev/null +++ b/external_imported/vcpkg/.github/workflows/validateDocs.yml @@ -0,0 +1,54 @@ +name: Doc Validation + +on: + pull_request: + paths: + - 'docs/**' + +jobs: + validate: + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: vcpkg + + - name: Checkout Website + uses: actions/checkout@v3 + with: + repository: vcpkg/vcpkg.github.io + ref: '8ee5cacc91b6e017b5e4236940d9f385c1563598' + path: vcpkg.github.io + + - uses: actions/cache@v3 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - run: npm ci + working-directory: vcpkg.github.io + + - name: Purge existing html files + run: rm -rf en + working-directory: vcpkg.github.io + + # The current navbar embeds a link to integration.md which no longer exists + - name: Ignore navbar + run: echo "" > templates/navbar.html + working-directory: vcpkg.github.io + + - name: Generate Core Pages + run: node scripts/generatePages.js + working-directory: vcpkg.github.io + + - name: Generate Docs Pages + run: node scripts/generateDocs.js ../vcpkg/docs + working-directory: vcpkg.github.io + + - name: Check Links + run: VCPKG_VALIDATE_LINKS_ONLY_DOCS=1 node scripts/validateLinks.js + working-directory: vcpkg.github.io diff --git a/external_imported/vcpkg/README.md b/external_imported/vcpkg/README.md index d4d1bb195..b29fe52d2 100644 --- a/external_imported/vcpkg/README.md +++ b/external_imported/vcpkg/README.md @@ -14,7 +14,7 @@ check out our [Getting Started](#getting-started) section for how to start using For short description of available commands, once you've installed vcpkg, you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. -* Github: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) +* GitHub: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel * Discord: [\#include \](https://www.includecpp.org), the #🌏vcpkg channel * Docs: [Documentation](docs/README.md) @@ -120,7 +120,7 @@ In order to use vcpkg with CMake outside of an IDE, you can use the toolchain file: ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` @@ -163,7 +163,7 @@ $ ./vcpkg/vcpkg search [search term] In order to use vcpkg with CMake, you can use the toolchain file: ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` @@ -212,8 +212,6 @@ You'll then be able to bootstrap vcpkg along with the [quick start guide](#quick ## Using vcpkg with CMake -If you're using vcpkg with CMake, the following may help! - ### Visual Studio Code with CMake Tools Adding the following to your workspace `settings.json` will make @@ -247,7 +245,7 @@ Finally, in `CMake options`, add the following line: -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake ``` -Unfortunately, you'll have to add this to each profile. +You must add this line to each profile. ### Vcpkg as a Submodule @@ -256,7 +254,7 @@ you can add the following to your CMakeLists.txt before the first `project()` ca instead of passing `CMAKE_TOOLCHAIN_FILE` to the cmake invocation. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` @@ -265,7 +263,7 @@ by passing the `CMAKE_TOOLCHAIN_FILE` directly, but it will make the configure-build step slightly easier. [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/external_imported/vcpkg/README_es.md b/external_imported/vcpkg/README_es.md index 0ffcb3a49..dad810127 100644 --- a/external_imported/vcpkg/README_es.md +++ b/external_imported/vcpkg/README_es.md @@ -111,7 +111,7 @@ Para utilizar Vcpkg con CMake sin un IDE, puede utilizar el archivo de herramientas incluido: ```cmd -> cmake -B [directorio de compilación] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [directorio de compilación] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [directorio de compilación] ``` @@ -168,7 +168,7 @@ $ ./vcpkg/vcpkg search [término de búsqueda] Para usar vcpkg con CMake, tiene que usar el siguiente archivo toolchain: ```sh -$ cmake -B [directorio de compilación] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [directorio de compilación] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [directorio de compilación] ``` @@ -261,7 +261,7 @@ puede agregar lo siguiente as su CMakeLists,txt antes de la primera llamada a `p en vez de pasar `CMAKE_TOOLCHAIN_FILE` a la invocación de CMake. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` @@ -319,7 +319,7 @@ puede usar un simple `vcpkg install --feature-flags=manifests` Para más información, revise la especificación de [manifiesto][getting-started:manifest-spec] [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux diff --git a/external_imported/vcpkg/README_fr.md b/external_imported/vcpkg/README_fr.md index f39c09b03..12052515d 100644 --- a/external_imported/vcpkg/README_fr.md +++ b/external_imported/vcpkg/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez jamais utilisé vcpkg, ou si vous essayez d'utiliser vcpkg, lisez Pour une description des commandes disponibles, quand vous avez installé vcpkg, vous pouvez lancer `vcpkg help` ou `vcpkg help [commande]` pour de l'aide spécifique à une commande. -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel * Discord: [\#include \](https://www.includecpp.org), le canal #🌏vcpkg * Docs: [Documentation](docs/README.md) @@ -92,7 +92,7 @@ Si vous utilisez CMake avec Visual Studio continuez [ici](#vcpkg-avec-cmake-et-v Afin d'utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : ```cmd -> cmake -B [dossier de build] -S . -DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [dossier de build] ``` @@ -138,7 +138,7 @@ $ ./vcpkg/vcpkg search [terme de recherche] Pour utiliser vcpkg en dehors d'un IDE, vous pouvez utiliser le fichier de toolchain : ```cmd -> cmake -B [dossier de build] -S . -DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [dossier de build] -S . "-DCMAKE_TOOLCHAIN_FILE=[chemin vers vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [dossier de build] ``` @@ -238,14 +238,14 @@ Malheureusement, vous devrez le refaire pour chaque projet. Quand vous utilisez vcpkg comme un sous-module de votre projet, vous pouvez l'ajouter à votre CMakeLists.txt avant le premier appel de `project()`, au lieu d'utiliser `CMAKE_TOOLCHAIN_FILE` dans les paramètres d'appel de cmake. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directement le CMAKE_TOOLCHAIN_FILE, mais cela rendra l'étape de configuration-construction légèrement plus facile. [getting-started:utiliser-un-paquet]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/external_imported/vcpkg/README_ko_KR.md b/external_imported/vcpkg/README_ko_KR.md index a7a71fa1e..caea90f96 100644 --- a/external_imported/vcpkg/README_ko_KR.md +++ b/external_imported/vcpkg/README_ko_KR.md @@ -14,7 +14,7 @@ Vcpkg는 Windows, Linux 및 MacOS에서 C 및 C++ 라이브러리를 관리하 Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 명령어에 대한 간단한 설명을 볼 수 있습니다. `vcpkg help [command]` 명령어로는 각 명령어별 도움말을 볼 수 있습니다. -* Github: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다. +* GitHub: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다. * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg 채널 * Discord: [\#include \](https://www.includecpp.org), #🌏vcpkg 채널 * 도움말: [Documentation](docs/README.md) @@ -119,8 +119,7 @@ IDE 외부에서 CMake와 함께 vcpkg를 사용하려면, 다음과 같이 툴체인 파일을 사용할 수 있습니다. ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCH -AIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` @@ -163,7 +162,7 @@ $ ./vcpkg/vcpkg search [search term] CMake와 함께 vcpkg를 사용하려면 툴체인 파일을 이용해 보세요. ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` @@ -254,7 +253,7 @@ cmake 실행 시 `CMAKE_TOOLCHAIN_FILE`을 전달하는 대신, 첫 번째 `project()` 호출 전에 CMakeLists.txt에 다음을 추가하는 방법도 있습니다. ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` @@ -263,7 +262,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/ vcpkg를 사용하지 않을 수 있습니다. [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools diff --git a/external_imported/vcpkg/README_zh_CN.md b/external_imported/vcpkg/README_zh_CN.md index 5c4ddc578..e5b4dca3a 100644 --- a/external_imported/vcpkg/README_zh_CN.md +++ b/external_imported/vcpkg/README_zh_CN.md @@ -5,11 +5,11 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 这个工具和生态链正在不断发展，我们一直期待您的贡献！ -若您从未使用过vcpkg，或者您正在尝试了解如何使用vcpkg，请查阅 [入门](#入门) 章节。 +若您从未使用过 vcpkg，或者您正在尝试了解如何使用 vcpkg，请查阅 [入门](#入门) 章节。 -如需获取有关可用命令的简短描述，请在编译vcpkg后执行 `vcpkg help` 或执行 `vcpkg help [command]` 来获取具体的帮助信息。 +如需获取有关可用命令的简短描述，请在编译 vcpkg 后执行 `vcpkg help` 或执行 `vcpkg help [command]` 来获取具体的帮助信息。 -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频道 * Discord: [\#include \](https://www.includecpp.org)， #🌏vcpkg 频道 * 文档: [Documentation](docs/README.md) @@ -39,19 +39,19 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 # 入门 首先，请阅读以下任一快速入门指南： -[Windows](#快速开始-windows) 或 [macOS和Linux](#快速开始-unix)， +[Windows](#快速开始-windows) 或 [macOS 和 Linux](#快速开始-unix)， 这取决于您使用的是什么平台。 有关更多信息，请参见 [安装和使用软件包][getting-started:using-a-package]。 -如果vcpkg目录中没有您需要的库， -您可以 [在GitHub上打开问题][contributing:submit-issue]。 -vcpkg团队和贡献者可以看到它的地方， -并可能将这个库添加到vcpkg。 +如果 vcpkg 目录中没有您需要的库， +您可以 [在 GitHub 上打开问题][contributing:submit-issue]。 +vcpkg 团队和贡献者可以看到它的地方， +并可能将这个库添加到 vcpkg。 -安装并运行vcpkg后， -您可能希望将 [TAB补全](#tab补全自动补全) 添加到您的Shell中。 +安装并运行 vcpkg 后， +您可能希望将 [TAB 补全](#tab补全自动补全) 添加到您的 Shell 中。 -最后，如果您对vcpkg的未来感兴趣，请查看 [清单][getting-started:manifest-spec]！ +最后，如果您对 vcpkg 的未来感兴趣，请查看 [清单][getting-started:manifest-spec]！ 这是一项实验性功能，可能会出现错误。 因此，请尝试一下并[打开所有问题][contributing:submit-issue]! @@ -62,8 +62,8 @@ vcpkg团队和贡献者可以看到它的地方， - [Git][getting-started:git] - [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（**包含英文语言包**） -首先，**请使用git clone vcpkg** 并执行 bootstrap.bat 脚本。 -您可以将vcpkg安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 +首先，**请使用 `git clone vcpkg`** 并执行 bootstrap.bat 脚本。 +您可以将 vcpkg 安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 我们建议您使用例如 `C:\src\vcpkg` 或 `C:\dev\vcpkg` 的安装目录，否则您可能遇到某些库构建系统的路径问题。 ```cmd @@ -77,7 +77,7 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg install [packages to install] ``` -请注意: vcpkg在Windows中默认编译并安装x86版本的库。 若要编译并安装x64版本，请执行: +请注意: vcpkg 在 Windows 中默认编译并安装 x86 版本的库。 若要编译并安装 x64 版本，请执行: ```cmd > .\vcpkg\vcpkg install [package name]:x64-windows @@ -89,34 +89,34 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows ``` -您也可以使用 `search` 子命令来查找vcpkg中集成的库: +您也可以使用 `search` 子命令来查找 vcpkg 中集成的库: ```cmd > .\vcpkg\vcpkg search [search term] ``` -若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (可能需要管理员权限) +若您希望在 Visual Studio 中使用 vcpkg，请运行以下命令 (可能需要管理员权限) ```cmd > .\vcpkg\vcpkg integrate install ``` -在此之后，您可以创建一个非cmake项目 (或打开已有的项目)。 +在此之后，您可以创建一个非 CMake 项目 (或打开已有的项目)。 在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件且无需额外配置。 -若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 +若您在 Visual Studio 中使用 CMake 工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 -为了在IDE以外在cmake中使用vcpkg，您需要使用以下工具链文件: +为了在 IDE 以外在 CMake 中使用 vcpkg，您需要使用以下工具链文件: ```cmd -> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +> cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 -请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息，其中包含了在IDE中使用cmake的内容。 +在 CMake 中，您仍需通过 `find_package` 来使用 vcpkg 中已安装的库。 +请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息，其中包含了在 IDE 中使用 CMake 的内容。 -对于其他工具 (包括Visual Studio Code)，请查阅 [集成指南][getting-started:integration]。 +对于其他工具 (包括 Visual Studio Code)，请查阅 [集成指南][getting-started:integration]。 ## 快速开始: Unix @@ -124,11 +124,11 @@ Linux平台前置条件: - [Git][getting-started:git] - [g++][getting-started:linux-gcc] >= 6 -macOS平台前置条件: +macOS 平台前置条件: - [Apple Developer Tools][getting-started:macos-dev-tools] -首先，**请使用git clone vcpkg** 并执行 bootstrap.sh 脚本。 -我们建议您将vcpkg作为cmake项目的子模块使用。 +首先，**请使用 `git clone vcpkg`** 并执行 bootstrap.sh 脚本。 +我们建议您将 vcpkg 作为 CMake 项目的子模块使用。 ```sh $ git clone https://github.com/microsoft/vcpkg @@ -141,31 +141,31 @@ $ ./vcpkg/bootstrap-vcpkg.sh $ ./vcpkg/vcpkg install [packages to install] ``` -您也可以使用 `search` 子命令来查找vcpkg中已集成的库: +您也可以使用 `search` 子命令来查找 vcpkg 中已集成的库: ```sh $ ./vcpkg/vcpkg search [search term] ``` -为了在cmake中使用vcpkg，您需要使用以下工具链文件: +为了在 CMake 中使用 vcpkg，您需要使用以下工具链文件: ```sh -$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake +$ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 -为了您更好的在cmake或 VSCode CMake Tools 中使用vcpkg， +在 CMake 中，您仍需通过 `find_package` 来使用 vcpkg 中已安装的库。 +为了您更好的在 CMake 或 VSCode CMake Tools 中使用 vcpkg， 请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息， -其中包含了在IDE中使用cmake的内容。 +其中包含了在 IDE 中使用 CMake 的内容。 对于其他工具，请查阅 [集成指南][getting-started:integration]。 ## 安装 Linux Developer Tools -在Linux的不同发行版中，您需要安装不同的工具包: +在 Linux 的不同发行版中，您需要安装不同的工具包: -- Debian，Ubuntu，popOS或其他基于 Debian 的发行版: +- Debian，Ubuntu，popOS 或其他基于 Debian 的发行版: ```sh $ sudo apt-get update @@ -192,15 +192,15 @@ $ xcode-select --install ``` 然后按照出现的窗口中的提示进行操作。 -此时，您就可以使用 bootstrap.sh 编译vcpkg了。 请参阅 [快速开始](#快速开始-unix) +此时，您就可以使用 bootstrap.sh 编译 vcpkg 了。 请参阅 [快速开始](#快速开始-unix) ## 在 CMake 中使用 vcpkg -若您希望在CMake中使用vcpkg，以下内容可能帮助您： +若您希望在 CMake 中使用vcpkg，以下内容可能帮助您： ### Visual Studio Code 中的 CMake Tools -将以下内容添加到您的工作区的 `settings.json` 中将使CMake Tools自动使用vcpkg中的第三方库: +将以下内容添加到您的工作区的 `settings.json` 中将使 CMake Tools 自动使用 vcpkg 中的第三方库: ```json { @@ -212,7 +212,7 @@ $ xcode-select --install ### Visual Studio CMake 工程中使用 vcpkg -打开CMake设置选项，将 vcpkg toolchain 文件路径在 `CMake toolchain file` 中： +打开 CMake 设置选项，将 vcpkg toolchain 文件路径在 `CMake toolchain file` 中： ``` [vcpkg root]/scripts/buildsystems/vcpkg.cmake @@ -233,19 +233,19 @@ $ xcode-select --install ### 将 vcpkg 作为一个子模块 -当您希望将vcpkg作为一个子模块加入到您的工程中时， +当您希望将 vcpkg 作为一个子模块加入到您的工程中时， 您可以在第一个 `project()` 调用之前将以下内容添加到 CMakeLists.txt 中， -而无需将 `CMAKE_TOOLCHAIN_FILE` 传递给cmake调用。 +而无需将 `CMAKE_TOOLCHAIN_FILE` 传递给 CMake 调用。 ```cmake -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file") ``` -使用此种方式可无需设置 `CMAKE_TOOLCHAIN_FILE` 即可使用vcpkg，且更容易完成配置工作。 +使用此种方式可无需设置 `CMAKE_TOOLCHAIN_FILE` 即可使用 vcpkg，且更容易完成配置工作。 [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md -[getting-started:integration]: docs/users/integration.md +[getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools [getting-started:linux-gcc]: #installing-linux-developer-tools @@ -255,10 +255,10 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/ [getting-started:visual-studio]: https://visualstudio.microsoft.com/ [getting-started:manifest-spec]: docs/specifications/manifests.md -# Tab补全/自动补全 +# Tab 补全/自动补全 `vcpkg` 支持命令，包名称，以及 Powershell 和 Bash 中的选项。 -若您需要在指定的 shell 中启用Tab补全功能，请依据您使用的shell运行： +若您需要在指定的 shell 中启用 Tab 补全功能，请依据您使用的 shell 运行： ```pwsh > .\vcpkg integrate powershell @@ -277,25 +277,25 @@ $ ./vcpkg integrate bash # 或 zsh 请查看 [文档](docs/README.md) 获取具体示例， 其包含 [安装并使用包](docs/examples/installing-and-using-packages.md)， [使用压缩文件添加包](docs/examples/packaging-zipfiles.md) -和 [从GitHub源中添加一个包](docs/examples/packaging-github-repos.md)。 +和 [从 GitHub 源中添加一个包](docs/examples/packaging-github-repos.md)。 我们的文档现在也可以从 [vcpkg.io](https://vcpkg.io/) 在线获取。 -我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 打开issue. +我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 创建 issue. -观看4分钟 [demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 +观看 4 分钟 [demo 视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 ## 贡献 Vcpkg是一个开源项目，并通过您的贡献不断发展。 下面是一些您可以贡献的方式: -* [提交一个关于vcpkg或已支持包的新issue][contributing:submit-issue] -* [提交修复PR和创建新包][contributing:submit-pr] +* [提交一个关于 vcpkg 或已支持包的新 issue][contributing:submit-issue] +* [提交修复 PR 和创建新包][contributing:submit-pr] 请参阅我们的 [贡献准则](CONTRIBUTING_zh.md) 了解更多详细信息。 -该项目采用了 [Microsoft开源行为准则][contributing:coc]。 -获取更多信息请查看 [行为准则FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 +该项目采用了 [Microsoft 开源行为准则][contributing:coc]。 +获取更多信息请查看 [行为准则 FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 [contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose [contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls @@ -308,8 +308,8 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 # 数据收集 -vcpkg会收集使用情况数据，以帮助我们改善您的体验。 -Microsoft收集的数据是匿名的。 +vcpkg 会收集使用情况数据，以帮助我们改善您的体验。 +Microsoft 收集的数据是匿名的。 您也可以通过以下步骤禁用数据收集： - 将选项 `-disableMetrics` 传递给 bootstrap-vcpkg 脚本并重新运行此脚本 - 向 vcpkg 命令传递选项 `--disable-metrics` diff --git a/external_imported/vcpkg/SECURITY.md b/external_imported/vcpkg/SECURITY.md new file mode 100644 index 000000000..869fdfe2b --- /dev/null +++ b/external_imported/vcpkg/SECURITY.md @@ -0,0 +1,41 @@ + + +## Security + +Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/). + +If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below. + +## Reporting Security Issues + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report). + +If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey). + +You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). + +Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue: + + * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.) + * Full paths of source file(s) related to the manifestation of the issue + * The location of the affected source code (tag/branch/commit or direct URL) + * Any special configuration required to reproduce the issue + * Step-by-step instructions to reproduce the issue + * Proof-of-concept or exploit code (if possible) + * Impact of the issue, including how an attacker might exploit the issue + +This information will help us triage your report more quickly. + +If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. + +## Preferred Languages + +We prefer all communications to be in English. + +## Policy + +Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd). + + diff --git a/external_imported/vcpkg/docs/README.md b/external_imported/vcpkg/docs/README.md index 6b770e189..5eec48b7c 100644 --- a/external_imported/vcpkg/docs/README.md +++ b/external_imported/vcpkg/docs/README.md @@ -11,10 +11,22 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Packaging GitHub Repositories Example: libogg](examples/packaging-github-repos.md) - [Patching Example: Patching libpng to work for x64-uwp](examples/patching.md) - [Getting Started with Versioning](examples/versioning.getting-started.md) +- [Manifest Mode: CMake Example](examples/manifest-mode-cmake.md) +- [Pin old Boost Versions](examples/modify-baseline-to-pin-old-boost.md) +- [Using Overlay Triplets](examples/overlay-triplets-linux-dynamic.md) + +### Command Line Reference + +- [Common Options](commands/common-options.md) +- Commands + - [vcpkg install](commands/install.md) + - [vcpkg integrate](commands/integrate.md) + - [vcpkg remove](commands/remove.md) + - [vcpkg search](commands/search.md) ### User Help -- [Buildsystem Integration](users/integration.md) +- [Buildsystem Integration](users/buildsystems/integration.md) - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) - [Authentication](users/authentication.md) @@ -50,11 +62,6 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [vcpkgx](https://vcpkgx.com/) - Package index + search - [vcpkg index](https://vcpkg.dev/) - Package index + search -### Specifications - -- [Export](specifications/export-command.md) -- [Feature Packages](specifications/feature-packages.md) - ### Blog posts - [Vcpkg Host Dependencies for Cross-Compilation](https://devblogs.microsoft.com/cppblog/vcpkg-host-dependencies/) diff --git a/external_imported/vcpkg/docs/about/faq.md b/external_imported/vcpkg/docs/about/faq.md index e5dcd4c4c..0e9b8ddef 100644 --- a/external_imported/vcpkg/docs/about/faq.md +++ b/external_imported/vcpkg/docs/about/faq.md @@ -5,8 +5,10 @@ Yes! Start out by reading our [contribution guidelines](https://github.com/Micro If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3Acategory%3Anew-port). -## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? -Yes! See [the `export` command](../users/integration.md#export-command). +## Can vcpkg create pre-built binary packages? What is the binary format used by vcpkg? +Yes! See the [`export` command](../users/buildsystems/export-command.md) if you wish to produce binaries for exporting into other environments. + +Alternatively, if your goal is to preserve binaries produced by `vcpkg install` operations for later re-use, see the [Binary Caching feature](../users/binarycaching.md) ## How do I update libraries? The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. @@ -19,31 +21,43 @@ We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) ## Can I build a private library with this tool? Yes. Follow [our packaging zlib Example](../examples/packaging-zipfiles.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code. +You can take this further by publishing your private libraries into a registry. See the article on [Creating Registries](../maintainers/registries.md). A registry is a catalog of ports, similar to the one provided with vcpkg that contains open source libraries. + ## Can I use a prebuilt private library with this tool? Yes. The `portfile.cmake` for a library is fundamentally a script that places the headers and binaries into the correct arrangement in the `${CURRENT_PACKAGES_DIR}`, so to pull in prebuilt binaries you can write a portfile which directly downloads and arranges the files. To see an example of this, look at [`ports\opengl\portfile.cmake`](https://github.com/microsoft/vcpkg/blob/master/ports/opengl/portfile.cmake) which simply copies files out of the Windows SDK. -## Which platforms I can target with Vcpkg? -We currently target Windows Desktop (x86 and x64) as well as the Universal Windows Platform (x86, x64, and ARM). See `vcpkg help triplet` for the current list. +## Which platforms can I target with vcpkg? +Our built-in, CI-tested triplets are: +* Windows Desktop (x86, x64, x64-static, arm64) +* Universal Windows Platform (x64, and ARM) +* Mac OS X (x64-static) +* Linux (x64-static) + +However, there is an even larger number of community triplets available with more platforms and architectures, including for iOS, Android, MinGW, WebAssembly, freeBSD, and openBSD. + +You can also define your own triplets depending on your needs. + +See `vcpkg help triplet` for the current list. -## Does Vcpkg run on Linux/OSX? -Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! +## Does vcpkg run on Linux/OS X? +Yes! We continuously test on OS X and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! ## How do I update vcpkg? Execute `git pull` to get the latest sources, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. ## How do I use different versions of a library on one machine? -Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. +Within a single instance of vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in vcpkg correspond to the `X-dev` or `X-devel` packages. -To use different versions of a library for different projects, we recommend making separate instances of Vcpkg and using the [per-project integration mechanisms](../users/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. +To use different versions of a library for different projects, we recommend making separate instances of vcpkg and using the [per-project integration mechanisms](../users/buildsystems/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`. -## How does Vcpkg protect my privacy? +## How does vcpkg protect my privacy? See the [Privacy document](privacy.md) for all information regarding privacy. -## Can I use my own CMake toolchain file with Vcpkg's toolchain file? +## Can I use my own CMake toolchain file with vcpkg's toolchain file? Yes. If you already have a CMake toolchain file, you will need to include our toolchain file at the end of yours. This should be as simple as an `include(\scripts\buildsystems\vcpkg.cmake)` directive. Alternatively, you could copy the contents of our `scripts\buildsystems\vcpkg.cmake` into the end of your existing toolchain file. ## Can I use my own/specific flags for rebuilding libs? @@ -51,11 +65,11 @@ Yes. In the current version, there is not yet a standardized global way to chang By saving the changes to the portfile (and checking them in), you'll get the same results even if you're rebuilding from scratch in the future and forgot what exact settings you used. -## Can I get Vcpkg integration for custom configurations? +## Can I get vcpkg integration for custom configurations? -Yes. While Vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations. +Yes. While vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations. -First of all, Vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly. +First of all, vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly. For other configurations, you only need to override the MSBuild `$(VcpkgConfiguration)` macro in your project file (.vcxproj) to declare the compatibility between your configuration, and the target standard configuration. Unfortunately, due to the sequential nature of MSBuild, you'll need to add those settings much higher in your vcxproj so that it is declared before the Vcpk integration is loaded. It is recommend that the `$(VcpkgConfiguration)` macro is added to the "Globals" PropertyGroup. @@ -82,13 +96,13 @@ A lower level mechanism to achieve the same as the `vcpkg integrate project` NuG You can save some disk space by completely removing the `packages\`, `buildtrees\`, and `downloads\` folders. -## How is CMake used internally by Vcpkg? +## How is CMake used internally by vcpkg? Vcpkg uses CMake internally as a build scripting language. This is because CMake is already an extremely common build system for cross-platform open source libraries and is becoming very popular for C++ projects in general. It is easy to acquire on Windows, does not require system-wide installation, and legible for unfamiliar users. -## Will Vcpkg support downloading compiled binaries from a public or private server? +## Will vcpkg support downloading compiled binaries from a public or private server? We would like to eventually support downloading precompiled binaries, similar to other system package managers. -In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/integration.md#export) command. +In a corporate scenario, we currently recommend building the libraries once and using the [Binary Caching](../users/binarycaching.md) feature to re-use binaries across different machines and for local development vs. CI scenarios. ## What Visual C++ toolsets are supported? We support Visual Studio 2015 Update 3 and above. diff --git a/external_imported/vcpkg/docs/commands/common-options.md b/external_imported/vcpkg/docs/commands/common-options.md new file mode 100644 index 000000000..c58fb984f --- /dev/null +++ b/external_imported/vcpkg/docs/commands/common-options.md @@ -0,0 +1,121 @@ +# Common Command Options + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/common-options.md).** + +Most vcpkg commands accept a group of common options that control cross-cutting aspects of the tool. Not all options affect every command. For example, a command that does not download any files will be unaffected by changing the downloads directory. + + + +## `--x-asset-sources=` + +**Experimental: will change or be removed at any time** + +Specify the cache configuration for [Asset Caching](../users/assetcaching.md). + + + +## `--binarysource=` + +Add a source for [Binary Caching](../users/binarycaching.md). + +This option can be specified multiple times; see the Binary Caching documentation for how multiple binary sources interact. + + + +## `--x-buildtrees-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to store intermediate build files, such as objects or unpacked source code. + +Defaults to `buildtrees/` under the vcpkg root folder. + + + +## `--downloads-root=` + +Specify where downloaded tools and source code archives should be kept. + +Defaults to the `VCPKG_DOWNLOADS` environment variable. If that is unset, defaults to `downloads/` under the vcpkg root folder. + + + +## `--host-triplet=` + +Specify the host [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_HOST_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + + + +## `--x-install-root=` + +**Experimental: will change or be removed at any time** + +Specifies the path to lay out installed packages. + +In Classic Mode, defaults to `installed/` under the vcpkg root folder. + +In [Manifest Mode](../users/manifests.md), defaults to `vcpkg_installed/` under the manifest folder. + + + +### `--x-manifest-root=` + +**Experimental: will change or be removed at any time** + +Specifies the directory containing [`vcpkg.json`](../users/manifests.md). + +Defaults to searching upwards from the current working directory for the nearest `vcpkg.json`. + + + +## `--overlay-ports=` + +Specifies a directory containing [overlay ports](../specifications/ports-overlay.md). + +This option can be specified multiple times; ports will resolve to the first match. + + + +## `--overlay-triplets=` + +Specifies a directory containing [overlay triplets](../examples/overlay-triplets-linux-dynamic.md). + +This option can be specified multiple times; [triplets][] will resolve to the first match. + + + +## `--x-packages-root=` + +**Experimental: will change or be removed at any time** + +Specifies the temporary path to stage intermediate package files before final install. + +Defaults to `packages/` under the vcpkg root folder. + + + +## `--triplet=` + +Specify the target [architecture triplet][triplets]. + +Defaults to the `VCPKG_DEFAULT_TRIPLET` environment variable. If that is unset, deduced based on the host architecture and operating system. + +Note that on Windows operating systems, the architecture is always deduced as x86 for legacy reasons. + + + +## `--vcpkg-root=` + +Specifies the vcpkg root folder. + +Defaults to the directory containing the vcpkg program. The directory must be a valid vcpkg instance, such as a `git clone` of `https://github.com/microsoft/vcpkg`. This option can be used to run a custom-built copy of the tool directly from the build folder. + +## Response Files (`@`) + +The vcpkg command line accepts text files containing newline-separated command line parameters. + +The tool will act as though the items in the file were spliced into the command line in place of the `@` reference. Response files cannot contain additional response files. + +[triplets]: ../users/triplets.md diff --git a/external_imported/vcpkg/docs/commands/install.md b/external_imported/vcpkg/docs/commands/install.md new file mode 100644 index 000000000..f79929edb --- /dev/null +++ b/external_imported/vcpkg/docs/commands/install.md @@ -0,0 +1,193 @@ +# vcpkg install + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/install.md).** + +## Synopsis + +**Classic Mode** +```no-highlight +vcpkg install [options] ... +``` + +**Manifest Mode** +```no-highlight +vcpkg install [options] +``` + +## Description + +Build and install port packages. + +### Classic Mode + +In Classic Mode, this verb adds port packages to the existing set in the [installed directory][] (defaults to `installed/` under the vcpkg root). This can require removing and rebuilding existing packages, which can fail. + + + +**Package Syntax** +``` +portname[feature1,feature2]:triplet +``` + +Package references without a triplet are automatically qualified by the [default target triplet](common-options.md#triplet). Package references that do not explicitly list `core` are considered to imply all default features. + +### Manifest Mode + +In [Manifest Mode][], this verb sets the [installed directory][] to the state specified by the `vcpkg.json` manifest file, adding, removing, or rebuilding packages as needed. + +[installed directory]: common-options.md#install-root + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--allow-unsupported` + +Instead of stopping on an unsupported port, continue with a warning. + +By default, vcpkg refuses to execute an install plan containing a port installation for a triplet outside its [`"supports"`][supports] clause. The [`"supports"`][supports] clause of a package describes the full set of platforms a package is expected to be buildable on. This flag instructs vcpkg to warn that the build is expected to fail instead of stopping. + +### `--clean-after-build` + +Clean buildtrees, packages, and downloads after building each package. + +This option has the same effect as passing [`--clean-buildtrees-after-build`](#clean-buildtrees-after-build), [`--clean-downloads-after-build`](#clean-downloads-after-build), and [`--clean-packages-after-build`](#clean-packages-after-build). + + + +### `--clean-buildtrees-after-build` + +Clean all subdirectories from the buildtrees temporary subfolder after building each package. + +All top-level files in the buildtrees subfolder (e.g. `buildtrees/zlib/config-x64-windows-out.log`) will be kept. All subdirectories will be deleted. + + + +### `--clean-downloads-after-build` + +Clean all unextracted assets from the `downloads/` folder after building each package. + +All top level files in the `downloads/` folder will be deleted. Extracted tools will be kept. + + + +### `--clean-packages-after-build` + +Clean the packages temporary subfolder after building each package. + +The packages subfolder for the built package (for example, `packages/zlib_x64-windows`) will be deleted after installation. + +### `--dry-run` + +Print the install plan, but do not remove or install any packages. + +The install plan lists all packages and features that will be installed, as well as any other packages that need to be removed and rebuilt. + + + +### `--editable` + +**Classic Mode Only** + +Perform editable builds for all directly referenced packages on the command line. + +When vcpkg builds ports, it purges and re-extracts the source code each time to ensure inputs are accurately. This is necessary for [Manifest Mode][] to accurately update what is installed and [Binary Caching][] to ensure cached content is correct. + +Passing the `--editable` flag disables this behavior, preserving edits to the extracted sources in the `buildtrees/` folder. This helps develop patches quickly by avoiding the need to write a file on each change. + +Sources extracted during an editable build do not have a `.clean/` suffix on the directory name and will not be cleared by subsequent non-editable builds. + +### `--enforce-port-checks` + +Fail install if a port has detected problems or attempts to use a deprecated feature. + +By default, vcpkg will run several checks on built packages and emit warnings if any issues are detected. This flag upgrades those warnings to an error. + + + +### `--x-feature=` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Specify an additional [feature](../users/manifests.md#features) from the `vcpkg.json` to install dependencies for. + +By default, only [`"dependencies"`][dependencies] and the dependencies of the [`"default-features"`][default-features] will be installed. + +### `--head` + +**Classic Mode Only** + +Request all packages explicitly referenced on the command line to fetch the latest sources available when building. + +This flag is only intended for temporary testing and is not intended for production or long-term use. This disables [Binary Caching][] for all explicitly referenced packages and their dependents because vcpkg cannot accurately track all inputs. + +### `--keep-going` + +Continue the install plan after the first failure. + +By default, vcpkg will stop at the first package build failure. This flag instructs vcpkg to continue building and installing other parts of the install plan that don't depend upon the failed package. + +### `--x-no-default-features` + +**Experimental and may change or be removed at any time** + +**[Manifest Mode][] Only** + +Don't install the default features from the top-level manifest. + +When using `install` in Manifest Mode, by default all dependencies of the features listed in [`"default-features"`][default-features] will be installed. This flag disables that behavior so only features explicitly enabled by [`--x-feature`](#feature) will be installed. + +### `--no-downloads` + +When building a package, prevent ports from downloading new assets during the build. + +By default, ports will acquire source code and tools on demand from the internet (subject to [Asset Caching][]). This parameter blocks downloads and restricts ports to only the assets that were previously downloaded and cached on the machine. + +### `--only-downloads` + +Attempt to download all assets required for an install plan without performing any builds. + +When passed this option, vcpkg will run each build in the plan until it makes its first non-downloading external process call. Most ports perform all downloads before the first external process call (usually to their buildsystem), so this procedure will download all required assets. Ports that do not follow this procedure will not have their assets predownloaded. + +### `--only-binarycaching` + +Refuse to perform any builds. Only restore packages from [Binary Caches][Binary Caching]. + +This flag blocks vcpkg from performing builds on demand and will fail if a package cannot be found in any binary caches. + +### `--recurse` + +**Classic Mode Only** + +Approve an install plan that requires rebuilding packages. + +In order to modify the set of features of an installed package, vcpkg must remove and rebuild that package. Because this has the potential of failing and leaving the install tree with fewer packages than the user started with, the user must approve plans that rebuild packages by passing this flag. + +### `--x-use-aria2` + +**Experimental and may change or be removed at any time** + +Use aria2 to perform download tasks. + + + +### `--x-write-nuget-packages-config` + +**Experimental and may change or be removed at any time** + +Writes out a NuGet `packages.config`-formatted file for use with [Binary Caching][]. + +This option can be used in conjunction with `--dry-run` to obtain the list of NuGet packages required from [Binary Caching][] without building or installing any packages. This enables the NuGet command line to be invoked separately for advanced scenarios, such as using alternate protocols to acquire the `.nupkg` files. + +### `--no-print-usage` + +Suppress generation of usage text printed at the end of installation. + +[Asset Caching]: ../users/assetcaching.md +[Binary Caching]: ../users/binarycaching.md +[Manifest Mode]: ../users/manifests.md +[supports]: ../users/manifests.md#supports +[default-features]: ../users/manifests.md#default-features +[dependencies]: ../users/manifests.md#dependencies diff --git a/external_imported/vcpkg/docs/commands/integrate.md b/external_imported/vcpkg/docs/commands/integrate.md new file mode 100644 index 000000000..8ea29899b --- /dev/null +++ b/external_imported/vcpkg/docs/commands/integrate.md @@ -0,0 +1,84 @@ +# vcpkg integrate + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/integrate.md).** + +## Synopsis + +**Buildsystem Integration** +```no-highlight +vcpkg integrate [options] install +vcpkg integrate [options] remove +vcpkg integrate [options] project +``` +**Shell Integration** +```no-highlight +vcpkg integrate [options] powershell +vcpkg integrate [options] bash +vcpkg integrate [options] zsh +vcpkg integrate [options] x-fish +``` + +## Description + +Integrate vcpkg with shells and buildsystems. + +### `vcpkg integrate install` + +Integrates with [Visual Studio](../users/buildsystems/msbuild-integration.md#user-wide-integration) (Windows-only), sets the user-wide vcpkg instance, and displays CMake integration help. + +On Windows with Visual Studio 2015, this subcommand will add redirecting logic into the MSBuild installation which will automatically pick up each user's user-wide vcpkg instance. Visual Studio 2017 and newer have this logic in the box. + +To set the user-wide vcpkg instance, vcpkg creates a few short files containing the absolute path to the vcpkg instance inside the user's user-wide configuration location: + +- `%LOCALAPPDATA%\vcpkg` or `%APPDATA%\Local\vcpkg` on Windows +- `$HOME/.vcpkg` or `/var/.vcpkg` on non-Windows + +Displays the full path to the [CMake toolchain file](../users/buildsystems/cmake-integration.md). Running this command is not required to use the toolchain file. + +### `vcpkg integrate remove` + +Removes the user-wide vcpkg instance setting. + +This command deletes the linking files from the user-wide configuration location created by `vcpkg integrate install`. + +### `vcpkg integrate project` + +Creates a linked NuGet package for MSBuild integration. + +See [MSBuild Per-Project Integration](../users/buildsystems/msbuild-integration.md#linked-nuget-package) for more information. + +### `vcpkg integrate powershell` + +**Windows Only** + +Adds vcpkg tab-completion support to the current user's Powershell profile. + +### `vcpkg integrate bash` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's `.bashrc` (`.bash_profile` on MacOS). + +### `vcpkg integrate zsh` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's `.zshrc`. + +### `vcpkg integrate x-fish` + +**Non-Windows Only** + +Adds vcpkg tab-completion support to the current user's fish shell completions directory. + +## Example +```no-highlight +$ vcpkg integrate install +Applied user-wide integration for this vcpkg root. + +CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=/workspaces/vcpkg/scripts/buildsystems/vcpkg.cmake" +``` + +## Options + +All vcpkg commands support a set of [common options](common-options.md). diff --git a/external_imported/vcpkg/docs/commands/remove.md b/external_imported/vcpkg/docs/commands/remove.md new file mode 100644 index 000000000..4e1cb0c1c --- /dev/null +++ b/external_imported/vcpkg/docs/commands/remove.md @@ -0,0 +1,43 @@ +# vcpkg remove + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/remove.md).** + +## Synopsis + +```no-highlight +vcpkg remove [options] ... +``` + +```no-highlight +vcpkg remove --outdated [options] +``` + +## Description + +Remove port packages from Classic Mode. + +`remove` removes listed packages and any packages that require them from the Classic Mode [installed directory](common-options.md#install-root). See the [install command documentation](install.md#package-syntax) for detailed syntax of the `` parameter. + +This command is not currently supported in [Manifest Mode][]. + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--recurse` + +Allow removing packages not specified on the command line. + +By default, vcpkg refuses to execute a removal plan that would remove packages not listed on the command line. + +### `--dry-run` + +Print the packages to be removed, but do not remove them. + +### `--outdated` + +Remove all packages that do not match the available port versions. + +For each installed package, vcpkg will compare the installed version string to the version string of the current recipe. If those versions differ, the package will be selected for removal. If `--outdated` is passed, no packages should be listed on the command line. + +[Manifest Mode]: ../users/manifests.md diff --git a/external_imported/vcpkg/docs/commands/search.md b/external_imported/vcpkg/docs/commands/search.md new file mode 100644 index 000000000..093685fa3 --- /dev/null +++ b/external_imported/vcpkg/docs/commands/search.md @@ -0,0 +1,37 @@ +# vcpkg search + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/search.md).** + +## Synopsis + +```no-highlight +vcpkg search [options] [query] +``` + +## Description + +Searches for available packages by name and description. + +Search performs a case-insensitive search through all available package names and descriptions. The results are displayed in a tabular format. + +## Example +```no-highlight +$ vcpkg search zlib +miniz 2.2.0#1 Single C source file zlib-replacement library +zlib 1.2.12#1 A compression library +zlib-ng 2.0.6 zlib replacement with optimizations for 'next generation' systems +``` + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--x-full-desc` + +**Experimental and may change or be removed at any time** + +Do not truncate long descriptions. + +By default, long descriptions will be truncated to keep the tabular output browsable. + +[Registries]: ../users/registries.md diff --git a/external_imported/vcpkg/docs/commands/update-baseline.md b/external_imported/vcpkg/docs/commands/update-baseline.md new file mode 100644 index 000000000..8a5b36711 --- /dev/null +++ b/external_imported/vcpkg/docs/commands/update-baseline.md @@ -0,0 +1,42 @@ +# vcpkg x-update-baseline + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/update-baseline.md).** + +**This command is experimental and may change or be removed at any time** + +## Synopsis + +```no-highlight +vcpkg x-update-baseline [options] [--add-initial-baseline] [--dry-run] +``` + +## Description + +Update baselines for all configured [registries][]. + +In [Manifest Mode][], this command operates on all [registries][] in the `vcpkg.json` and the [`vcpkg-configuration.json`][vcj]. In Classic Mode, this command operates on the [`vcpkg-configuration.json`][vcj] in the vcpkg instance (`$VCPKG_ROOT`). + +See the [versioning documentation](../users/versioning.md#baselines) for more information about baselines. + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--dry-run` + +Print the planned baseline upgrades, but do not modify the files on disk. + + + +### `--add-initial-baseline` + +**[Manifest Mode][] Only** + +Add a [`"builtin-baseline"`][builtin-baseline] field to the `vcpkg.json` if it does not already have one. + +Without this flag, it is an error to run this command on a manifest that does not have any [registries][] configured. + +[Manifest Mode]: ../users/manifests.md +[builtin-baseline]: ../users/manifests.md#builtin-baseline +[vcj]: ../users/registries.md#vcpkg-configurationjson +[registries]: ../users/registries.md diff --git a/external_imported/vcpkg/docs/examples/installing-and-using-packages.md b/external_imported/vcpkg/docs/examples/installing-and-using-packages.md index 011df93a4..612d5bdbe 100644 --- a/external_imported/vcpkg/docs/examples/installing-and-using-packages.md +++ b/external_imported/vcpkg/docs/examples/installing-and-using-packages.md @@ -1,10 +1,12 @@ ## Installing and Using Packages Example: SQLite +_Note: this old example uses Classic Mode, but most developers will be happier with Manifest Mode. See [Manifest Mode: CMake Example](manifest-mode-cmake.md) for an example of converting to Manifest Mode._ + - [Step 1: Install](#install) - [Step 2: Use](#use) - [VS/MSBuild Project (User-wide integration)](#msbuild) - [CMake (Toolchain file)](#cmake) - - [Other integration options](../users/integration.md) + - [Other integration options](../users/buildsystems/integration.md) --- diff --git a/external_imported/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md b/external_imported/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md index 679f468a9..21d6f1a3e 100644 --- a/external_imported/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md +++ b/external_imported/vcpkg/docs/examples/modify-baseline-to-pin-old-boost.md @@ -1,12 +1,12 @@ # Pin old Boost versions -This document will teach you how to set versions of meta-packages like `boost` or `qt5`. +This document will teach you how to set versions of meta-packages like `boost` or `qt5`. -**What is a meta-package?** -In vcpkg we call meta-packages to ports that by themselves don't install anything but that instead forward installation to another port or ports. The reasons for these meta-packages to exist are plenty: to install different versions of a library depending on platform (like the old OpenSSL port did), to allow for multiple versions to exist in the vcpkg registry at the same time (OpenCV), or to conveniently install/uninstall a catalog of related packages (Boost and Qt). +**What is a meta-package?** +In vcpkg we call meta-packages to ports that by themselves don't install anything but that instead forward installation to another port or ports. The reasons for these meta-packages to exist are plenty: to install different versions of a library depending on platform or to conveniently install/uninstall a catalog of related packages (Boost and Qt). -In the case of Boost, it is unlikely that a user requires all of the 140+ Boost libraries in their project. For the sake of convenience, vcpkg splits Boost into multiple sub-packages broken down to individual libraries. By doing so, users can limit the subset of Boost libraries that they depend on. +In the case of Boost, it is unlikely that a user requires all of the 140+ Boost libraries in their project. For the sake of convenience, vcpkg splits Boost into multiple sub-packages broken down to individual libraries. By doing so, users can limit the subset of Boost libraries that they depend on. -If a user wants to install all of the Boost libraries available in vcpkg, they can do so by installing the `boost` meta-package. +If a user wants to install all of the Boost libraries available in vcpkg, they can do so by installing the `boost` meta-package. Due to the nature of meta-packages, some unexpected issues arise when trying to use them with versioning. If a user writes the following manifest file: @@ -17,7 +17,7 @@ Due to the nature of meta-packages, some unexpected issues arise when trying to "version": "1.0.0", "builtin-baseline": "787fe1418ea968913cc6daf11855ffd8b0b5e9d4", "dependencies": [ "boost-tuple" ], - "overrides": [ + "overrides": [ { "name": "boost", "version": "1.72.0" } ] } @@ -49,7 +49,7 @@ It is reasonable to expect that overriding `boost` to version 1.72.0 results in Below, we describe two methods to pin down Boost versions effectively. ## Method 1: Pin specific packages -Use `"overrides"` to force specific versions in a package-by-package basis. +Use `"overrides"` to force specific versions in a package-by-package basis. `vcpkg.json` ```json @@ -72,14 +72,15 @@ This method allows you to quickly set the specific versions you want, but you wi The second method makes it easy to pin the entire Boost collection and end up with a very simple manifest file. ## Method 2: Modify baseline -An easy way to set the version for the entirety of boost is to use the `"builtin-baseline"` property. +An easy way to set the version for the entirety of boost is to use the `"builtin-baseline"` property. -As of right now, it is only possible to go back to Boost version `1.75.0` using a baseline. Since that was the contemporary Boost version when the versioning feature was merged. **But, it is possible to modify the baseline to whatever you like and use that instead.** +As of right now, it is only possible to go back to Boost version `1.75.0` using a baseline, since that was the contemporary Boost version when the versioning feature was merged. **But, it is possible to modify the baseline to whatever you like and use that instead.** ### Step 1: Create a new branch -As described in the versioning documentation. The value that goes in `"builtin-baseline"` is a Git commit in the vcpkg repository's history. Then it stands to reason, that if you want to customize the baseline you should be able to create a new commit with said custom baseline. +As described in the versioning documentation. The value that goes in `"builtin-baseline"` is a git commit in the microsoft/vcpkg repository's history. If you want to customize the baseline and have control over the vcpkg instance, you can create a new commit with said custom baseline. + +Let's start by creating a new branch to hold our modified baseline. -Let's start by creating a new branch to hold our modified baseline. In the directory containing your clone of the vcpkg Git repository run: ``` @@ -91,7 +92,7 @@ This will create a new branch named `custom-boost-baseline` and check it out imm ### Step 2: Modify the baseline The next step is to modify the baseline file, open the file in your editor of choice and modify the entries for the Boost libraries. -Change the `"baseline"` version to your desired version. +Change the `"baseline"` version to your desired version. _NOTE: Remember to also set the port versions to 0 (or your desired version)._ `${vcpkg-root}/versions/baseline.json` @@ -126,7 +127,7 @@ _NOTE: Remember to also set the port versions to 0 (or your desired version)._ ... ``` -Some `boost-` packages are helpers used by vcpkg and are not part of Boost. For example, `"boost-uninstall"` is a vcpkg helper to conveniently uninstall all Boost libraries, but it didn't exist for Boost version `1.72.0`, in this case it is fine to leave it at `1.75.0` to avoid baseline errors (since all versions in `baseline.json` must have existed). +Some `boost-` packages are helpers used by vcpkg and are not part of Boost. For example, `"boost-uninstall"` is a vcpkg helper to conveniently uninstall all Boost libraries, but it didn't exist for Boost version `1.72.0`, in this case it is fine to leave it at `1.75.0` to avoid baseline errors (since all versions in `baseline.json` must have existed). ### Step 3: Commit your changes After saving your modified file, run these commands to commit your changes: diff --git a/external_imported/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md b/external_imported/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md index 5d7901337..25872b724 100644 --- a/external_imported/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md +++ b/external_imported/vcpkg/docs/examples/overlay-triplets-linux-dynamic.md @@ -1,4 +1,4 @@ -# Overlay triplets example +# Using Overlay Triplets ## Building dynamic libraries on Linux diff --git a/external_imported/vcpkg/docs/examples/packaging-github-repos.md b/external_imported/vcpkg/docs/examples/packaging-github-repos.md index 7091c7e01..769f75455 100644 --- a/external_imported/vcpkg/docs/examples/packaging-github-repos.md +++ b/external_imported/vcpkg/docs/examples/packaging-github-repos.md @@ -37,7 +37,7 @@ vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libogg" RENAME copyright) ``` -Check the documentation for [`vcpkg_cmake_configure`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md) if your package needs additional options. +Check the documentation for [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/vcpkg_cmake_install.md) if your package needs additional options. Now you can run `vcpkg install libogg` to build and install the package. diff --git a/external_imported/vcpkg/docs/examples/packaging-zipfiles.md b/external_imported/vcpkg/docs/examples/packaging-zipfiles.md index 979cc29b4..7f2a7405b 100644 --- a/external_imported/vcpkg/docs/examples/packaging-zipfiles.md +++ b/external_imported/vcpkg/docs/examples/packaging-zipfiles.md @@ -3,7 +3,7 @@ ### Bootstrap with `create` First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors. -*Looking at zlib's website, the URL http://zlib.net/zlib-1.2.11.tar.gz looks appropriate.* +*Looking at zlib's website, the URL http://zlib.net/zlib-1.2.12.tar.gz looks appropriate.* Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name. @@ -11,12 +11,12 @@ Second, determine a suitable package name. This should be ASCII, lowercase, and Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `-.zip`. -*`zlib1211.zip` is a fine name, so no change needed.* +*`zlib1212.zip` is a fine name, so no change needed.* All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports/`. ```no-highlight -PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.11.tar.gz zlib1211.tar.gz +PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.12.tar.gz zlib1212.tar.gz -- Generated portfile: D:/src/vcpkg/ports/zlib2/portfile.cmake ``` @@ -27,7 +27,7 @@ In addition to the generated `ports//portfile.cmake`, we also need a `p ```json { "name": "zlib2", - "version-string": "1.2.11", + "version-string": "1.2.12", "description": "A Massively Spiffy Yet Delicately Unobtrusive Compression Library" } ``` @@ -42,11 +42,11 @@ The following packages will be built and installed: zlib2[core]:x64-uwp Starting package 1/1: zlib2:x64-uwp Building package zlib2[core]:x64-uwp... --- Using cached C:/src/vcpkg/downloads/zlib1211.tar.gz --- Cleaning sources at C:/src/vcpkg/buildtrees/zlib2/src/1.2.11-deec42f53b.clean. Pass --editable to vcpkg to reuse sources. --- Extracting source C:/src/vcpkg/downloads/zlib1211.tar.gz +-- Using cached C:/src/vcpkg/downloads/zlib1212.tar.gz +-- Cleaning sources at C:/src/vcpkg/buildtrees/zlib2/src/1.2.12-deec42f53b.clean. Pass --editable to vcpkg to reuse sources. +-- Extracting source C:/src/vcpkg/downloads/zlib1212.tar.gz -- Applying patch cmake_dont_build_more_than_needed.patch --- Using source at C:/src/vcpkg/buildtrees/zlib2/src/1.2.11-deec42f53b.clean +-- Using source at C:/src/vcpkg/buildtrees/zlib2/src/1.2.12-deec42f53b.clean -- Configuring x64-uwp -- Building x64-uwp-dbg -- Building x64-uwp-rel diff --git a/external_imported/vcpkg/docs/examples/versioning.getting-started.md b/external_imported/vcpkg/docs/examples/versioning.getting-started.md index c55cf7c1c..4dd1e66fe 100644 --- a/external_imported/vcpkg/docs/examples/versioning.getting-started.md +++ b/external_imported/vcpkg/docs/examples/versioning.getting-started.md @@ -6,8 +6,6 @@ Vcpkg lets you take control of which version of packages to install in your proj ## Using versions with manifests -With the `versions` feature flag enabled you can start adding version constraints to your dependencies. - Let's start with creating a simple CMake project that depends on `fmt` and `zlib`. Create a folder with the following files: @@ -97,7 +95,7 @@ fmt[core]:x86-windows -> 7.1.3#1 -- D:\vcpkg\buildtrees\versioning\versions\fmt\ zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 ``` -Instead of using the portfiles in `ports/`, vcpkg is checking out the files for each version in `buildtrees/versioning/versions/`. The files in `ports/` are still used when running vcpkg in classic mode or when the `versions` feature flag is disabled. +Instead of using the portfiles in `ports/`, vcpkg is checking out the files for each version in `buildtrees/versioning/versions/`. The files in `ports/` are still used when running vcpkg in classic mode. _NOTE: Output from vcpkg while configuring CMake is only available when using CMake version `3.18` or newer. If you're using an older CMake you can check the `vcpkg-manifest-install.log` file in your build directory instead._ @@ -147,7 +145,7 @@ If you want to upgrade your dependencies, you can bump the minimum version const { "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc" } ``` -This field declares the versioning baseline for all ports. Setting a baseline is required to enable versioning, otherwise you will get the current versions on the ports directory. You can run 'git rev-parse HEAD' to get the current commit of vcpkg and set it as the builtin-baseline. See the [`builtin-baseline` documentation](../users/versioning.md#builtin-baseline) for more information. +This field declares the versioning baseline for all ports. Setting a baseline is required to enable versioning, otherwise you will get the current versions on the ports directory. You can run 'git rev-parse HEAD' to get the current commit of vcpkg and set it as the builtin-baseline. See the [`builtin-baseline` documentation](../users/manifests.md#builtin-baseline) for more information. In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `3426db05b996481ca31e95fff3734cf23e0f51bc` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). @@ -234,11 +232,11 @@ Notice how the `fmt` is now at version `6.0.0` just like we wanted. ## Versions and custom ports -The last thing to discuss is how overlay ports interact with versioning resolution. The answer is: they don't. +The last thing to discuss is how overlay ports interact with versioning resolution. The answer is: they don't. Going into more detail, when you provide an overlay for a port, vcpkg will always use the overlay port without caring what version is contained in it. The reasons are two-fold: (1) it is consistent with the existing behavior of overlay ports of completely masking the existing port, and (2) overlay ports do not (and are not expected to) provide enough information to power vcpkg's versioning feature. -If you want to have flexible port customization along with versioning features, you should consider making your own custom registry. See our [registries specification for more details](../specifications/registries.md). +If you want to have flexible port customization along with versioning, you should consider making your own custom registry. See our [registries specification for more details](../specifications/registries.md). ## Further reading diff --git a/external_imported/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md b/external_imported/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md new file mode 100644 index 000000000..5acd12b37 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/internal/vcpkg_catalog_release_process.md @@ -0,0 +1,14 @@ +# vcpkg_catalog_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg release. + +1. Generate a new GitHub Personal Access Token with repo permissions. +2. Using the PAT, invoke $/scripts/Get-Changelog.ps1 `-StartDate (previous release date) -EndDate (Get-Date) -OutFile path/to/results.md` +3. Create a new GitHub release in this repo. +4. Submit a vcpkg.ci (full tree rebuild) run with the same SHA as that release. +5. Use the "auto-generate release notes". Copy the "new contributors" and "full changelog" parts to the end of `path/to/results.md`. +6. Change `## New Contributors` to `#### New Contributors` +7. In `path/to/results.md`, update `LINK TO BUILD` with the most recent link to vcpkg.ci run. +8. In `path/to/results.md`, fill out the tables for number of existing ports and successful ports. +9. Replace the contents of the release notes with the contents of `path/to/results.md` +10. After the full rebuild submission completes, update the link to the one for the exact SHA, the counts, and remove "(tentative)". diff --git a/external_imported/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md b/external_imported/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md new file mode 100644 index 000000000..01e4f3792 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/internal/vcpkg_tool_release_process.md @@ -0,0 +1,53 @@ +# vcpkg_tool_release_process + +This document describes the acceptance criteria / process we use when doing a vcpkg-tool update, +such as https://github.com/microsoft/vcpkg/pull/23757 + +1. Verify that all tests etc. are passing in the vcpkg-tool repo's `main` branch, and that the + contents therein are acceptable for release. (Steps after this will sign code there, so this + review is responsible gating what has access to code signing.) +2. Check that the changes there are in fact the changes that we want in that release. (Be aware, + you are responsible for what is about to be signed with a Microsoft code signing certificate by + proceeding) +3. Submit a new full tree rebuild by https://dev.azure.com/vcpkg/public/_build?definitionId=29 + (microsoft.vcpkg.ci as of this writing) and queue a new build with the vcpkg-tool SHA overridden + to the one you wish to use. Example: + https://dev.azure.com/vcpkg/public/_build/results?buildId=73664&view=results +4. (Probably the next day) Check over the failures and ensure any differences with the most recent + full rebuild using the previous tool version are understood. +5. On your machine, in a prompt changed to the vcpkg-tool repo, + `git fetch https://github.com/microsoft/vcpkg-tool main && git switch -d FETCH_HEAD` +6. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main` +7. Monitor the resulting signed build at: + https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?definitionId=13610 + and/or manually submit one. (The push is supposed to automatically submit a build but that + has been somewhat unstable at the time of this writing.) +8. The signed build will automatically create a draft GitHub release at + https://github.com/microsoft/vcpkg-tool/releases . Erase the contents filled in there and press + the "auto generate release notes" button. Manually remove any entries created by the automated + localization tools which will start with `* LEGO: Pull request from juno/`. +9. Publish that draft release as "pre-release". +10. Clean up a machine for the following tests: + * Delete `VCPKG_DOWNLOADS/artifacts` (which forces artifacts to be reacquired) + * Delete `LOCALAPPDATA/vcpkg` (which forces registries to be reacquired) +11. Smoke test the 'one liner' installer: (Where 2022-06-15 is replaced with the right release name) + * Powershell: + `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1)` + * Batch: + `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1 && .\vcpkg-init.cmd` + * Bash: + `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init -L)` +12. Test that embedded scenarios work for vcpkg-artifacts: + Ensure that none of the following report errors: + 1. git clone https://github.com/some-example/blink/ + 2. cd blink + 3. vcpkg activate + 4. idf.py set-target ESP32 + 5. cd build + 6. ninja +13. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` + with the new release date, and update SHAs as appropriate in the .sh script. (For example, see + https://github.com/microsoft/vcpkg/pull/23757) +15. Merge the tool update PR. +16. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically + updates the aka.ms links) diff --git a/external_imported/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md b/external_imported/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md new file mode 100644 index 000000000..80c6654b7 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.md @@ -0,0 +1,16 @@ +# z_vcpkg_setup_pkgconfig_path + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +`z_vcpkg_setup_pkgconfig_path` sets up environment variables to use `pkgconfig`, such as `PKG_CONFIG` and `PKG_CONFIG_PATH`. +The original values are restored with `z_vcpkg_restore_pkgconfig_path`. `BASE_DIRS` indicates the base directories to find `.pc` files; typically `${CURRENT_INSTALLED_DIR}`, or `${CURRENT_INSTALLED_DIR}/debug`. + +```cmake +z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) +# Build process that may transitively invoke pkgconfig +z_vcpkg_restore_pkgconfig_path() +``` + + +## Source +[scripts/cmake/z\_vcpkg\_setup\_pkgconfig\_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/maintainer-guide.md b/external_imported/vcpkg/docs/maintainers/maintainer-guide.md index 1bf8e9483..d02da5054 100644 --- a/external_imported/vcpkg/docs/maintainers/maintainer-guide.md +++ b/external_imported/vcpkg/docs/maintainers/maintainer-guide.md @@ -42,14 +42,15 @@ https://github.blog/2019-02-14-introducing-draft-pull-requests/ At this time, the following helpers are deprecated: -1. `vcpkg_extract_source_archive()` should be replaced by [`vcpkg_extract_source_archive_ex()`](vcpkg_extract_source_archive_ex.md) -2. `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. [`vcpkg_from_github()`](vcpkg_from_github.md)) -3. `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) -4. `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) -5. `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](ports/vcpkg-cmake/vcpkg_cmake_configure.md#vcpkg_cmake_configure) after removing `PREFER_NINJA` (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) -6. `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](ports/vcpkg-cmake/vcpkg_cmake_build.md#vcpkg_cmake_build) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) -7. `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](ports/vcpkg-cmake/vcpkg_cmake_install.md#vcpkg_cmake_install) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) -8. `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md#vcpkg_cmake_config_fixup) (from port [`vcpkg-cmake-config`](ports/vcpkg-cmake-config.md#vcpkg-cmake-config)) +- [`vcpkg_extract_source_archive_ex()`](vcpkg_extract_source_archive_ex.md) should be replaced by the supported overload of [`vcpkg_extract_source_archive()`] (with `ARCHIVE`) +- The deprecated overload of [`vcpkg_extract_source_archive()`] without `ARCHIVE` should be replaced by the supported overload with `ARCHIVE`. +- `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. [`vcpkg_from_github()`](vcpkg_from_github.md)) +- `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) +- `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) +- `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](vcpkg_cmake_configure.md) after removing `PREFER_NINJA` (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) +- `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](vcpkg_cmake_build.md) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) +- `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) +- `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md#vcpkg_cmake_config_fixup) (from port [`vcpkg-cmake-config`](ports/vcpkg-cmake-config.md#vcpkg-cmake-config)) Some of the replacement helper functions are in "tools ports" to allow consumers to pin their behavior at specific versions, to allow locking the behavior of the helpers at a particular @@ -66,6 +67,8 @@ version. Tools ports need to be added to your port's `"dependencies"`, like so: } ``` +[`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md + ### Avoid excessive comments in portfiles Ideally, portfiles should be short, simple, and as declarative as possible. @@ -106,6 +109,20 @@ This means that the user should see: Examples: * [`brotli`](https://github.com/microsoft/vcpkg/blob/4f0a640e4c5b74166b759a862d7527c930eff32e/ports/brotli/install.patch) creates the `unofficial-brotli` package, producing target `unofficial::brotli::brotli`. +### Install copyright file + +Each port has to provide a file named `copyright` in the folder `${CURRENT_PACKAGES_DIR}/share/${PORT}`. + +Many ports are using this code to install a copyright file: + +```cmake +file(INSTALL "${SOURCE_PATH}LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +``` + +This is discouraged in favour of [`vcpkg_install_copyright()`](vcpkg_install_copyright.md). New ports should use `vcpkg_install_copyright()` instead. However, it is still valid for existing ports to use something like the code above. You may replace this with `vcpkg_install_copyright` but you don't have to. + +`vcpkg_install_copyright` also includes the functionallity to handle multiple copyright files. See its [documentation](vcpkg_install_copyright.md) for more info. + ## Features ### Do not use features to implement alternatives diff --git a/external_imported/vcpkg/docs/maintainers/portfile-functions.md b/external_imported/vcpkg/docs/maintainers/portfile-functions.md index 6c7b87fdc..60beddb79 100644 --- a/external_imported/vcpkg/docs/maintainers/portfile-functions.md +++ b/external_imported/vcpkg/docs/maintainers/portfile-functions.md @@ -1,12 +1,10 @@ - - # Portfile helper functions - [execute\_process](execute_process.md) - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) - [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) - [vcpkg\_apply\_patches](vcpkg_apply_patches.md) (deprecated) - [vcpkg\_backup\_restore\_env\_vars](vcpkg_backup_restore_env_vars.md) -- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md)) +- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](vcpkg_cmake_build.md)) - [vcpkg\_build\_make](vcpkg_build_make.md) - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) - [vcpkg\_build\_ninja](vcpkg_build_ninja.md) @@ -18,7 +16,7 @@ - [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) - [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) - [vcpkg\_common\_definitions](vcpkg_common_definitions.md) -- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) (deprecated, use [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md)) +- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) (deprecated, use [vcpkg\_cmake\_configure](vcpkg_cmake_configure.md)) - [vcpkg\_configure\_gn](vcpkg_configure_gn.md) (deprecated, use [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md)) - [vcpkg\_configure\_make](vcpkg_configure_make.md) - [vcpkg\_configure\_meson](vcpkg_configure_meson.md) @@ -46,8 +44,9 @@ - [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) - [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) - [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) -- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) +- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](vcpkg_cmake_install.md)) - [vcpkg\_install\_gn](vcpkg_install_gn.md) (deprecated, use [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md)) +- [vcpkg\_install\_copyright](vcpkg_install_copyright.md) - [vcpkg\_install\_make](vcpkg_install_make.md) - [vcpkg\_install\_meson](vcpkg_install_meson.md) - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) @@ -64,20 +63,37 @@ - [z\_vcpkg\_function\_arguments](internal/z_vcpkg_function_arguments.md) - [z\_vcpkg\_get\_cmake\_vars](internal/z_vcpkg_get_cmake_vars.md) - [z\_vcpkg\_prettify\_command\_line](internal/z_vcpkg_prettify_command_line.md) +- [z\_vcpkg\_setup\_pkgconfig\_path](internal/z_vcpkg_setup_pkgconfig_path.md) ## Scripts from Ports ### [vcpkg-cmake](ports/vcpkg-cmake.md) -- [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md) -- [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md) -- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake/vcpkg_cmake_get_vars.md) -- [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) +- [vcpkg\_cmake\_build](vcpkg_cmake_build.md) +- [vcpkg\_cmake\_configure](vcpkg_cmake_configure.md) +- [vcpkg\_cmake\_install](vcpkg_cmake_install.md) + +### [vcpkg-gn](ports/vcpkg-gn.md) + +- [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md) +- [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md) ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md) - [vcpkg\_cmake\_config\_fixup](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md) +### [vcpkg-cmake-get-vars](ports/vcpkg-cmake-get-vars.md) + +- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md) + ### [vcpkg-pkgconfig-get-modules](ports/vcpkg-pkgconfig-get-modules.md) - [x\_vcpkg\_pkgconfig\_get\_modules](ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.md) + +### [vcpkg-get-python-packages](ports/vcpkg-get-python-packages.md) + +- [x\_vcpkg\_get\_python\_packages](ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md) + +### [vcpkg-qmake](ports/vcpkg-qmake.md) + +- [vcpkg\_qmake\_configure](ports/vcpkg-qmake/vcpkg_qmake_configure.md) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md new file mode 100644 index 000000000..4881c8218 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars.md @@ -0,0 +1,3 @@ +# vcpkg-cmake-get-vars + +This port contains a helper function to extract CMake variables into the scope of the portfile or other scripts diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md similarity index 84% rename from external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md rename to external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md index 50e7abde7..a9d4a82b5 100644 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md @@ -1,6 +1,6 @@ # vcpkg_cmake_get_vars -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md). +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.md). Runs a cmake configure with a dummy project to extract certain cmake variables @@ -38,4 +38,4 @@ message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") ``` ## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake) +[ports/vcpkg-cmake-get-vars/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake.md index b84c58869..52f6c1fcd 100644 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake.md +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake.md @@ -1,7 +1,7 @@ # vcpkg-cmake -This port contains cmake functions for dealing with a CMake buildsystem. +This port contains portfile helper functions for dealing with a CMake buildsystem. -In the common case, `vcpkg_cmake_configure()` (with appropriate arguments) -followed by `vcpkg_cmake_install()` will be enough to build and install a port. -`vcpkg_cmake_build()` is provided for more complex cases. +- [`vcpkg_cmake_configure()`](../vcpkg_cmake_configure.md) +- [`vcpkg_cmake_install()`](../vcpkg_cmake_install.md) +- [`vcpkg_cmake_build()`](../vcpkg_cmake_build.md) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md deleted file mode 100644 index b8f9c3b8a..000000000 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md +++ /dev/null @@ -1,38 +0,0 @@ -# vcpkg_cmake_build - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md). - -Build a cmake project. - -```cmake -vcpkg_cmake_build( - [TARGET ] - [LOGFILE_BASE ] - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_build` builds an already-configured cmake project. -You can use the alias [`vcpkg_cmake_install()`] function -if your CMake build system supports the `install` TARGET, -and this is something we recommend doing whenever possible. -Otherwise, you can use `TARGET` to set the target to build. -This function defaults to not passing a target to cmake. - -[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md - -`LOGFILE_BASE` is used to set the base of the logfile names; -by default, this is `build`, and thus the logfiles end up being something like -`build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, -this is set to `install`, so you'll get log names like `install-x86-windows-dbg.log`. - -For build systems that are buggy when run in parallel, -using `DISABLE_PARALLEL` will run the build with only one job. - -Finally, `ADD_BIN_TO_PATH` adds the appropriate (either release or debug) -`bin/` directories to the path during the build, -such that executables run during the build will be able to access those DLLs. - -## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_build.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_build.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md deleted file mode 100644 index fd84c2529..000000000 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ /dev/null @@ -1,93 +0,0 @@ -# vcpkg_cmake_configure - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md). - -Configure a CMake buildsystem. - -```cmake -vcpkg_cmake_configure( - SOURCE_PATH - [LOGFILE_BASE ] - [DISABLE_PARALLEL_CONFIGURE] - [NO_CHARSET_FLAG] - [WINDOWS_USE_MSBUILD] - [GENERATOR ] - [OPTIONS - ...] - [OPTIONS_RELEASE - ...] - [OPTIONS_DEBUG - ...] - [MAYBE_UNUSED_VARIABLES - ...] -) -``` - -`vcpkg_cmake_configure` configures a CMake build system for use with -`vcpkg_cmake_buildsystem_build` and `vcpkg_cmake_buildsystem_install`. -`source-path` is where the source is located; by convention, -this is usually `${SOURCE_PATH}`, which is set by one of the `vcpkg_from_*` functions. -This function configures the build system for both Debug and Release builds by default, -assuming that `VCPKG_BUILD_TYPE` is not set; if it is, then it will only configure for -that build type. - -Use the `OPTIONS` argument to set the configure settings for both release and debug, -and use `OPTIONS_RELEASE` and `OPTIONS_DEBUG` to set the configure settings for -release only and debug only respectively. - -By default, when possible, `vcpkg_cmake_configure` uses [ninja-build] -as its build system. If the `WINDOWS_USE_MSBUILD` argument is passed, then -`vcpkg_cmake_configure` will use a Visual Studio generator on Windows; -on every other platform, `vcpkg_cmake_configure` just uses Ninja. - -[ninja-build]: https://ninja-build.org/ - -Additionally, one may pass the specific generator a port should use with `GENERATOR`. -This is useful if some project-specific buildsystem -has been wrapped in a CMake build system that doesn't perform an actual build. -If used for this purpose, it should be set to `"NMake Makefiles"`. -`vcpkg_cmake_buildsystem_build` and `install` do not support this being set to anything -except for NMake. - -For libraries which cannot be configured in parallel, -pass the `DISABLE_PARALLEL_CONFIGURE` flag. This is needed, for example, -if the library's build system writes back into the source directory during configure. -This also disables the `CMAKE_DISABLE_SOURCE_CHANGES` option. - -By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` -which set the default character set to utf-8 for MSVC. -If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. - -This function makes certain that all options passed in are used by the -underlying CMake build system. If there are options that might be unused, -perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. For example: -```cmake -vcpkg_cmake_configure( - ... - OPTIONS - -DBUILD_EXAMPLE=OFF - ... - MAYBE_UNUSED_VARIABLES - BUILD_EXAMPLE -) -``` - -`LOGFILE_BASE` is used to set the base of the logfile names; -by default, this is `config`, and thus the logfiles end up being something like -`config-x86-windows-dbg.log`. You can set it to anything you like; -if you set it to `config-the-first`, -you'll get something like `config-the-first-x86-windows.dbg.log`. - -## Notes -This command supplies many common arguments to CMake. To see the full list, examine the source. - -## Examples - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) - -## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md deleted file mode 100644 index 1d708d3a1..000000000 --- a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md +++ /dev/null @@ -1,25 +0,0 @@ -# vcpkg_cmake_install - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md). - -Build and install a cmake project. - -```cmake -vcpkg_cmake_install( - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_install` transparently forwards to [`vcpkg_cmake_build()`], -with additional parameters to set the `TARGET` to `install`, -and to set the `LOGFILE_ROOT` to `install` as well. - -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md - -## Examples: - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) - -## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_install.cmake) diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages.md similarity index 100% rename from external_imported/vcpkg/ports/vcpkg-get-python-packages/README.md rename to external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages.md diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md new file mode 100644 index 000000000..26d57e4fa --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md @@ -0,0 +1,38 @@ +# x_vcpkg_get_python_packages + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.md). + +Experimental +Retrieve needed python packages + +## Usage +```cmake +x_vcpkg_get_python_packages( + [PYTHON_VERSION (2|3)] + PYTHON_EXECUTABLE + REQUIREMENTS_FILE + PACKAGES ... + [OUT_PYTHON_VAR somevar] +) +``` +## Parameters + +### PYTHON_VERSION +Python version to be used. Either 2 or 3 + +### PYTHON_EXECUTABLE +Full path to the python executable + +### REQUIREMENTS_FILE +Requirement file with the list of python packages + +### PACKAGES +List of python packages to acquire + +### OUT_PYTHON_VAR +Variable to store the path to the python binary inside the virtual environment + + + +## Source +[ports/vcpkg-get-python-packages/x\_vcpkg\_get\_python\_packages.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn.md new file mode 100644 index 000000000..21c440dd8 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn.md @@ -0,0 +1,12 @@ +# vcpkg-gn + +This port contains cmake functions for dealing with a GN buildsystem. + +## Example + +```cmake +vcpkg_gn_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_gn_install() +``` diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md new file mode 100644 index 000000000..da9326a81 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md @@ -0,0 +1,32 @@ +# vcpkg_gn_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_configure.md). + +Generate Ninja (GN) targets + +## Usage: +```cmake +vcpkg_gn_configure( + SOURCE_PATH + [OPTIONS ] + [OPTIONS_DEBUG ] + [OPTIONS_RELEASE ] +) +``` + +## Parameters: +### SOURCE_PATH (required) +The path to the GN project. + +### OPTIONS +Options to be passed to both the debug and release targets. +Note: Must be provided as a space-separated string. + +### OPTIONS_DEBUG (space-separated string) +Options to be passed to the debug target. + +### OPTIONS_RELEASE (space-separated string) +Options to be passed to the release target. + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_configure.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md new file mode 100644 index 000000000..e520fcc96 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md @@ -0,0 +1,29 @@ +# vcpkg_gn_install + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-gn/vcpkg_gn_install.md). + +Installs a GN project. + +In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. + +## Usage: +```cmake +vcpkg_gn_install( + SOURCE_PATH + [TARGETS ...] +) +``` + +## Parameters: +### SOURCE_PATH +The path to the source directory + +### TARGETS +Only install the specified targets. + +Note: includes must be handled separately + +[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md + +## Source +[ports/vcpkg-gn/vcpkg\_gn\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-gn/vcpkg_gn_install.cmake) diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/README.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake.md similarity index 100% rename from external_imported/vcpkg/ports/vcpkg-qmake/README.md rename to external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake.md diff --git a/external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md new file mode 100644 index 000000000..413042657 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md @@ -0,0 +1,36 @@ +# vcpkg_qmake_configure + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-qmake/vcpkg_qmake_configure.md). + +Configure a qmake-based project. + +###User setable triplet variables: +VCPKG_OSX_DEPLOYMENT_TARGET: Determines QMAKE_MACOSX_DEPLOYMENT_TARGET +VCPKG_QMAKE_COMMAND: Path to qmake. (default: "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}") +VCPKG_QT_CONF_(RELEASE|DEBUG): Path to qt.config being used for RELEASE/DEBUG. (default: "${CURRENT_INSTALLED_DIR}/tools/Qt6/qt_(release|debug).conf") +VCPKG_QMAKE_OPTIONS(_RELEASE|_DEBUG)?: Extra options to pass to QMake + +```cmake +vcpkg_qmake_configure( + SOURCE_PATH + [QMAKE_OPTIONS arg1 [arg2 ...]] + [QMAKE_OPTIONS_RELEASE arg1 [arg2 ...]] + [QMAKE_OPTIONS_DEBUG arg1 [arg2 ...]] + [OPTIONS arg1 [arg2 ...]] + [OPTIONS_RELEASE arg1 [arg2 ...]] + [OPTIONS_DEBUG arg1 [arg2 ...]] +) +``` + +### SOURCE_PATH +The path to the *.pro qmake project file. + +### QMAKE_OPTIONS, QMAKE_OPTIONS\_RELEASE, QMAKE_OPTIONS\_DEBUG +options directly passed to qmake with the form QMAKE_X=something or CONFIG=something + +### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG +The options passed after -- to qmake. + + +## Source +[ports/vcpkg-qmake/vcpkg\_qmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/pr-review-checklist.md b/external_imported/vcpkg/docs/maintainers/pr-review-checklist.md index ce8d1c3a9..05baaa58e 100644 --- a/external_imported/vcpkg/docs/maintainers/pr-review-checklist.md +++ b/external_imported/vcpkg/docs/maintainers/pr-review-checklist.md @@ -13,7 +13,7 @@ You can link any of these checklist items in a GitHub comment by copying the lin
c000001: No deprecated helper functions are used -See our [Maintainer Guidelines and Policies](maintainer-guide.md#Avoid-deprecated-helper-functions) for more information. +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-deprecated-helper-functions) for more information.
@@ -36,7 +36,7 @@ See our [manifest file documentation](manifest-files.md#description) for more in
c000004: No unnecessary comments are present in the changeset -See our [Maintainer Guidelines and Policies](maintainer-guide.md#Avoid-excessive-comments-in-portfiles) for more information. +See our [Maintainer Guidelines and Policies](maintainer-guide.md#avoid-excessive-comments-in-portfiles) for more information.
diff --git a/external_imported/vcpkg/docs/maintainers/registries.md b/external_imported/vcpkg/docs/maintainers/registries.md index 18c54a447..12a98c208 100644 --- a/external_imported/vcpkg/docs/maintainers/registries.md +++ b/external_imported/vcpkg/docs/maintainers/registries.md @@ -125,10 +125,7 @@ HEAD commit should be a child of all previous HEAD commits. ### Builtin Registries -Builtin registries are treated as special Git registries. Instead of fetching -from a remote url, builtin registries consult the `$VCPKG_ROOT/.git` directory -of the vcpkg clone. They use the currently checked out `$VCPKG_ROOT/versions` -directory as the source for versioning information. +Builtin registries are treated as special [Git registries](#git-registries). Instead of fetching from a remote url, builtin registries consult the `$VCPKG_ROOT/.git` directory of the vcpkg clone. They use the currently checked out `$VCPKG_ROOT/versions` directory as the source for versioning information. #### Adding a New Version @@ -216,9 +213,7 @@ registries, which have the implicit versioning scheme of refs, filesystem registries can't rely on the version control system here. One possible option is to do a daily release, and have your "versions" be dates. -_WARNING_: A baseline must always refer to the same set of versions. If you -want to add new versions, you need to create a new version of the registry in -the `baseline.json` file. +_WARNING_: A baseline must not be modified once published. If you want to change or update versions, you need to create a new baseline in the `baseline.json` file. Here's an example of a valid `baseline.json`, for a registry that has decided upon dates for their versions: diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_build_cmake.md b/external_imported/vcpkg/docs/maintainers/vcpkg_build_cmake.md index 485a8c918..4163c6cc8 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_build_cmake.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_build_cmake.md @@ -1,6 +1,6 @@ # vcpkg_build_cmake -**This function has been deprecated in favor of [`vcpkg_cmake_build`](ports/vcpkg-cmake/vcpkg_cmake_build.md) from the vcpkg-cmake port.** +**This function has been deprecated in favor of [`vcpkg_cmake_build`](vcpkg_cmake_build.md) from the vcpkg-cmake port.** The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_cmake.md). diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_build.md b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_build.md new file mode 100644 index 000000000..047290ec1 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_build.md @@ -0,0 +1,68 @@ +# vcpkg_cmake_build + +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_build.md).** + +Build a cmake project with a custom install target. + +Conventionally, CMake uses the target `install` to build and copy binaries into the [`CMAKE_INSTALL_PREFIX`](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html). In rare circumstances, a project might have more specific targets that should be used instead. + +Ports should prefer calling [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) when possible. + +## Usage + +```cmake +vcpkg_cmake_build( + [TARGET ] + [LOGFILE_BASE ] + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +To use this function, you must depend on the helper port [`vcpkg-cmake`](ports/vcpkg-cmake.md): +```no-highlight +"dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } +] +``` + +## Parameters + +All supported parameters to [`vcpkg_cmake_install()`] are supported by `vcpkg_cmake_build()`. See [`vcpkg_cmake_install()`] for additional parameter documentation. + +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md#parameters + +### TARGET +The CMake target to build. + +If this parameter is not passed, no target will be passed to the build. + +### LOGFILE_BASE +An alternate root name for the logs. + +Defaults to `build-${TARGET_TRIPLET}`. It should not contain any path separators. Logs will be generated matching the pattern `${CURRENT_BUILDTREES_DIR}/${LOGFILE_BASE}-.log` + +## Examples + +```cmake +vcpkg_from_github(OUT_SOURCE_PATH source_path ...) +vcpkg_cmake_configure( + SOURCE_PATH "${source_path}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) +vcpkg_cmake_build(TARGET my.install.target) +``` + +[Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_build+path%3A%2Fports) + +## Remarks + +This command replaces [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_build.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_build.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_configure.md b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_configure.md new file mode 100644 index 000000000..c3ef188b6 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_configure.md @@ -0,0 +1,137 @@ +# vcpkg_cmake_configure + +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_configure.md).** + +Configure a CMake-based project. + +## Usage + +```cmake +vcpkg_cmake_configure( + SOURCE_PATH + [DISABLE_PARALLEL_CONFIGURE] + [NO_CHARSET_FLAG] + [WINDOWS_USE_MSBUILD] + [GENERATOR ] + [LOGFILE_BASE ] + [OPTIONS + ...] + [OPTIONS_RELEASE + ...] + [OPTIONS_DEBUG + ...] + [MAYBE_UNUSED_VARIABLES + ...] +) +``` + +To use this function, you must depend on the helper port [`vcpkg-cmake`](ports/vcpkg-cmake.md): +```no-highlight +"dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } +] +``` + +## Parameters + +### SOURCE_PATH +Specifies the directory containing the `CMakeLists.txt`. + +This value is usually obtained as a result of calling a source acquisition command like [`vcpkg_from_github()`](vcpkg_from_github.md). + +### DISABLE_PARALLEL_CONFIGURE +Disables running the CMake configure step in parallel. + +By default vcpkg disables writing back to the source directory (via the undocumented CMake flag `CMAKE_DISABLE_SOURCE_CHANGES`) and (on Windows) configures Release and Debug in parallel. This flag instructs vcpkg to allow source directory writes and to execute the configure steps sequentially. + +### NO_CHARSET_FLAG +Disables passing `/utf-8` when using the [built-in Windows toolchain][VCPKG_CHAINLOAD_TOOLCHAIN_FILE]. + +This is needed for libraries that set their own source code's character set when targeting MSVC. See the [MSVC documentation for `/utf-8`](https://docs.microsoft.com/cpp/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8) for more information. + +### WINDOWS_USE_MSBUILD +Use MSBuild instead of another generator when targeting a Windows platform. + +By default vcpkg prefers to use Ninja as the CMake Generator for all platforms. However, there are edge cases where MSBuild has different behavior than Ninja. This flag should only be passed if the project requires MSBuild to build correctly. +This flag has no effect for MinGW targets. + +### GENERATOR +Specifies the Generator to use. + +By default vcpkg prefers to use Ninja as the CMake Generator for all platforms, +or "Unix Makefiles" for non-Windows platforms when Ninja is not available. +This parameter can be used for edge cases where project-specific buildsystems depend on a particular generator. + +### LOGFILE_BASE +An alternate root name for the configure logs. + +Defaults to `config-${TARGET_TRIPLET}`. It should not contain any path separators. Logs will be generated matching the pattern `${CURRENT_BUILDTREES_DIR}/${LOGFILE_BASE}-.log` + +### OPTIONS +Additional options to pass to CMake during the configuration. + +See also [Implicit Options](#implicit-options). + +### OPTIONS_RELEASE +Additional options to pass to CMake during the Release configuration. + +These are in addition to `OPTIONS`. + +### OPTIONS_DEBUG +Additional options to pass to CMake during the Debug configuration. + +These are in addition to `OPTIONS`. + +### MAYBE_UNUSED_VARIABLES +List of CMake options that may not be read during the configure step. + +vcpkg will warn about any options outside this list that were not read during the CMake configure step. This list should contain options that are only read during certain configurations (such as when `VCPKG_LIBRARY_LINKAGE` is `"static"` or when certain features are enabled). + +## Implicit Options +This command automatically provides several options to CMake. + +- [`CMAKE_BUILD_TYPE`](https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html) is set to `"Release"` or `"Debug"` as appropriate. +- [`BUILD_SHARED_LIBS`](https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html) is set according to the value of [`VCPKG_LIBRARY_LINKAGE`](../users/triplets.md#vcpkg_library_linkage). +- [`CMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}`](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html) as appropriate to the configuration +- [`CMAKE_TOOLCHAIN_FILE`](https://cmake.org/cmake/help/latest/variable/CMAKE_TOOLCHAIN_FILE.html) and `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` are set to include the [vcpkg toolchain file](../users/buildsystems/cmake-integration.md#cmake_toolchain_file) and the [triplet toolchain][VCPKG_CHAINLOAD_TOOLCHAIN_FILE]. +- [`CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}`](https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_NAME.html). If `VCPKG_CMAKE_SYSTEM_NAME` is unset, defaults to `"Windows"`. +- [`CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}`](https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html) if `VCPKG_CMAKE_SYSTEM_VERSION` is set. +- [`CMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON`](https://cmake.org/cmake/help/latest/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.html) +- [`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON`](https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.html) +- [`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON`](https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY.html) +- [`CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE`](https://cmake.org/cmake/help/latest/module/InstallRequiredSystemLibraries.html) +- [`CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON`](https://cmake.org/cmake/help/latest/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.html) +- [`CMAKE_INSTALL_LIBDIR:STRING=lib`](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html) +- [`CMAKE_INSTALL_BINDIR:STRING=bin`](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html) + +This command also passes all options in [`VCPKG_CMAKE_CONFIGURE_OPTIONS`](../users/triplets.md#vcpkg_cmake_configure_options) and the configuration-specific options from `VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE` or `VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG`. + +Finally, there are additional internal options passed in (with a `VCPKG_` prefix) that should not be depended upon. + +## Examples + +```cmake +vcpkg_from_github(OUT_SOURCE_PATH source_path ...) +vcpkg_cmake_configure( + SOURCE_PATH "${source_path}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) +vcpkg_cmake_install() +``` + +[Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_configure+path%3A%2Fports) + +## Remarks + +This command replaces [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) + +[ninja]: https://ninja-build.org/ +[VCPKG_CHAINLOAD_TOOLCHAIN_FILE]: ../users/triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_install.md b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_install.md new file mode 100644 index 000000000..5845fecc3 --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_cmake_install.md @@ -0,0 +1,53 @@ +# vcpkg_cmake_install + +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_install.md).** + +Build and install a cmake project. + +## Usage + +```cmake +vcpkg_cmake_install( + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +To use this function, you must depend on the helper port [`vcpkg-cmake`](ports/vcpkg-cmake.md): +```no-highlight +"dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } +] +``` + +## Parameters + +### DISABLE_PARALLEL +Disables running the build in parallel. + +By default builds are run with up to [VCPKG_MAX_CONCURRENCY](../users/config-environment.md#VCPKG_MAX_CONCURRENCY) jobs. This option limits the build to a single job and should be used only if the underlying build is unable to run correctly with concurrency. + +### ADD_BIN_TO_PATH +Adds the configuration-specific `bin/` directory to the `PATH` during the build. + +When building for a Windows dynamic triplet, newly built executables may not be immediately executable because their dependency DLLs may not be findable from the build environment. This flag instructs vcpkg to add any additional paths needed to locate those dependency DLLs to the `PATH` environment variable. This is required if the project needs to execute newly built binaries as part of the build (such as to generate code). + +## Examples: + +```cmake +vcpkg_from_github(OUT_SOURCE_PATH source_path ...) +vcpkg_cmake_configure(SOURCE_PATH "${source_path}") +vcpkg_cmake_install() +``` + +[Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_install+path%3A%2Fports) + +## Remarks + +This command replaces [`vcpkg_install_cmake()`](vcpkg_install_cmake.md). + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_install.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_common_definitions.md b/external_imported/vcpkg/docs/maintainers/vcpkg_common_definitions.md index b96dd3cbc..a8111b122 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_common_definitions.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_common_definitions.md @@ -5,7 +5,7 @@ The latest version of this document lives in the [vcpkg repo](https://github.com This file defines the following variables which are commonly needed or used in portfiles: ```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD, EMSCRIPTEN. only defined if VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_configure_cmake.md b/external_imported/vcpkg/docs/maintainers/vcpkg_configure_cmake.md index 8a1eb3284..5a5d02429 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_configure_cmake.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_configure_cmake.md @@ -1,6 +1,6 @@ # vcpkg_configure_cmake -**This function has been deprecated in favor of [`vcpkg_cmake_configure`](ports/vcpkg-cmake/vcpkg_cmake_configure.md) from the vcpkg-cmake port.** +**This function has been deprecated in favor of [`vcpkg_cmake_configure`](vcpkg_cmake_configure.md) from the [`vcpkg-cmake`](ports/vcpkg-cmake.md) port.** The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_cmake.md). diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_configure_make.md b/external_imported/vcpkg/docs/maintainers/vcpkg_configure_make.md index ebf80521a..da9346e23 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_configure_make.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_configure_make.md @@ -9,13 +9,14 @@ Configure configure for Debug and Release builds of a project. vcpkg_configure_make( SOURCE_PATH <${SOURCE_PATH}> [AUTOCONFIG] - [USE_WRAPPERS] + [USE_WRAPPERS] [NO_WRAPPERS] [DETERMINE_BUILD_TRIPLET] [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] [NO_ADDITIONAL_PATHS] [CONFIG_DEPENDENT_ENVIRONMENT ...] [CONFIGURE_ENVIRONMENT_VARIABLES ...] [ADD_BIN_TO_PATH] + [DISABLE_VERBOSE_FLAGS] [NO_DEBUG] [SKIP_CONFIGURE] [PROJECT_SUBPATH <${PROJ_SUBPATH}>] @@ -41,6 +42,9 @@ Skip configure process ### USE_WRAPPERS Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) +### NO_WRAPPERS +Deactivate the use of autotools ar-lib and compile wrappers (only applies to windows cl and lib) + ### BUILD_TRIPLET Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET @@ -59,8 +63,8 @@ Script that needs to be called before configuration (do not use for batch files ### ADD_BIN_TO_PATH Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs. -## DISABLE_VERBOSE_FLAGS -do not pass '--disable-silent-rules --verbose' to configure +### DISABLE_VERBOSE_FLAGS +Do not pass '--disable-silent-rules --verbose' to configure. ### OPTIONS Additional options passed to configure during the configuration. diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_execute_required_process.md b/external_imported/vcpkg/docs/maintainers/vcpkg_execute_required_process.md index b00c97260..7aaf5c45d 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_execute_required_process.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_execute_required_process.md @@ -13,6 +13,7 @@ vcpkg_execute_required_process( [TIMEOUT ] [OUTPUT_VARIABLE ] [ERROR_VARIABLE ] + [SAVE_LOG_FILES [...]] ) ``` ## Parameters @@ -40,6 +41,14 @@ Optional variable to receive stderr of the command. This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. +### SAVE_LOG_FILES + +Optional files to be moved from the working directory to `${CURRENT_BUILDTREES_DIR}`. +The files are copied even if the process failed. +The target file names are constructed from the `LOGNAME` parameter and the source filename. +If the target file name doesn't end in `.log`, this suffix is appended. +This helps to collect relevant log files in CI setups. + ## Examples * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md b/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md index 69a95a510..09017e710 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive.md @@ -2,42 +2,39 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive.md). -Extract an archive into the source directory. +Extract an archive. ## Usage -There are two "overloads" of this function. The first is deprecated: - -```cmake -vcpkg_extract_source_archive(<${ARCHIVE}> [<${TARGET_DIRECTORY}>]) -``` - -This overload should not be used. - -The latter is suggested to use for all future `vcpkg_extract_source_archive`s. - ```cmake -vcpkg_extract_source_archive( +vcpkg_extract_source_archive( + ARCHIVE [NO_REMOVE_ONE_LEVEL] [SKIP_PATCH_CHECK] [PATCHES ...] + [REF ] [SOURCE_BASE ] [BASE_DIRECTORY | WORKING_DIRECTORY ] ) ``` -`vcpkg_extract_source_archive` takes an archive and extracts it. -It replaces existing uses of `vcpkg_extract_source_archive_ex`. -The simplest use of it is: +## Parameters -```cmake -vcpkg_download_distfile(archive ...) -vcpkg_extract_source_archive(source_path ARCHIVE "${archive}") -``` + -The general expectation is that an archives are laid out with a base directory, -and all the actual files underneath that directory; in other words, if you -extract the archive, you'll get something that looks like: +### `` + +Name of the variable to set with the directory containing the extracted contents. + +### ARCHIVE + +Full path to the archive to extract. + +### NO_REMOVE_ONE_LEVEL + +Skip removing the top level directory of the archive. + +Most archives contain a single top-level directory, such as: ``` zlib-1.2.11/ @@ -52,35 +49,110 @@ zlib-1.2.11/ ... ``` -`vcpkg_extract_source_archive` automatically removes this directory, -and gives you the items under it directly. However, this only works -when there is exactly one item in the top level of an archive. -Otherwise, you'll have to pass the `NO_REMOVE_ONE_LEVEL` argument to -prevent `vcpkg_extract_source_archive` from performing this transformation. - -If the source needs to be patched in some way, the `PATCHES` argument -allows one to do this, just like other `vcpkg_from_*` functions. -Additionally, the `SKIP_PATCH_CHECK` is provided for `--head` mode - -this allows patches to fail to apply silently. -This argument should _only_ be used when installing a `--head` library, -since otherwise we want a patch failing to appply to be a hard error. - -`vcpkg_extract_source_archive` extracts the files to -`${CURRENT_BUILDTREES_DIR}//-.clean`. -When in editable mode, no `.clean` is appended, -to allow for a user to modify the sources. -`base-directory` defaults to `src`, -and `source-base` defaults to the stem of ``. -You can change these via the `BASE_DIRECTORY` and `SOURCE_BASE` arguments -respectively. -If you need to extract to a location that is not based in `CURRENT_BUILDTREES_DIR`, -you can use the `WORKING_DIRECTORY` argument to do the same. +By default, `vcpkg_extract_source_archive` removes this directory and moves all contents into the directory returned in ``. If there is no top-level directory, it is an error. + +With this flag, the top-level directory will be preserved and it is not an error to not have one. + +### SKIP_PATCH_CHECK + +Silence and ignore errors when applying patches. + +This option should only be passed when operating in an unstable mode like `--head`. If the sources are pinned, failing to apply a patch should be considered a fatal error. + +### PATCHES + +List of patches to apply to the extracted source. + +Patches will be applied in order, after any top-level directories are removed (see [`NO_REMOVE_ONE_LEVEL`](#no_remove_one_level)). Relative paths are interpreted relative to the current port directory. + +If a patch should be conditionally applied based on target information, you can construct a list and splat it. + +```cmake +set(patches "") +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND patches only-windows.patch) +endif() +vcpkg_extract_source_archive(src + ARCHIVE "${archive}" + PATCHES + always-applied.patch + ${patches} +) +``` + +### REF + +Pretty name for the extracted directory. + +Forward slashes (`/`) will be replaced with `-`. Otherwise identical to [`SOURCE_BASE`](#source_base). + +See [`WORKING_DIRECTORY`](#working_directory) for more details. + +### SOURCE_BASE + +Pretty name for the extracted directory. + +Must not contain path separators (`/` or `\\`). + +See [`WORKING_DIRECTORY`](#working_directory) for more details. + +### BASE_DIRECTORY + +Root subfolder for the extracted directory. + +Defaults to `src`. Must be a relative path. + +See [`WORKING_DIRECTORY`](#working_directory) for more details. + +### WORKING_DIRECTORY + +Root folder for the extracted directory. + +Defaults to `${CURRENT_BUILDTREES_DIR}/`. Must be an absolute path. + +`vcpkg_extract_source_archive` extracts the archive into `/-.clean`. If the folder exists, it is deleted before extraction. Without specifying `REF`, `SOURCE_BASE`, `BASE_DIRECTORY`, or `WORKING_DIRECTORY`, this will default to `${CURRENT_BUILDTREES_DIR}/src/-.clean`. + +In [`--editable`](../commands/install.md#editable) mode: +1. No `.clean` suffix is added to the extracted folder +2. The extracted folder is not deleted. If it exists, `vcpkg_extract_source_archive` does nothing. ## Examples -* [libraw](https://github.com/Microsoft/vcpkg/blob/master/ports/libraw/portfile.cmake) -* [protobuf](https://github.com/Microsoft/vcpkg/blob/master/ports/protobuf/portfile.cmake) -* [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) +```cmake +vcpkg_download_distfile( + archive # "archive" is set to the path to the downloaded file + URLS "https://nmap.org/dist/nmap-7.70.tar.bz2" + FILENAME "nmap-7.70.tar.bz2" + SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 +) +vcpkg_extract_source_archive( + src # "src" is set to the path to the extracted files + ARCHIVE "${archive}" + REF 7.70 + PATCHES 0001-disable-werror.patch +) +vcpkg_cmake_configure(SOURCE_PATH "${src}") +``` + +* [GitHub Search](https://github.com/microsoft/vcpkg/search?q=vcpkg_extract_source_archive+path%3A%2Fports) + +## Remarks + +**Deprecated Syntax** + +This command also supports a deprecated overload: + +```cmake +vcpkg_extract_source_archive( []) +``` + +The deprecated overload extracts `` into `${working_directory}/.extracted` if the target does not exist. This incorrect behavior allows patches and other modifications to leak between different builds, resulting in hard-to-debug errors. + +All uses of the deprecated overload should be replaced with the syntax in [Usage](#usage) above by adding an explicit [`ARCHIVE`](#archive) parameter and replacing direct references to the extracted path with uses of the [``](#out-var). + +**Replacement** + +This command replaces [`vcpkg_extract_source_archive_ex()`](vcpkg_extract_source_archive_ex.md). ## Source [scripts/cmake/vcpkg\_extract\_source\_archive.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive.cmake) diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md b/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md index 72b45d87c..b6f685393 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_extract_source_archive_ex.md @@ -1,24 +1,20 @@ # vcpkg_extract_source_archive_ex +**This function has been deprecated in favor of [`vcpkg_extract_source_archive()`].** + The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive_ex.md). -Extract an archive into the source directory. -Originally replaced [`vcpkg_extract_source_archive()`], -but new ports should instead use the second overload of -[`vcpkg_extract_source_archive()`]. +Extract an archive. ## Usage ```cmake vcpkg_extract_source_archive_ex( - [OUT_SOURCE_PATH ] - ... + [OUT_SOURCE_PATH ] + [...] ) ``` -See the documentation for [`vcpkg_extract_source_archive()`] for other parameters. -Additionally, `vcpkg_extract_source_archive_ex()` adds the `REF` and `WORKING_DIRECTORY` -parameters, which are wrappers around `SOURCE_BASE` and `BASE_DIRECTORY` -respectively. +This command forwards all options to [`vcpkg_extract_source_archive()`], with `` as the first argument. Equivalent to `vcpkg_extract_source_archive( ...)`. See the documentation for [`vcpkg_extract_source_archive()`] for parameter help. [`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_from_gitlab.md b/external_imported/vcpkg/docs/maintainers/vcpkg_from_gitlab.md index b49453da4..42a9a8ac7 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_from_gitlab.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_from_gitlab.md @@ -63,7 +63,7 @@ At least one of `REF` and `HEAD_REF` must be specified, however it is preferable This exports the `VCPKG_HEAD_VERSION` variable during head builds. ## Examples: -* [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_install_cmake.md b/external_imported/vcpkg/docs/maintainers/vcpkg_install_cmake.md index f8d3b6107..e7388783d 100644 --- a/external_imported/vcpkg/docs/maintainers/vcpkg_install_cmake.md +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_install_cmake.md @@ -1,6 +1,6 @@ # vcpkg_install_cmake -**This function has been deprecated in favor of [`vcpkg_cmake_install`](ports/vcpkg-cmake/vcpkg_cmake_install.md) from the vcpkg-cmake port.** +**This function has been deprecated in favor of [`vcpkg_cmake_install`](vcpkg_cmake_install.md) from the vcpkg-cmake port.** The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_cmake.md). diff --git a/external_imported/vcpkg/docs/maintainers/vcpkg_install_copyright.md b/external_imported/vcpkg/docs/maintainers/vcpkg_install_copyright.md new file mode 100644 index 000000000..a7679766c --- /dev/null +++ b/external_imported/vcpkg/docs/maintainers/vcpkg_install_copyright.md @@ -0,0 +1,69 @@ +# vcpkg_install_copyright + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_copyright.md). + +Merges multiple copyright files into a single file and install it. +Installs a single copyright file. + +## Usage + +```cmake +vcpkg_install_copyright(FILE_LIST ... [COMMENT]) +``` + +## Parameters + +### FILE_LIST +Specifies a list of license files with absolute paths. You must provide at least one file. + +### COMMENT +This optional parameter adds a comment before at the top of the file. + +## Notes + +This function creates a file called `copyright` inside `${CURRENT_PACKAGES_DIR}/share/${PORT}` + +If more than one file is provided, this function concatenates the contents of multiple copyright files to a single file. + +The resulting `copyright` file looks similar to this: + +``` +LICENSE-LGPL2.txt: + +Lorem ipsum dolor... + +LICENSE-MIT.txt: + +Lorem ipsum dolor sit amet... +``` + +Or with `COMMENT`: + +``` +A meaningful comment + +LICENSE-LGPL2.txt: + +Lorem ipsum dolor... + +LICENSE-MIT.txt: + +Lorem ipsum dolor sit amet... +``` + +## Examples + +```cmake +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE/license.md" "${SOURCE_PATH}/LICENSE/license_gpl.md" COMMENT "This is a comment") +``` + +You can also collect the required files using a `GLOB` pattern: + +```cmake +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) +``` + +## Source + +[vcpkg_install_copyright.md](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_copyright.cmake) diff --git a/external_imported/vcpkg/docs/regenerate.ps1 b/external_imported/vcpkg/docs/regenerate.ps1 deleted file mode 100755 index f2f888a77..000000000 --- a/external_imported/vcpkg/docs/regenerate.ps1 +++ /dev/null @@ -1,353 +0,0 @@ -#! /usr/bin/env pwsh - -[CmdletBinding()] -Param( - [String]$VcpkgRoot = '' -) - -if ([String]::IsNullOrEmpty($VcpkgRoot)) { - $VcpkgRoot = "${PSScriptRoot}/.." -} - -$VcpkgRoot = Resolve-Path $VcpkgRoot - -if (-not (Test-Path "$VcpkgRoot/.vcpkg-root")) { - throw "Invalid vcpkg instance, did you forget -VcpkgRoot?" -} - -class CMakeDocumentation { - [String]$Filename - [String[]]$ActualDocumentation - [Bool]$IsDeprecated - [String]$DeprecationMessage - [String]$DeprecatedByName - [String]$DeprecatedByPath - [Bool]$HasError -} - -[String[]]$cmakeScriptsPorts = @( - 'vcpkg-cmake' - 'vcpkg-cmake-config' - 'vcpkg-pkgconfig-get-modules' -) - -[CMakeDocumentation[]]$tableOfContents = @() -[CMakeDocumentation[]]$internalTableOfContents = @() -$portTableOfContents = [ordered]@{} - -function RelativeUnixPathTo -{ - Param( - [Parameter(Mandatory)] - [String]$Path, - [Parameter(Mandatory)] - [String]$Base - ) - - $Path = Resolve-Path -LiteralPath $Path - $Base = Resolve-Path -LiteralPath $Base - - if ($IsWindows) - { - if ((Split-Path -Qualifier $Path) -ne (Split-Path -Qualifier $Base)) - { - throw "It is not possible to get the relative unix path from $Base to $Path" - } - } - - $Path = $Path -replace '\\','/' - $Base = $Base -replace '\\','/' - - [String[]]$PathArray = $Path -split '/' - [String[]]$BaseArray = $Base -split '/' - - [String[]]$Result = @() - - $Idx = 0 - - while ($Idx -lt $PathArray.Length -and $Idx -lt $BaseArray.Length) - { - if ($PathArray[$Idx] -ne $BaseArray[$Idx]) - { - break - } - ++$Idx - } - - for ($BaseIdx = $Idx; $BaseIdx -lt $BaseArray.Length; ++$BaseIdx) - { - $Result += '..' - } - for ($PathIdx = $Idx; $PathIdx -lt $PathArray.Length; ++$PathIdx) - { - $Result += $PathArray[$PathIdx] - } - - $Result -join '/' -} -function WriteFile -{ - Param( - [String[]]$Value, - [String]$Path - ) - # note that we use this method of getting the utf-8 bytes in order to: - # - have no final `r`n, which happens when Set-Content does the thing automatically on Windows - # - have no BOM, which happens when one uses [System.Text.Encoding]::UTF8 - [byte[]]$ValueAsBytes = (New-Object -TypeName 'System.Text.UTF8Encoding').GetBytes($Value -join "`n") - Set-Content -Path $Path -Value $ValueAsBytes -AsByteStream -} -function FinalDocFile -{ - Param( - [CMakeDocumentation]$Docs, - [String]$PathToFile # something like docs/maintainers/blah.md - ) - [String[]]$documentation = @() - - if ($Docs.ActualDocumentation.Length -eq 0) - { - throw "Invalid documentation: empty docs" - } - - $documentation += $Docs.ActualDocumentation[0] # name line - if ($Docs.IsDeprecated) - { - if ($null -eq $Docs.DeprecationMessage -or $Docs.DeprecationMessage -match '^ *$') - { - if(![string]::IsNullOrEmpty($Docs.DeprecatedByName)) - { - $message = " in favor of [``$($Docs.DeprecatedByName)``]($($Docs.DeprecatedByPath)$($Docs.DeprecatedByName).md)" - $Docs.DeprecatedByPath -match '^ports/([a-z\-]+)/$' | Out-Null - $port = $matches[1] - if(![string]::IsNullOrEmpty($port)) - { - $message += " from the $port port." - } - } - $documentation += @("", "**This function has been deprecated$message**") - } - else - { - $documentation += @("", "**This function has been deprecated $($Docs.DeprecationMessage)**") - } - } - $documentation += @("", "The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/$PathToFile).") - - $documentation += $Docs.ActualDocumentation[1..$Docs.ActualDocumentation.Length] - - $relativePath = RelativeUnixPathTo $Docs.Filename $VcpkgRoot - $documentation += @( - "", - "## Source", - "[$($relativePath -replace '_','\_')](https://github.com/Microsoft/vcpkg/blob/master/$relativePath)", - "" - ) - - $documentation -} - -function ParseCmakeDocComment -{ - Param( - [Parameter(Mandatory)] - [System.IO.FileSystemInfo]$Filename - ) - - $Docs = New-Object 'CMakeDocumentation' - $Docs.HasError = $False - $Docs.IsDeprecated = $False - $Docs.Filename = $Filename.FullName - - [String[]]$contents = Get-Content $Filename - - if ($contents[0] -eq '# DEPRECATED') - { - $Docs.IsDeprecated = $True - } - elseif($contents[0] -match '^# DEPRECATED( BY (([^/]+/)+)(.+))?((: *)(.*))?$') - { - $Docs.IsDeprecated = $True - $Docs.DeprecatedByPath = $matches[2] - $Docs.DeprecatedByName = $matches[4] - $Docs.DeprecationMessage = $matches[7] - } - - [String]$startCommentRegex = '#\[(=*)\[' - [String]$endCommentRegex = '' - [Bool]$inComment = $False - - $contents = $contents | ForEach-Object { - if (-not $inComment) { - if ($_ -match "^\s*${startCommentRegex}(\.[a-z]*)?:?\s*$") { - if (-not [String]::IsNullOrEmpty($matches[2]) -and $matches[2] -ne '.md') { - Write-Warning "The documentation in $($Filename.FullName) doesn't seem to be markdown (extension: $($matches[2])). Only markdown is supported; please rewrite the documentation in markdown." - } - $inComment = $True - $endCommentRegex = "\]$($matches[1])\]" - } elseif ($_ -match $startCommentRegex) { - $Docs.HasError = $True - Write-Warning "Invalid start of comment -- the comment start must be at the beginning of the line. - (on line: `"$_`")" - } else { - # do nothing -- we're outside a comment, so cmake code - } - } else { - if ($_ -match "^\s*#?${endCommentRegex}\s*$") { - $inComment = $False - $endCommentRegex = '' - } elseif ($_ -match $endCommentRegex) { - $Docs.HasError = $True - Write-Warning "Invalid end of comment -- the comment end must be on it's own on a line. - (on line: `"$_`")" - } else { - # regular documentation line - $_ - } - } - } - - if ($inComment) { - Write-Warning "File $($Filename.FullName) has an unclosed comment." - $Docs.HasError = $True - } - - if (-not [String]::IsNullOrEmpty($contents)) - { - $Docs.ActualDocumentation = $contents - } - - $Docs -} - -Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { - $docs = ParseCmakeDocComment $_ - [Bool]$isInternalFunction = $_.Name.StartsWith("z_vcpkg") - - if ($docs.IsDeprecated -and $null -eq $docs.ActualDocumentation) - { - return - } - if ($docs.HasError) - { - return - } - - if ($null -ne $docs.ActualDocumentation) - { - if ($isInternalFunction) - { - $pathToFile = "maintainers/internal/$($_.BaseName).md" - WriteFile ` - -Path "$PSScriptRoot/$pathToFile" ` - -Value (FinalDocFile $docs) - - $internalTableOfContents += $docs - } - else - { - $pathToFile = "maintainers/$($_.BaseName).md" - WriteFile ` - -Path "$PSScriptRoot/$pathToFile" ` - -Value (FinalDocFile $docs $pathToFile) - - $tableOfContents += $docs - } - } - elseif (-not $isInternalFunction) - { - # don't worry about undocumented internal functions - Write-Warning "The cmake function in file $($_.FullName) doesn't seem to have any documentation. Make sure the documentation comments are correctly written." - } -} - -$cmakeScriptsPorts | ForEach-Object { - $portName = $_ - - Copy-Item "$VcpkgRoot/ports/$portName/README.md" "$PSScriptRoot/maintainers/ports/$portName.md" - New-Item -Path "$PSScriptRoot/maintainers/ports/$portName" -Force -ItemType 'Directory' | Out-Null - - $portTableOfContents[$portName] = @() - - Get-ChildItem "$VcpkgRoot/ports/$portName" -Filter '*.cmake' | ForEach-Object { - if ($_.Name -eq 'vcpkg-port-config.cmake' -or $_.Name -eq 'portfile.cmake') - { - return - } - - $docs = ParseCmakeDocComment $_ - - if ($docs.IsDeprecated -and $null -eq $docs.ActualDocumentation) - { - return - } - if ($docs.HasError) - { - return - } - - if ($null -ne $docs.ActualDocumentation) - { - $pathToFile = "maintainers/ports/$portName/$($_.BaseName).md" - WriteFile ` - -Path "$PSScriptRoot/$pathToFile" ` - -Value (FinalDocFile $docs $pathToFile) - $portTableOfContents[$portName] += $docs - } - else - { - Write-Warning "The cmake function in file $($_.FullName) doesn't seem to have any documentation. Make sure the documentation comments are correctly written." - } - } -} - -$portfileFunctionsContent = @( - '', - '', - '# Portfile helper functions') - -function GetDeprecationMessage -{ - Param( - [CMakeDocumentation]$Doc - ) - $message = '' - if ($Doc.IsDeprecated) - { - $message = " (deprecated" - if(![string]::IsNullOrEmpty($Doc.DeprecatedByName)) - { - $message += ", use [$($($Doc.DeprecatedByName) -replace '_','\_')]($($Doc.DeprecatedByPath)$($Doc.DeprecatedByName).md)" - } - $message += ")" - } - $message -} - -$DocsName = @{ expression = { Split-Path -LeafBase $_.Filename } } -$tableOfContents | Sort-Object -Property $DocsName -Culture '' | ForEach-Object { - $name = Split-Path -LeafBase $_.Filename - $portfileFunctionsContent += "- [$($name -replace '_','\_')]($name.md)" + $(GetDeprecationMessage $_) -} -$portfileFunctionsContent += @("", "## Internal Functions", "") -$internalTableOfContents | Sort-Object -Property $DocsName -Culture '' | ForEach-Object { - $name = Split-Path -LeafBase $_.Filename - $portfileFunctionsContent += "- [$($name -replace '_','\_')](internal/$name.md)" + $(GetDeprecationMessage $_) -} - -$portfileFunctionsContent += @("", "## Scripts from Ports") -$portTableOfContents.GetEnumerator() | ForEach-Object { - $portName = $_.Name - $cmakeDocs = $_.Value - $portfileFunctionsContent += @("", "### [$portName](ports/$portName.md)", "") - $cmakeDocs | ForEach-Object { - $name = Split-Path -LeafBase $_.Filename - $portfileFunctionsContent += "- [$($name -replace '_','\_')](ports/$portName/$name.md)" + $(GetDeprecationMessage $_) - } -} - -$portfileFunctionsContent += "" # final newline - -WriteFile ` - -Path "$PSScriptRoot/maintainers/portfile-functions.md" ` - -Value $portfileFunctionsContent diff --git a/external_imported/vcpkg/docs/specifications/registries-2.md b/external_imported/vcpkg/docs/specifications/registries-2.md index b44dacfe5..e2663ca3c 100644 --- a/external_imported/vcpkg/docs/specifications/registries-2.md +++ b/external_imported/vcpkg/docs/specifications/registries-2.md @@ -2,6 +2,8 @@ **Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** +**Up-to-date documentation is available at [Registries](../users/registries.md).** + Originally, the design of registries was decided upon and written up in the [Registries RFC](registries.md). However, as we've gotten further into the design process of git registries and versioning, and discussed the interaction of versioning with registries, diff --git a/external_imported/vcpkg/docs/specifications/registries.md b/external_imported/vcpkg/docs/specifications/registries.md index 896188f4c..68be1409d 100644 --- a/external_imported/vcpkg/docs/specifications/registries.md +++ b/external_imported/vcpkg/docs/specifications/registries.md @@ -2,6 +2,8 @@ **Note: this is the feature as it was initially specified and does not necessarily reflect the current behavior.** +**Up-to-date documentation is available at [Registries](../users/registries.md).** + As it is now, vcpkg has over 1400 ports in the default registry (the `/ports` directory). For the majority of users, this repository of packages is enough. However, many enterprises need to more closely control their dependencies for one reason or another, and this document diff --git a/external_imported/vcpkg/docs/users/android.md b/external_imported/vcpkg/docs/users/android.md index 3f5b03ec0..25fa27453 100644 --- a/external_imported/vcpkg/docs/users/android.md +++ b/external_imported/vcpkg/docs/users/android.md @@ -2,10 +2,7 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/android.md).** -Android is not officially supported, and there are no official android triplets at the moment. - -However, some packages can compile to Android, and the situation is improving: see the list of [PR related to Android](https://github.com/Microsoft/vcpkg/pulls?q=+android+). - +*Android is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* ## Android build requirements @@ -219,6 +216,6 @@ endif() cmake .. -DVCPKG_TARGET_ANDROID=ON -DANDROID_ABI=armeabi-v7a ```` -## Consume libraries using vpckg, and Android prefab Archives (AAR files) +## Consume libraries using vcpkg, and Android prefab Archives (AAR files) See [prefab.md](../specifications/prefab.md) diff --git a/external_imported/vcpkg/docs/users/binarycaching.md b/external_imported/vcpkg/docs/users/binarycaching.md index c37fd96fd..b091c33ce 100644 --- a/external_imported/vcpkg/docs/users/binarycaching.md +++ b/external_imported/vcpkg/docs/users/binarycaching.md @@ -96,14 +96,17 @@ steps: - name: 'Setup NuGet Credentials' shell: 'bash' # Replace with your organization name - run: > - ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` - sources add - -source "https://nuget.pkg.github.com//index.json" - -storepasswordincleartext - -name "GitHub" - -username "" - -password "${{ secrets.GITHUB_TOKEN }}" + run: | + ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` \ + sources add \ + -source "https://nuget.pkg.github.com//index.json" \ + -storepasswordincleartext \ + -name "GitHub" \ + -username "" \ + -password "${{ secrets.GITHUB_TOKEN }}" + ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` \ + setapikey "${{ secrets.GITHUB_TOKEN }}" \ + -source "https://nuget.pkg.github.com//index.json" # Omit this step if you're using manifests - name: 'vcpkg package restore' diff --git a/external_imported/vcpkg/docs/users/buildsystems/cmake-integration.md b/external_imported/vcpkg/docs/users/buildsystems/cmake-integration.md new file mode 100644 index 000000000..2f4671245 --- /dev/null +++ b/external_imported/vcpkg/docs/users/buildsystems/cmake-integration.md @@ -0,0 +1,226 @@ +# CMake Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/cmake-integration.md).** + +See [Installing and Using Packages Example: sqlite](../../examples/installing-and-using-packages.md) for a fully worked example using CMake. + +## Table of Contents + +- [`CMAKE_TOOLCHAIN_FILE`](#cmake_toolchain_file) +- [IDE Integration](#ide-integration) + - [Visual Studio Code (CMake Tools extension)](#visual-studio-code-cmake-tools-extension) + - [Visual Studio](#visual-studio) + - [CLion](#clion) +- [Using Multiple Toolchain Files](#using-multiple-toolchain-files) +- [Settings Reference](#settings-reference) + +## `CMAKE_TOOLCHAIN_FILE` + +Projects configured to use the vcpkg toolchain file (via the CMake setting `CMAKE_TOOLCHAIN_FILE`) can find libraries from vcpkg using the standard CMake functions: `find_package()`, `find_path()`, and `find_library()`. + +```no-highlight +cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake +``` + +Since version 3.21, CMake will use the environment variable `CMAKE_TOOLCHAIN_FILE`[1] as the default value for `CMAKE_TOOLCHAIN_FILE`. + +**cmd** +```cmd +set CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` +**Powershell** +```powershell +$env:CMAKE_TOOLCHAIN_FILE="[vcpkg root]/scripts/buildsystems/vcpkg.cmake" +``` +**bash** +```sh +export CMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +vcpkg does not automatically add any include or links paths into your project. To use a header-only library you can use `find_path()` which will correctly work on all platforms: + +```cmake +# To find and use catch2 +find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) +include_directories(${CATCH_INCLUDE_DIR}) +``` + +[1]: https://cmake.org/cmake/help/latest/envvar/CMAKE_TOOLCHAIN_FILE.html + +## IDE Integration + +### Visual Studio Code (CMake Tools Extension) + +Adding the following to your workspace `settings.json` will make CMake Tools automatically use vcpkg for libraries: + +```json +{ + "cmake.configureSettings": { + "CMAKE_TOOLCHAIN_FILE": "[vcpkg root]/scripts/buildsystems/vcpkg.cmake" + } +} +``` + +### Visual Studio + +In the CMake Settings Editor, add the path to the vcpkg toolchain file under `CMake toolchain file`: + +``` +[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +### CLion + +Open the Toolchains settings (`File > Settings` on Windows and Linux, `CLion > Preferences` on macOS), and go to the CMake settings (`Build, Execution, Deployment > CMake`). In `CMake options`, add the following line: + +``` +-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake +``` + +You must add this line to each profile separately. + +## Using Multiple Toolchain Files + +To combine vcpkg's toolchain file with another toolchain file, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`: + +```no-highlight +cmake ../my/project \ + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/toolchain.cmake +``` + +Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: + +```cmake +# MyToolchain.cmake +set(CMAKE_CXX_COMPILER ...) +set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) +include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) +``` + +**Note: vcpkg does not automatically apply your toolchain's settings, such as your compiler or compilation flags, while building libraries. To change vcpkg's library settings, you must make a [custom triplet file](../triplets.md) (which can [share your toolchain](../triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** + +## Settings Reference + +All vcpkg-affecting variables must be defined before the first `project()` directive, such as via the command line or `set()` statements. + +### `VCPKG_TARGET_TRIPLET` + +This setting controls the [triplet](../triplets.md) vcpkg will install and consume libraries from. + +If unset, vcpkg will automatically detect an appropriate default triplet given the current compiler settings. If you change this CMake variable, you must delete your cache and reconfigure. + +### `VCPKG_HOST_TRIPLET` + +This variable controls which [triplet](../triplets.md) host dependencies will be installed for. + +If unset, vcpkg will automatically detect an appropriate native triplet (x64-windows, x64-osx, x64-linux). + +See also [Host Dependencies](../host-dependencies.md). + +### `VCPKG_INSTALLED_DIR` + +This variable sets the location where libraries will be installed and consumed from. + +In manifest mode, the default is `${CMAKE_BINARY_DIR}/vcpkg_installed`. + +In classic mode, the default is `${VCPKG_ROOT}/installed`. + +### `VCPKG_MANIFEST_MODE` + +This variable forces vcpkg to operate in either manifest mode or classic mode. + +Defaults to `ON` when `VCPKG_MANIFEST_DIR` is non-empty or `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +To disable manifest mode while a `vcpkg.json` is detected, set this to `OFF`. + +### `VCPKG_MANIFEST_DIR` + +This variable specifies an alternate folder containing a `vcpkg.json` manifest. + +Defaults to `${CMAKE_SOURCE_DIR}` if `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. + +### `VCPKG_MANIFEST_INSTALL` + +This variable controls whether vcpkg will be automatically run to install your dependencies during your configure step. + +Defaults to `ON` if `VCPKG_MANIFEST_MODE` is `ON`. + +### `VCPKG_BOOTSTRAP_OPTIONS` + +This variable can be set to additional command parameters to pass to `./bootstrap-vcpkg`. + +In manifest mode, vcpkg will be automatically bootstrapped if the executable does not exist. + +### `VCPKG_OVERLAY_TRIPLETS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-triplets=...` + +### `VCPKG_OVERLAY_PORTS` + +This variable can be set to a list of paths to be passed on the command line as `--overlay-ports=...` + +### `VCPKG_MANIFEST_FEATURES` + +This variable can be set to a list of features to activate when installing from your manifest. + +For example, features can be used by projects to control building with additional dependencies to enable tests or samples: + +```json +{ + "name": "mylibrary", + "version": "1.0", + "dependencies": [ "curl" ], + "features": { + "samples": { + "description": "Build Samples", + "dependencies": [ "fltk" ] + }, + "tests": { + "description": "Build Tests", + "dependencies": [ "gtest" ] + } + } +} +``` +```cmake +# CMakeLists.txt + +option(BUILD_TESTING "Build tests" OFF) +if(BUILD_TESTING) + list(APPEND VCPKG_MANIFEST_FEATURES "tests") +endif() + +option(BUILD_SAMPLES "Build samples" OFF) +if(BUILD_SAMPLES) + list(APPEND VCPKG_MANIFEST_FEATURES "samples") +endif() + +project(myapp) + +# ... +``` + +### `VCPKG_MANIFEST_NO_DEFAULT_FEATURES` + +This variable controls activation of default features in addition to those listed in `VCPKG_MANIFEST_FEATURES`. If set to `ON`, default features will not be automatically activated. + +Defaults to `OFF`. + +### `VCPKG_INSTALL_OPTIONS` + +This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic installation. + +### `VCPKG_PREFER_SYSTEM_LIBS` + +**This feature has been deprecated. Use empty overlay ports instead.** + +This variable controls whether vcpkg will append instead of prepend its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. + +Defaults to `OFF`. + +### `VCPKG_FEATURE_FLAGS` + +This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to experimental behavior. + +See the `--feature-flags=` command line option for more information. diff --git a/external_imported/vcpkg/docs/users/buildsystems/export-command.md b/external_imported/vcpkg/docs/users/buildsystems/export-command.md new file mode 100644 index 000000000..c591d1889 --- /dev/null +++ b/external_imported/vcpkg/docs/users/buildsystems/export-command.md @@ -0,0 +1,20 @@ +# `export` Command + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/export-command.md).** + +The `export` command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. `export` only supports classic mode at this time. + +- `--nuget`: NuGet package +- `--zip`: Zip archive +- `--7zip`: 7Zip archive +- `--raw`: Raw, uncompressed folder + +Each of these have the same internal layout which mimics the layout of a full vcpkg instance: + +- `installed/` contains the library files +- `scripts/buildsystems/vcpkg.cmake` is the [CMake toolchain file](cmake-integration.md) +- `scripts/buildsystems/msbuild/vcpkg.props` and `scripts/buildsystems/msbuild/vcpkg.targets` are the [MSBuild integration files](msbuild-integration.md) + +NuGet package exports will also contain a `build\native\vcpkg.targets` that integrates with MSBuild projects using the NuGet package manager. + +Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. diff --git a/external_imported/vcpkg/docs/users/buildsystems/integration.md b/external_imported/vcpkg/docs/users/buildsystems/integration.md new file mode 100644 index 000000000..67706600f --- /dev/null +++ b/external_imported/vcpkg/docs/users/buildsystems/integration.md @@ -0,0 +1,10 @@ +# Buildsystem Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/integration.md).** + +vcpkg supports use from any buildsystem and has specific native integration into MSBuild and CMake. + +- [MSBuild Integration (Visual Studio)](msbuild-integration.md) +- [CMake Integration](cmake-integration.md) +- [Manual Integration](manual-integration.md) +- [`export` Command](export-command.md) diff --git a/external_imported/vcpkg/docs/users/buildsystems/manual-integration.md b/external_imported/vcpkg/docs/users/buildsystems/manual-integration.md new file mode 100644 index 000000000..5062123f1 --- /dev/null +++ b/external_imported/vcpkg/docs/users/buildsystems/manual-integration.md @@ -0,0 +1,31 @@ +# Manual Integration + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/manual-integration.md).** + +When installing libraries, vcpkg creates a single common layout partitioned by triplet. + +The root of the tree in classic mode is `[vcpkg root]/installed`. The root of the tree in manifest mode is `[vcpkg.json directory]/vcpkg_installed`. + +Underneath this root, in a subfolder named after the triplet: + +* Header files: `include/` +* Release `.lib`, `.a`, and `.so` files: `lib/` or `lib/manual-link/` +* Release `.dll` files: `bin/` +* Release `.pc` files: `lib/pkgconfig/` +* Debug `.lib`, `.a`, and `.so` files: `debug/lib/` or `debug/lib/manual-link/` +* Debug `.dll` files: `debug/bin/` +* Debug `.pc` files: `debug/lib/pkgconfig/` +* Tools: `tools/[portname]/` + +For example, `zlib.h` for `zlib:x64-windows` in classic mode is located at `[vcpkg root]/installed/x64-windows/include/zlib.h`. + +See your build system specific documentation for how to use prebuilt binaries. For example, `Makefile` projects often accept environment variables: + +```sh +export CXXFLAGS=-I$(pwd)/installed/x64-linux/include +export CFLAGS=-I$(pwd)/installed/x64-linux/include +export LDFLAGS=-L$(pwd)/installed/x64-linux/lib +export PKG_CONFIG_PATH=$(pwd)/installed/x64-linux/lib/pkgconfig:$PKG_CONFIG_PATH +``` + +_On Windows dynamic triplets, such as x64-windows:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. diff --git a/external_imported/vcpkg/docs/users/buildsystems/msbuild-integration.md b/external_imported/vcpkg/docs/users/buildsystems/msbuild-integration.md new file mode 100644 index 000000000..3995e5bc6 --- /dev/null +++ b/external_imported/vcpkg/docs/users/buildsystems/msbuild-integration.md @@ -0,0 +1,138 @@ +# MSBuild Integration (Visual Studio) + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/buildsystems/msbuild-integration.md).** + +## Table of Contents + +- [Integration Methods](#integration-methods) + - [User-wide integration](#user-wide-integration) + - [Import `.props` and `.targets`](#import-props-and-targets) + - [Linked NuGet Package](#linked-nuget-package) +- [Common Configuration](#common-configuration) +- [Manifest Mode Configuration](#manifest-mode-configuration) + +## Integration Methods + +### User-wide integration + +```no-highlight +vcpkg integrate install +``` +This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience. + +For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually. + +Here are some examples, though this is not an exhaustive list: + +- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main` +- SDL2 provides `SDL2main` +- SFML provides `sfml-main` +- Boost.Test provides `boost_test_exec_monitor` + +To get a full list for all your installed packages, run `vcpkg owns manual-link`. + +### Import `.props` and `.targets` + +vcpkg can also be integrated into MSBuild projects by explicitly importing the `scripts/buildsystems/vcpkg.props` and `scripts/buildsystems/vcpkg.targets` files into each `.vcxproj`. By using relative paths, this enables vcpkg to be consumed by a submodule and automatically acquired by users when they run `git clone`. + +The easiest way to add these to every project in your solution is to create `Directory.Build.props` and `Directory.Build.targets` files at the root of your repository. + +The following examples assume they are at the root of your repository with a submodule of `microsoft/vcpkg` at `vcpkg`. + +**Example `Directory.Build.props`**: +```xml + + + +``` + +**Example `Directory.Build.targets`**: +```xml + + + +``` + +More information about `Directory.Build.targets` and `Directory.Build.props` can be found in the [Customize your build][1] section of the official MSBuild documentation. + +[1]: https://docs.microsoft.com/visualstudio/msbuild/customize-your-build#directorybuildprops-and-directorybuildtargets + +### Linked NuGet Package + +**Note: This approach is not recommended for new projects, since it makes them difficult to share with others. For a portable, self-contained NuGet package, see the [`export command`](export-command.md)** + +VS projects can also be integrated through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. + +```no-highlight +PS D:\src\vcpkg> .\vcpkg integrate project +Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg + +With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: + Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" +``` + +*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* + +## Common Configuration + +### `VcpkgEnabled` (Use Vcpkg) + +This can be set to "false" to explicitly disable vcpkg integration for the project + +### `VcpkgConfiguration` (Vcpkg Configuration) + +If your configuration names are too complex for vcpkg to guess correctly, you can assign this property to `Release` or `Debug` to explicitly tell vcpkg what variant of libraries you want to consume. + +### `VcpkgEnableManifest` (Use Vcpkg Manifest) + +This property must be set to `true` in order to consume from a local `vcpkg.json` file. If set to `false`, any local `vcpkg.json` files will be ignored. + +This currently defaults to `false`, but will default to `true` in the future. + +### `VcpkgTriplet` (Triplet) + +This property controls the triplet to consume libraries from, such as `x64-windows-static` or `arm64-windows`. + +If this is not explicitly set, vcpkg will deduce the correct triplet based on your Visual Studio settings. vcpkg will only deduce triplets that use dynamic library linkage and dynamic CRT linkage; if you want static dependencies or to use the static CRT (`/MT`), you will need to set the triplet manually. + +You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: + +> *Shortcut: Ctrl+Q "build and run"* +> +> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity + +See also [Triplets](../triplets.md) + +### `VcpkgHostTriplet` (Host Triplet) + +This can be set to a custom triplet to use for resolving host dependencies. + +If unset, this will default to the "native" triplet (x64-windows). + +See also [Host Dependencies](../host-dependencies.md). + +### `VcpkgInstalledDir` (Installed Directory) + +This property defines the location vcpkg will install and consume libraries from. + +In manifest mode, this defaults to `$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\`. In classic mode, this defaults to `$(VcpkgRoot)\installed\`. + +## Manifest Mode Configuration + +To use manifests (`vcpkg.json`) with MSBuild, first you need to use one of the integration methods above. Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use Vcpkg Manifest` (note: you may need to reload the IDE to see the vcpkg Property Page). + +vcpkg will automatically run during your project's build and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` adjacent to the `vcpkg.json` file; these libraries will then automatically be included in and linked to your MSBuild projects. + +**Known issues** + +* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will not respond to changes unless a `.cpp` is edited. + + + +### `VcpkgAdditionalInstallOptions` (Additional Options) + +When using a manifest, this option specifies additional command line flags to pass to the underlying vcpkg tool invocation. This can be used to access features that have not yet been exposed through another option. + +### `VcpkgManifestInstall` (Install Vcpkg Dependencies) + +This property can be set to `false` to disable automatic dependency restoration during project build. Dependencies must be manually restored via the vcpkg command line separately. diff --git a/external_imported/vcpkg/docs/users/config-environment.md b/external_imported/vcpkg/docs/users/config-environment.md index 1ba428a03..cb0d40b9a 100644 --- a/external_imported/vcpkg/docs/users/config-environment.md +++ b/external_imported/vcpkg/docs/users/config-environment.md @@ -14,9 +14,7 @@ This environment variable can be set to an existing directory to use for storing This environment variable can be set to a comma-separated list of off-by-default features in vcpkg. These features are subject to change without notice and should be considered highly unstable. -Non-exhaustive list of off-by-default features: - -- `manifest` +There are no off-by-default feature flags at this time. #### EDITOR @@ -61,6 +59,10 @@ List paths to overlays using the platform dependent PATH separator (Windows `;`, This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries. +#### VCPKG_FORCE_DOWNLOADED_BINARIES + +This environment variable, if set, ignores the use of the system binaries and will always download and use the version defined by vcpkg. + #### VCPKG_KEEP_ENV_VARS This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to @@ -71,25 +73,26 @@ pass in environment variables that should cause rebuilds on change, see [`VCPKG_ Example: `FOO_SDK_DIR;BAR_SDK_DIR` + #### VCPKG_MAX_CONCURRENCY -This environment variables limits the amount of concurrency requested by underlying buildsystems. If unspecified, this defaults to logical cores + 1. +This environment variables limits the amount of concurrency used by underlying buildsystems. If unspecified, this defaults to logical cores + 1. #### VCPKG_DEFAULT_BINARY_CACHE -This environment variable redirects the default location to store binary packages. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable redirects the default location to store binary packages. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_BINARY_SOURCES -This environment variable adds or removes binary sources. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable adds or removes binary sources. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_NUGET_REPOSITORY -This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#Configuration) for more details. +This environment variable changes the metadata of produced NuGet packages. See [Binary Caching](binarycaching.md#configuration) for more details. #### VCPKG_USE_NUGET_CACHE -This environment variable allows using NuGet's cache for every nuget-based binary source. See [Binary Caching](binarycaching.md#NuGets-cache) for more details. +This environment variable allows using NuGet's cache for every nuget-based binary source. See [Binary Caching](binarycaching.md#nuget-provider-configuration) for more details. #### X_VCPKG_ASSET_SOURCES diff --git a/external_imported/vcpkg/docs/users/integration.md b/external_imported/vcpkg/docs/users/integration.md deleted file mode 100644 index 15a3072e3..000000000 --- a/external_imported/vcpkg/docs/users/integration.md +++ /dev/null @@ -1,177 +0,0 @@ -# Buildsystem Integration - -**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/integration.md).** -## Table of Contents -- [MSBuild Integration (Visual Studio)](#msbuild-integration-visual-studio) - - [User-wide integration](#user-wide-integration) - - [Per-project Integration](#per-project-integration) - - [Changing the triplet](#msbuild-changing-the-triplet) -- [CMake Integration](#cmake-integration) - - [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option) - - [Using multiple toolchain files](#using-multiple-toolchain-files) - - [Changing the triplet](#cmake-changing-the-triplet) -- [Manual Compiler Setup](#manual-compiler-setup) -- [`export` Command](#export-command) - -The buildsystem-specific integration styles have heuristics to deduce the correct [triplet][]. This can be overridden in a native way for [MSBuild](#msbuild-changing-the-triplet) and [CMake](#cmake-changing-the-triplet). - -## MSBuild Integration (Visual Studio) - -**If you are using manifest mode(`vcpkg.json`) see [here](manifests.md#msbuild-integration) for additional configuration options.** -### User-wide integration -```no-highlight -vcpkg integrate install -``` -This will implicitly add Include Directories, Link Directories, and Link Libraries for all packages installed with Vcpkg to all VS2015, VS2017 and VS2019 MSBuild projects. We also add a post-build action for executable projects that will analyze and copy any DLLs you need to the output folder, enabling a seamless F5 experience. - -For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually. - -Here are some examples, though this is not an exhaustive list: - -- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main` -- SDL2 provides `SDL2main` -- SFML provides `sfml-main` -- Boost.Test provides `boost_test_exec_monitor` - -To get a full list for all your installed packages, run `vcpkg owns manual-link`. - -**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#msbuild-integration) for all available options.** - -### Per-project integration - -**Note: This approach is not recommended for new projects, since it makes them difficult to share with others.** - -**For a portable, self-contained NuGet package, see the [`export command`](#export-command)** - -We also provide individual VS project integration through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. -```no-highlight -PS D:\src\vcpkg> .\vcpkg integrate project -Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg - -With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: - Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" -``` -*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* - - - -### Changing the triplet -You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: - -> *Shortcut: Ctrl+Q "build and run"* -> -> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity - -To override the automatically chosen [triplet][], you can specify the MSBuild property `VcpkgTriplet` in your `.vcxproj`. We recommend adding this to the `Globals` PropertyGroup. -```xml - - - x86-windows-static - x64-windows-static - -``` - -## CMake Integration -```no-highlight -cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake -``` -Projects configured with the Vcpkg toolchain file will have the appropriate Vcpkg folders added to the cmake search paths. This makes all libraries available to be found through `find_package()`, `find_path()`, and `find_library()`. - -See [Installing and Using Packages Example: sqlite](../examples/installing-and-using-packages.md) for a fully worked example using our CMake toolchain. - -Note that we do not automatically add ourselves to your compiler include paths. To use a header-only library, simply use `find_path()`, which will correctly work on all platforms: -```cmake -# To find and use catch -find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) -include_directories(${CATCH_INCLUDE_DIR}) -``` - -**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#cmake-integration) for all available options.** - -For different IDE integrations see [here](../../README.md#using-vcpkg-with-cmake). - -### Using an environment variable instead of a command line option - -The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` directive is first called. This means that you can easily read from an environment variable to avoid passing it on the configure line: - -```cmake -if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") -endif() - -project(myproject CXX) -``` - -### Using multiple toolchain files - -To use an external toolchain file with a project using vcpkg, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` on the configure line: -```no-highlight -cmake ../my/project \ - -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/compiler-settings-toolchain.cmake -``` - -Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: -```cmake -# MyToolchain.cmake -set(CMAKE_CXX_COMPILER ...) -set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) -include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) -``` -**Note: vcpkg does _not_ see the settings in your own triplets, such as your compiler or compilation flags. To change vcpkg's settings, you must make a [custom triplet file](triplets.md) (which can [share your own toolchain](triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** - - - -### Changing the triplet -You can set `VCPKG_TARGET_TRIPLET` on the configure line: -```no-highlight -cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... -``` -If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): - -```cmake -if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") -endif() -``` -Finally, if you have your own toolchain file, you can set `VCPKG_TARGET_TRIPLET` there: -```cmake -# MyToolchain.cmake -set(CMAKE_CXX_COMPILER ...) -set(VCPKG_TARGET_TRIPLET x64-my-custom-triplet) -``` - -## Manual Compiler Setup - -Libraries are installed into the `installed\` subfolder in classic mode, partitioned by triplet (e.g. x86-windows): - -* The header files are installed to `installed\x86-windows\include` -* Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link` -* Release `.dll` files are installed to `installed\x86-windows\bin` -* Debug `.lib` files are installed to `installed\x86-windows\debug\lib` or `installed\x86-windows\debug\lib\manual-link` -* Debug `.dll` files are installed to `installed\x86-windows\debug\bin` - -See your build system specific documentation for how to use prebuilt binaries. - -_On Windows dynamic triplets:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. - -## Export Command -This command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. - -- `--nuget`: NuGet package -- `--zip`: Zip archive -- `--7zip`: 7Zip archive -- `--raw`: Raw, uncompressed folder - -Each of these have the same internal layout which mimics the layout of a full vcpkg instance: - -- `installed\` contains the installed package files -- `scripts\buildsystems\vcpkg.cmake` is a toolchain file suitable for use with CMake - -Additionally, NuGet packages will contain a `build\native\vcpkg.targets` that integrates with MSBuild projects. - -Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. - - -[triplet]: triplets.md diff --git a/external_imported/vcpkg/docs/users/manifests.md b/external_imported/vcpkg/docs/users/manifests.md index 387511b65..fc4e7dac1 100644 --- a/external_imported/vcpkg/docs/users/manifests.md +++ b/external_imported/vcpkg/docs/users/manifests.md @@ -16,9 +16,6 @@ project directory or build directory. This mode acts more similarly to language recommend using this manifest mode whenever possible, because it allows one to encode a project's dependencies explicitly in a project file, rather than in the documentation, making your project much easier to consume. -Manifest mode is in beta, but it can be used from the CMake or MSBuild integration, which will be stable when used via -things like `find_package`. This is the recommended way to use manifest mode. - Check out the [manifest cmake example](../examples/manifest-mode-cmake.md) for an example project using CMake and manifest mode. @@ -26,11 +23,21 @@ manifest mode. - [Simple Example Manifest](#simple-example-manifest) - [Manifest Syntax Reference](#manifest-syntax-reference) -- [Command Line Interface](#command-line-interface) -- [CMake Integration](#cmake-integration) -- [MSBuild Integration](#msbuild-integration) - -See also [the original specification](../specifications/manifests.md) for more low-level details. + - [`"name"`](#name) + - [Version Fields](#version-fields) + - [`"description"`](#description) + - [`"builtin-baseline"`](#builtin-baseline) + - [`"dependencies"`](#dependencies) + - [`"name"`](#dependencies-name) + - [`"default-features"`](#dependencies-default-features) + - [`"features"`](#dependencies-features) + - [`"host"`](#host) + - [`"platform"`](#platform) + - [`"version>="`](#version-gt) + - [`"overrides"`](#overrides) + - [`"supports"`](#supports) + - [`"features"`](#features) + - [`"default-features"`](#default-features) ## Simple Example Manifest @@ -61,8 +68,11 @@ Manifests follow strict JSON: they can't contain C++-style comments (`//`) nor t you can use field names that start with `$` to write your comments in any object that has a well-defined set of keys. These comment fields are not allowed in any objects which permit user-defined keys (such as `"features"`). -Each manifest contains a top level object with the fields documented below; the most important ones are -[`"name"`](#name), the [version fields](#version-fields), and [`"dependencies"`](#dependencies): +The latest JSON Schema is available at https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json. IDEs with JSON Schema support such as Visual Studio and Visual Studio Code can use this file to provide IntelliSense and syntax checking. For most IDEs, you should set `"$schema"` in your `vcpkg.json` to this URL (like the above example). + +Each manifest contains a top level object with the following fields: + + ### `"name"` @@ -70,9 +80,7 @@ This is the name of your project! It must be formatted in a way that vcpkg under it must be lowercase alphabetic characters, digits, and hyphens, and it must not start nor end with a hyphen. For example, `Boost.Asio` might be given the name `boost-asio`. -This is a required field. - -### Version fields +### Version Fields There are four version field options, depending on how the port orders its releases. @@ -94,6 +102,8 @@ field should not be used. See [versioning](versioning.md#version-schemes) for more details. + + ### `"description"` This is where you describe your project. Give it a good description to help in searching for it! @@ -101,17 +111,26 @@ This can be a single string, or it can be an array of strings; in the latter case, the first string is treated as a summary, while the remaining strings are treated as the full description. + + ### `"builtin-baseline"` This field indicates the commit of vcpkg which provides global minimum version -information for your manifest. It is required for top-level manifest files using -versioning. +information for your manifest. + +It is required for top-level manifest files using versioning without a specified [`"default-registry"`](registries.md#configuration-default-registry). It has the same semantic as defining your default registry to be: +```json +{ + "default-registry": { + "kind": "builtin", + "baseline": "" + } +} +``` -This is a convenience field that has the same semantic as replacing your default -registry in -[`vcpkg-configuration.json`](registries.md#configuration-default-registry). +See [versioning](versioning.md#baselines) for more semantic details. -See [versioning](versioning.md#builtin-baseline) for more semantic details. + ### `"dependencies"` @@ -141,10 +160,15 @@ if they were to use you). It's an array of strings and objects: ] ``` + + #### `"name"` Field The name of the dependency. This follows the same restrictions as the [`"name"`](#name) property for a project. + + + #### `"features"` and `"default-features"` Fields `"features"` is an array of feature names which tell you the set of features that the @@ -164,6 +188,18 @@ Then, you might just ask for: } ``` + + +#### `"host"` Field + +A boolean indicating that the dependency must be built for the [host triplet](host-dependencies.md) instead of the current port's triplet. Defaults to `false`. + +Any dependency that provides tools or scripts which should be "executed" during a build (such as buildsystems, code generators, or helpers) should be marked as `"host": true`. This enables correct cross-compilation in cases that the target is not executable -- such as when compiling for `arm64-android`. + +See [Host Dependencies](host-dependencies.md) for more information. + + + #### `"platform"` Field The `"platform"` field defines the platforms where the dependency should be installed - for example, @@ -189,6 +225,8 @@ The common identifiers are: although one can define their own. + + #### `"version>="` Field A minimum version constraint on the dependency. @@ -198,6 +236,8 @@ This field specifies the minimum version of the dependency, optionally using a See also [versioning](versioning.md#version-1) for more semantic details. + + ### `"overrides"` This field pins exact versions for individual dependencies. @@ -216,6 +256,8 @@ See also [versioning](versioning.md#overrides) for more semantic details. ] ``` + + ### `"supports"` If your project doesn't support common platforms, you can tell your users this with the `"supports"` field. @@ -223,6 +265,8 @@ It uses the same platform expressions as [`"platform"`](#platform), from depende `"supports"` field of features. For example, if your library doesn't support linux, you might write `{ "supports": "!linux" }`. + + ### `"features"` and `"default-features"` @@ -279,243 +323,3 @@ and that's the `"default-features"` field, which is an array of feature names. } } ``` - -## Command Line Interface - -When invoked from any subdirectory of the directory containing `vcpkg.json`, `vcpkg install` with no package arguments -will install all manifest dependencies into `/vcpkg_installed/`. Most of `vcpkg -install`'s classic mode parameters function the same in manifest mode. - -### `--x-install-root=` - -**Experimental and may change or be removed at any time** - -Specifies an alternate install location than `/vcpkg_installed/`. - -### `--triplet=` - -Specify the triplet to be used for installation. - -Defaults to the same default triplet as in classic mode. - -### `--x-feature=` - -**Experimental and may change or be removed at any time** - -Specify an additional feature from the `vcpkg.json` to install dependencies from. - -### `--x-no-default-features` - -**Experimental and may change or be removed at any time** - -Disables automatic activation of all default features listed in the `vcpkg.json`. - -### `--x-manifest-root=` - -**Experimental and may change or be removed at any time** - -Specifies the directory containing `vcpkg.json`. - -Defaults to searching upwards from the current working directory. - -## CMake Integration - -Our [CMake Integration](integration.md#cmake) will automatically detect a `vcpkg.json` manifest file in the same -directory as the top-level `CMakeLists.txt` (`${CMAKE_SOURCE_DIR}/vcpkg.json`) and activate manifest mode. Vcpkg will be -automatically bootstrapped if missing and invoked to install your dependencies into your local build directory -(`${CMAKE_BINARY_DIR}/vcpkg_installed`). - -### Configuration - -All vcpkg-affecting variables must be defined before the first `project()` directive, such as via the command line or -`set()` statements. - -#### `VCPKG_TARGET_TRIPLET` - -This variable controls which triplet dependencies will be installed for. - -If unset, vcpkg will automatically detect an appropriate default triplet given the current compiler settings. - -#### `VCPKG_HOST_TRIPLET` - -This variable controls which triplet host dependencies will be installed for. - -If unset, vcpkg will automatically detect an appropriate native triplet (x64-windows, x64-osx, x64-linux). - -See also [Host Dependencies](host-dependencies.md). - -### `VCPKG_INSTALLED_DIR` - -This variable allows one to set the location of the `vcpkg_installed` directory. -It defaults to `${CMAKE_BINARY_DIR}/vcpkg_installed`. - -#### `VCPKG_MANIFEST_MODE` - -This variable controls whether vcpkg operates in manifest mode or in classic mode. To disable manifest mode even with a -`vcpkg.json`, set this to `OFF`. - -Defaults to `ON` when `VCPKG_MANIFEST_DIR` is non-empty or `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. - -#### `VCPKG_MANIFEST_DIR` - -This variable can be defined to specify an alternate folder containing your `vcpkg.json` manifest. - -Defaults to `${CMAKE_SOURCE_DIR}` if `${CMAKE_SOURCE_DIR}/vcpkg.json` exists. - -#### `VCPKG_MANIFEST_INSTALL` - -This variable controls whether vcpkg will be automatically run to install your dependencies during your configure step. - -Defaults to `ON` if `VCPKG_MANIFEST_MODE` is `ON`. - -#### `VCPKG_BOOTSTRAP_OPTIONS` - -This variable can be set to additional command parameters to pass to `./bootstrap-vcpkg` (run in automatic restore mode -if the vcpkg tool does not exist). - -#### `VCPKG_OVERLAY_TRIPLETS` - -This variable can be set to a list of paths to be passed on the command line as `--overlay-triplets=...` - -#### `VCPKG_OVERLAY_PORTS` - -This variable can be set to a list of paths to be passed on the command line as `--overlay-ports=...` - -#### `VCPKG_MANIFEST_FEATURES` - -This variable can be set to a list of features to treat as active when installing from your manifest. - -For example, Features can be used by projects to control building with additional dependencies to enable tests or -samples: - -```json -{ - "name": "mylibrary", - "version": "1.0", - "dependencies": [ "curl" ], - "features": { - "samples": { - "description": "Build Samples", - "dependencies": [ "fltk" ] - }, - "tests": { - "description": "Build Tests", - "dependencies": [ "gtest" ] - } - } -} -``` -```cmake -# CMakeLists.txt - -option(BUILD_TESTING "Build tests" OFF) -if(BUILD_TESTING) - list(APPEND VCPKG_MANIFEST_FEATURES "tests") -endif() - -option(BUILD_SAMPLES "Build samples" OFF) -if(BUILD_SAMPLES) - list(APPEND VCPKG_MANIFEST_FEATURES "samples") -endif() - -project(myapp) - -# ... -``` - -#### `VCPKG_MANIFEST_NO_DEFAULT_FEATURES` - -This variable controls whether to automatically activate all default features in addition to those listed in -`VCPKG_MANIFEST_FEATURES`. If set to `ON`, default features will not be automatically activated. - -Defaults to `OFF`. - -#### `VCPKG_INSTALL_OPTIONS` - -This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic -installation. - -#### `VCPKG_PREFER_SYSTEM_LIBS` - -This variable controls whether vcpkg will appends instead of prepends its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. - -Defaults to `OFF`. - -#### `VCPKG_FEATURE_FLAGS` - -This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to -experimental behavior. - -See the `--feature-flags=` command line option for more information. - -## MSBuild Integration - -To use manifests with MSBuild, first you need to use an [existing integration method](integration.md#with-msbuild). -Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the -property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use -Vcpkg Manifest`. - -As part of your project's build, vcpkg automatically be run and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` -adjacent to the `vcpkg.json` file; these files will then automatically be included in and linked to your MSBuild -projects. - -### Known issues - -* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will -not respond to changes unless a `.cpp` is edited. - -### MSBuild Properties - -When using Visual Studio 2015 integration, these properties can be set in your project file before the - -```xml - -``` - -line, which unfortunately requires manual editing of the `.vcxproj` or passing on the msbuild command line with `/p:`. -With 2017 or later integration, These properties can additionally be set via the Visual Studio GUI under -`Project Properties -> Vcpkg` or via a common `.props` file imported between `Microsoft.Cpp.props` and -`Microsoft.Cpp.targets`. - -#### `VcpkgEnabled` (Use Vcpkg) - -This can be set to "false" to explicitly disable vcpkg integration for the project - -#### `VcpkgTriplet` (Triplet) - -This can be set to a custom triplet to use for integration (such as x64-windows-static) - -#### `VcpkgHostTriplet` (Host Triplet) - -This can be set to a custom triplet to use for resolving host dependencies. - -If unset, this will default to the "native" triplet (x64-windows, x64-osx, x64-linux). - -See also [Host Dependencies](host-dependencies.md). - -#### `VcpkgAdditionalInstallOptions` (Additional Options) - -When using a manifest, this option specifies additional command line flags to pass to the underlying vcpkg tool -invocation. This can be used to access features that have not yet been exposed through another option. - -#### `VcpkgConfiguration` (Vcpkg Configuration) - -If your configuration names are too complex for vcpkg to guess correctly, you can assign this property to `Release` or -`Debug` to explicitly tell vcpkg what variant of libraries you want to consume. - -#### `VcpkgEnableManifest` (Use Vcpkg Manifest) - -This property must be set to true in order to consume from a local vcpkg.json file. If set to false, any local -vcpkg.json files will be ignored. This will default to true in the future. - -#### `VcpkgManifestInstall` (Install Vcpkg Dependencies) - -*(Requires `Use Vcpkg Manifest` set to `true`)* - -This property can be set to "false" to disable automatic dependency restoration on project build. Dependencies can be -manually restored via the vcpkg command line. - -#### `VcpkgInstalledDir` (Installed Directory) - -This property defines the location where headers and binaries are consumed from. In manifest mode, this directory is -created and populated based on your manifest. diff --git a/external_imported/vcpkg/docs/users/mingw.md b/external_imported/vcpkg/docs/users/mingw.md index 0a6c7ef67..2a0408f76 100644 --- a/external_imported/vcpkg/docs/users/mingw.md +++ b/external_imported/vcpkg/docs/users/mingw.md @@ -2,14 +2,14 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/mingw.md).** -*MinGW is community-supported and not tested as part of vcpkg repository's CI process.* +*MinGW is not tested as part of vcpkg repository's CI process, so regressions can occur as part of library updates. PRs improving support are welcome!* ## Table of Contents - - [Mingw-w64 community triplets](#Mingw-w64-community-triplets) - - [Using Mingw-w64 natively on Windows](#Using-Mingw-w64-natively-on-Windows) - - [How to avoid mixing different installations](#How-to-avoid-mixing-different-installations) - - [Using Mingw-w64 to build Windows programs on other systems](#Using-Mingw-w64-to-build-Windows-programs-on-other-systems) + - [Mingw-w64 community triplets](#mingw-w64-community-triplets) + - [Using Mingw-w64 natively on Windows](#mingw-native) + - [How to avoid mixing different installations](#how-to-avoid-mixing-different-installations) + - [Using Mingw-w64 to build Windows programs on other systems](#mingw-cross) ## Mingw-w64 community triplets @@ -36,6 +36,7 @@ Because of this, community involvement is paramount! - [Open issues](https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+mingw) - [Open pull requests](https://github.com/microsoft/vcpkg/pulls?q=is%3Apr+is%3Aopen+mingw) + ## Using Mingw-w64 natively on Windows With [MSYS2](https://www.msys2.org/), it is possible to easily create @@ -123,6 +124,7 @@ which create a mix of MSYS2 programs from different installations. You may want to set the desired `PATH` manually, or remove directories which contain `sh.exe`, `bash.exe`, `msys-2.0.dll` or `cygwin1.dll`. + ## Using Mingw-w64 to build Windows programs on other systems You can use the vcpkg mingw community triplets with toolchains on diff --git a/external_imported/vcpkg/docs/users/registries.md b/external_imported/vcpkg/docs/users/registries.md index 06a0bf35b..0eb6f3f98 100644 --- a/external_imported/vcpkg/docs/users/registries.md +++ b/external_imported/vcpkg/docs/users/registries.md @@ -52,9 +52,11 @@ The `"kind"` field must be a string: #### Registry Objects: `"baseline"` -The `"baseline"` field must be a string. For git registries and for the -built-in registry, it should be a 40-character commit ID. -For filesystem registries, it can be any string that the registry defines. +The `"baseline"` field must be a string. It defines a minimum version for all packages coming from this registry configuration. + +For [Git Registries](../maintainers/registries.md#git-registries) and for the [Builtin Registry](../maintainers/registries.md#builtin-registries), it should be a 40-character git commit sha in the registry's repository that contains a `versions/baseline.json`. + +For [Filesystem Registries](../maintainers/registries.md#filesystem-registries), it can be any valid baseline string that the registry defines. #### Registry Objects: `"repository"` diff --git a/external_imported/vcpkg/docs/users/triplets.md b/external_imported/vcpkg/docs/users/triplets.md index 166b2561e..1b42bd750 100644 --- a/external_imported/vcpkg/docs/users/triplets.md +++ b/external_imported/vcpkg/docs/users/triplets.md @@ -6,9 +6,9 @@ Triplet is a standard term used in cross compiling as a way to completely captur In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet. -We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use overlay triplets (such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake Manifest Mode](manifests.md#vcpkg_overlay_triplets), or [MSBuild Manifest Mode](manifests.md#vcpkgadditionalinstalloptions-additional-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. +We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily customize or add your own by copying a built-in triplet from the `triplets\` directory into a project local location. Then, use `--overlay-triplets=` (or equivalent such as [`$VCPKG_OVERLAY_TRIPLETS`](config-environment.md#vcpkg_overlay_triplets), [CMake `VCPKG_OVERLAY_TRIPLETS`](buildsystems/cmake-integration.md#vcpkg_overlay_triplets), or [MSBuild Additional Options](buildsystems/msbuild-integration.md#vcpkg-additional-install-options)) to add that directory to vcpkg. See our [overlay triplets example](../examples/overlay-triplets-linux-dynamic.md) for a more detailed walkthrough. -To change the triplet used by your project away from the default, see our [Integration Document](integration.md#triplet-selection). +To change the triplet used by your project, you can pass `--triplet=` on the command line or see our [Buildsystem-Specific Documentation](buildsystems/integration.md). ## Community triplets @@ -65,6 +65,7 @@ This field is optional and, if present, will be passed into the build as `CMAKE_ See also the CMake documentation for `CMAKE_SYSTEM_VERSION`: https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html. + ### VCPKG_CHAINLOAD_TOOLCHAIN_FILE Specifies an alternate CMake Toolchain file to use. @@ -92,8 +93,15 @@ This option also has forms for configuration-specific flags: - `VCPKG_LINKER_FLAGS_DEBUG` - `VCPKG_LINKER_FLAGS_RELEASE` +### VCPKG_MESON_CONFIGURE_OPTIONS +Set additional Meson configure options that are appended to the configure command (in [`vcpkg_configure_meson`](../maintainers/vcpkg_configure_meson.md)). + +This field is optional. + +Also available as build-type specific `VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG` and `VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE` variables. + ### VCPKG_CMAKE_CONFIGURE_OPTIONS -Set additional CMake configure options that are appended to the configure command (in [`vcpkg_cmake_configure`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md)). +Set additional CMake configure options that are appended to the configure command (in [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md)). This field is optional. @@ -153,7 +161,7 @@ To select the precise combination of Visual Studio instance and toolset version, 1. Determine the setting for `VCPKG_VISUAL_STUDIO_PATH` from the triplet, or the environment variable `VCPKG_VISUAL_STUDIO_PATH`, or consider it unset 2. Determine the setting for `VCPKG_PLATFORM_TOOLSET` from the triplet or consider it unset 3. Gather a list of all pairs of Visual Studio Instances with all toolsets available in those instances - 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v142, v141, v140) + 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v143, v142, v141, v140) 4. Filter the list based on the settings for `VCPKG_VISUAL_STUDIO_PATH` and `VCPKG_PLATFORM_TOOLSET`. 5. Select the best remaining option @@ -168,6 +176,7 @@ Specifies the VS-based C/C++ compiler toolchain to use. See [`VCPKG_VISUAL_STUDIO_PATH`](#VCPKG_VISUAL_STUDIO_PATH) for the full selection algorithm. Valid settings: +* The Visual Studio 2022 platform toolset is `v143`. * The Visual Studio 2019 platform toolset is `v142`. * The Visual Studio 2017 platform toolset is `v141`. * The Visual Studio 2015 platform toolset is `v140`. @@ -183,6 +192,11 @@ Valid values are, for example, `14.25` or `14.27.29110`. If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. Setting `VCPKG_LOAD_VCVARS_ENV` to (true|1|on) changes this behavior so that the Visual Studio environment is setup following the same rules as if `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` was not set. +## Linux Variables + +### VCPKG_FIXUP_ELF_RPATH +When this option is set to (true|1|on), vcpkg will add `$ORIGIN` and `$ORIGIN/` to the `RUNPATH` header of executables and shared libraries. This allows packages to be relocated on Linux. + ## MacOS Variables ### VCPKG_INSTALL_NAME_DIR diff --git a/external_imported/vcpkg/docs/users/versioning.md b/external_imported/vcpkg/docs/users/versioning.md index 7b091a8a8..2fe23832e 100644 --- a/external_imported/vcpkg/docs/users/versioning.md +++ b/external_imported/vcpkg/docs/users/versioning.md @@ -3,9 +3,9 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/versioning.md).** Versioning allows you to deterministically control the precise revisions of dependencies used by -your project from within your manifest file. +your project from within your manifest file. Versioning only applies to [Manifest Mode](manifests.md). -See our guide to [getting started with versioning](../examples/versioning.getting-started.md). +For an example with context, see our guide to [getting started with versioning](../examples/versioning.getting-started.md). ## Contents @@ -15,7 +15,9 @@ See our guide to [getting started with versioning](../examples/versioning.gettin * [`version-date`](#version-date) * [`version-string`](#version-string) * [Version constraints](#version-constraints) -* [Version files](#version-files) + * [Baselines](#baselines) + * [`version>=`](#version-gte) + * [`overrides`](#overrides) ## Version schemes Ports in vcpkg should attempt to follow the versioning conventions used by the package's authors. For that reason, when declaring a package's version the appropriate scheme should be used. @@ -80,7 +82,7 @@ Examples: * `watermelon#0`< `watermelon#1` #### `port-version` -A positive integer value that increases each time a vcpkg-specific change is made to the port. +A positive integer value that increases each time the port changes without updating the sources. The rules for port versions are: * Start at 0 for the original version of the port, @@ -98,17 +100,15 @@ Examples: ## Version constraints -### `builtin-baseline` -Accepts a Git commit ID. vcpkg will try to find a baseline file in the given -commit ID and use that to set the baseline versions (lower bounds) of all -dependencies. +### Baselines -Baselines provide stability and ease of development for top-level manifest -files. They are not considered from ports consumed as a dependency. If a minimum -version constraint is required during transitive version resolution, the port -should use `version>=`. +Baselines define a global version floor for what versions will be considered. This enables top-level manifests to keep the entire graph of dependencies up-to-date without needing to individually specify direct [`"version>="`][version-gte] constraints. -Example: +Every configured registry has an associated baseline. For manifests that don't configure any registries, the [`"builtin-baseline"`][builtin-baseline] field defines the baseline for the built-in registry. If a manifest does not configure any registries and does not have a [`"builtin-baseline"`][builtin-baseline], the install operates according to the Classic Mode algorithm and ignores all versioning information. + +Baselines, like other registry settings, are ignored from ports consumed as a dependency. If a minimum version is required during transitive version resolution the port should use [`"version>="`][version-gte]. + +**Example** ```json { "name": "project", @@ -118,27 +118,9 @@ Example: } ``` -You can get the current commit of your vcpkg instance either by adding an empty -`"builtin-baseline"` field, installing, and examining the error message or by -running `git rev-parse HEAD` in the root of the vcpkg instance. - -When resolving version constraints for a package, vcpkg will look for a baseline -version by looking at the baseline file in the given commit ID. If the given -commit ID doesn't have a `versions/baseline.json` file or if the baseline file -exists but it does not declare a baseline version for the package the invocation -will fail. +To add an initial `"builtin-baseline"`, use [`vcpkg x-update-baseline --add-initial-baseline`](../commands/update-baseline.md#add-initial-baseline). To update baselines in a manifest, use [`vcpkg x-update-baseline`](../commands/update-baseline.md). -This field is a convenience field that has the same semantic as replacing your -default registry in -[`vcpkg-configuration.json`](registries.md#configuration-default-registry). -```json -{ - "default-registry": { - "kind": "builtin", - "baseline": "" - } -} -``` + ### `version>=` Expresses a minimum version requirement, `version>=` declarations put a lower boundary on the versions that can be used to satisfy a dependency. @@ -160,6 +142,7 @@ Example: As part of a version constraint declaration, a port version can be specified by adding the suffix `#`, in the previous example `1.2.11#9` refers to version `1.2.11` port version `9`. + ### `overrides` Declaring an override forces vcpkg to ignore all other version constraints and use the version specified in the override. This is useful for pinning exact versions and for resolving version conflicts. @@ -187,3 +170,5 @@ For an override to take effect, the overridden package must form part of the dep * The [implementation details](versioning.implementation-details.md) * The [original specification](../specifications/versioning.md) +[version-gte]: #version-gte +[builtin-baseline]: manifests.md#builtin-baseline diff --git a/external_imported/vcpkg/ports/7zip/portfile.cmake b/external_imported/vcpkg/ports/7zip/portfile.cmake index 5dd58bfdb..d4a5cf487 100644 --- a/external_imported/vcpkg/ports/7zip/portfile.cmake +++ b/external_imported/vcpkg/ports/7zip/portfile.cmake @@ -1,8 +1,8 @@ -set(7ZIP_VERSION "2107") +set(7ZIP_VERSION "2200") vcpkg_download_distfile(ARCHIVE URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" FILENAME "7z${7ZIP_VERSION}-src.7z" - SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 + SHA512 ff5bab0ad5c16dee84208b42df27ab1df34499365d934b33f61cd8c79b2a946e8875b1524540c1306381a51d6b24535bbcaf92819bf5331814d6c14cf12d3b07 ) vcpkg_extract_source_archive( diff --git a/external_imported/vcpkg/ports/7zip/vcpkg.json b/external_imported/vcpkg/ports/7zip/vcpkg.json index 542e88c00..bfb06d702 100644 --- a/external_imported/vcpkg/ports/7zip/vcpkg.json +++ b/external_imported/vcpkg/ports/7zip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "7zip", - "version-string": "21.07", - "port-version": 1, + "version": "22.0", "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", diff --git a/external_imported/vcpkg/ports/ableton/correct_cmake_include_directory.patch b/external_imported/vcpkg/ports/ableton/correct_cmake_include_directory.patch new file mode 100644 index 000000000..0250fb942 --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/correct_cmake_include_directory.patch @@ -0,0 +1,20 @@ +diff --git "a/AbletonLinkConfig.cmake" "b/AbletonLinkConfig.cmake" +index 43b66e7..1e84fa5 100644 +--- "a/AbletonLinkConfig.cmake" ++++ "b/AbletonLinkConfig.cmake" +@@ -5,7 +5,7 @@ endif() + add_library(Ableton::Link IMPORTED INTERFACE) + set_property(TARGET Ableton::Link APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/include ++ ${CMAKE_CURRENT_LIST_DIR}/../../include/ableton + ) + + # Force C++11 support for consuming targets +@@ -46,5 +46,5 @@ set_property(TARGET Ableton::Link APPEND PROPERTY + + set_property(TARGET Ableton::Link APPEND PROPERTY + INTERFACE_SOURCES +- ${CMAKE_CURRENT_LIST_DIR}/include/ableton/Link.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/../../include/ableton/Link.hpp + ) diff --git a/external_imported/vcpkg/ports/ableton/portfile.cmake b/external_imported/vcpkg/ports/ableton/portfile.cmake new file mode 100644 index 000000000..08f7292fa --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/portfile.cmake @@ -0,0 +1,83 @@ +#header-only library +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ableton/link + REF 2641130bca65cdfb95794b31a6453a825333bd28 + SHA512 a7c2e2904fe3e0b10affd5482f057c39634cf8935a09732a7ac3b33096754e6a5dbb4545cd51c327c74383065d2dd046ec40ff68fda3013ad1bf8ff4165b469f + HEAD_REF master + PATCHES + replace_local_asiostandalone_by_vcpkg_asio.patch + replace_asiosdk_download_by_vcpkg_asiosdk.patch + replace_local_catch_by_vcpkg_catch2.patch +) +# Note that the dependencies ASIO and ASIOSDK are completely different things: +# -ASIO (ASyncronous IO) is a cross-platform C++ library for network and low-level I/O programming +# -ASIOSDK is the SDK for the Steinberg ASIO (Audio Stream Input/Output) driver, for profesional Windows audio applications + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "discoverytest" LinkDiscoveryTest + "coretest" LinkCoreTest + "hut" LinkHut + "hutsilent" LinkHutSilent +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/ci") +file(REMOVE_RECURSE "${SOURCE_PATH}/modules") +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party") + +set(NEED_CATCH2 OFF) +if ("coretest" IN_LIST FEATURES) + set(NEED_CATCH2 ON) +endif() +if ("discoverytest" IN_LIST FEATURES) + set(NEED_CATCH2 ON) +endif() + +set(NEED_ASIOSDK OFF) +if ("hut" IN_LIST FEATURES) + if(WIN32) + # Need Steinberg ASIO audio driver SDK (only this low-latency audio driver makes the developer tool 'hut' useful on Windows) + set(NEED_ASIOSDK ON) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNEED_CATCH2=${NEED_CATCH2} + -DLINK_BUILD_ASIO=${NEED_ASIOSDK} +) + +if ("coretest" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkCoreTest) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkCoreTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("discoverytest" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkDiscoveryTest) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkDiscoveryTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("hut" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkHut) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHut${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("hutsilent" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkHutSilent) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHutSilent${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + +# We must not correct the CMake include path before build +vcpkg_apply_patches( + SOURCE_PATH "${SOURCE_PATH}" + PATCHES + correct_cmake_include_directory.patch +) + +file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake_include/") +file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch b/external_imported/vcpkg/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch new file mode 100644 index 000000000..c82b9f2e7 --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch @@ -0,0 +1,48 @@ +diff --git "a/examples/CMakeLists.txt" "b/examples/CMakeLists.txt" + +--- "a/examples/CMakeLists.txt" ++++ "b/examples/CMakeLists.txt" +@@ -9,28 +9,22 @@ project(LinkExamples) + # + + if(WIN32) +- function(configure_asio asio_sdk_path_OUT) +- # ASIO-related path/file variables +- set(asio_download_root "https:/download.steinberg.net/sdk_downloads") +- set(asio_file_name "asiosdk_2.3.3_2019-06-14.zip") +- set(asio_dir_name "asiosdk_2.3.3_2019-06-14") +- set(asio_working_dir "${CMAKE_BINARY_DIR}/modules") +- set(asio_output_path "${asio_working_dir}/${asio_file_name}") +- +- message(STATUS "Downloading ASIO SDK") +- file(DOWNLOAD "${asio_download_root}/${asio_file_name}" ${asio_output_path}) +- file(SHA1 ${asio_output_path} asio_zip_hash) +- message(" ASIO SDK SHA1: ${asio_zip_hash}") +- +- message(" Extracting ASIO SDK") +- execute_process(COMMAND ${CMAKE_COMMAND} -E tar "xf" ${asio_output_path} --format=zip +- WORKING_DIRECTORY ${asio_working_dir} +- INPUT_FILE ${asio_output_path} +- ) ++ if(LINK_BUILD_ASIO) ++ function(configure_asio asio_sdk_path_OUT) ++ # ASIO-related path/file variables ++ find_package(ASIOSDK) ++ if(NOT ASIOSDK_FOUND) ++ message(FATAL_ERROR "Steinberg ASIO audio driver SDK not found") ++ else() ++ message(STATUS "Steinberg ASIO audio driver SDK root dir: ${ASIOSDK_ROOT_DIR}") ++ endif() ++ set(asio_working_dir "${ASIOSDK_ROOT_DIR}") ++ set(asio_output_path "${CMAKE_BINARY_DIR}/modules/asiosdk") + +- # Set the ASIO SDK path for the caller +- set(${asio_sdk_path_OUT} "${asio_working_dir}/${asio_dir_name}" PARENT_SCOPE) +- endfunction() ++ # Set the ASIO SDK path for the caller ++ set(${asio_sdk_path_OUT} "${asio_working_dir}" PARENT_SCOPE) ++ endfunction() ++ endif() + endif() + + # _ _ _ diff --git a/external_imported/vcpkg/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch b/external_imported/vcpkg/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch new file mode 100644 index 000000000..d9f1e0f48 --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch @@ -0,0 +1,19 @@ +diff a/cmake_include/AsioStandaloneConfig.cmake b/AsioStandaloneConfig.cmake + +--- a/cmake_include/AsioStandaloneConfig.cmake ++++ b/cmake_include/AsioStandaloneConfig.cmake +@@ -1,6 +1,10 @@ + add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) + +-set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include +-) ++find_package(asio REQUIRED) ++if(asio_FOUND) ++ message(STATUS "Dependency asio found in ${asio_DIR}") ++ set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ ${asio_DIR}/../../include ++ ) ++endif() diff --git a/external_imported/vcpkg/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch b/external_imported/vcpkg/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch new file mode 100644 index 000000000..327af3923 --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch @@ -0,0 +1,90 @@ +--- ableton-link.orig/cmake_include/CatchConfig.cmake ++++ ableton-link/cmake_include/CatchConfig.cmake +@@ -1,6 +1,12 @@ +-add_library(Catch::Catch IMPORTED INTERFACE) ++if (NEED_CATCH2 MATCHES "ON") ++ add_library(Catch::Catch IMPORTED INTERFACE) + +-set_property(TARGET Catch::Catch APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../third_party/catch +-) ++ find_package(Catch2 CONFIG REQUIRED) ++ if(Catch2_FOUND) ++ message(STATUS "Dependency Catch2 found in ${Catch2_DIR}") ++ set_property(TARGET Catch::Catch APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ ${Catch2_DIR}/../../include ++ ) ++ endif() ++endif() + + +--- "a/src/CMakeLists.txt" ++++ "b/src/CMakeLists.txt" +@@ -78,7 +78,12 @@ function(configure_link_test_executable target) + if(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD|GNU") + target_link_libraries(${target} atomic pthread) + endif() +- target_link_libraries(${target} Catch::Catch Ableton::Link) ++ if (NEED_CATCH2 MATCHES "ON") ++ target_link_libraries(${target} Catch2::Catch2WithMain Ableton::Link) + target_compile_definitions(${target} PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING=1) ++ else() ++ target_link_libraries(${target} Ableton::Link) ++ target_compile_definitions(${target} PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING=0) ++ endif() + endfunction() + + +--- "a/src/ableton/link/tst_LinearRegression.cpp" ++++ "b/src/ableton/link/tst_LinearRegression.cpp" +@@ -22,6 +22,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Beats.cpp" ++++ "b/src/ableton/link/tst_Beats.cpp" +@@ -20,6 +20,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Median.cpp" ++++ "b/src/ableton/link/tst_Median.cpp" +@@ -22,6 +22,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Tempo.cpp" ++++ "b/src/ableton/link/tst_Tempo.cpp" +@@ -20,6 +20,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + diff --git a/external_imported/vcpkg/ports/ableton/vcpkg.json b/external_imported/vcpkg/ports/ableton/vcpkg.json new file mode 100644 index 000000000..fb16d9828 --- /dev/null +++ b/external_imported/vcpkg/ports/ableton/vcpkg.json @@ -0,0 +1,46 @@ +{ + "name": "ableton", + "version": "3.0.5", + "port-version": 1, + "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.", + "homepage": "https://www.ableton.com/en/link/", + "documentation": "http://ableton.github.io/link/", + "license": "GPL-2.0-or-later", + "dependencies": [ + "asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "coretest": { + "description": "Build LinkCoreTest suite", + "dependencies": [ + "catch2" + ] + }, + "discoverytest": { + "description": "Build LinkDiscoveryTest suite", + "dependencies": [ + "catch2" + ] + }, + "hut": { + "description": "Build LinkHut command line tool", + "dependencies": [ + { + "name": "asiosdk", + "platform": "windows" + } + ] + }, + "hutsilent": { + "description": "Build LinkHutSilent command line tool" + } + } +} diff --git a/external_imported/vcpkg/ports/abseil/portfile.cmake b/external_imported/vcpkg/ports/abseil/portfile.cmake index 1289eed36..804c23ead 100644 --- a/external_imported/vcpkg/ports/abseil/portfile.cmake +++ b/external_imported/vcpkg/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1 - SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330 + REF 8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 # LTS 20220623.1 + SHA512 a076c198103dc5cf22ac978fe7754dd34cb2e782d7db1c2c98393c94639e461bfe31b10c0663f750f743bc1c0c245fd4b6115356f136fe14bd036d267caf2a8b HEAD_REF master PATCHES # in C++17 mode, use std::any, std::optional, std::string_view, std::variant diff --git a/external_imported/vcpkg/ports/abseil/vcpkg.json b/external_imported/vcpkg/ports/abseil/vcpkg.json index 3c9dc5eef..586ed5818 100644 --- a/external_imported/vcpkg/ports/abseil/vcpkg.json +++ b/external_imported/vcpkg/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version-string": "20211102.1", + "version-string": "20220623.1", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", @@ -8,6 +8,7 @@ "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole." ], "homepage": "https://github.com/abseil/abseil-cpp", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/ace/portfile.cmake b/external_imported/vcpkg/ports/ace/portfile.cmake index a9312dcaa..b9f735b69 100644 --- a/external_imported/vcpkg/ports/ace/portfile.cmake +++ b/external_imported/vcpkg/ports/ace/portfile.cmake @@ -1,39 +1,23 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.6) +set(ACE_VERSION 7.0.8) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - # 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-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" - FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 faef212f066263f9a87a688d105f15097f6b78fd77baf9e2b7da008027cd9ad0478b1f016892ee2d36fcb5aa6b14cc6fbb8fb906f018db6a1089820d522c65f9 - ) - else() - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" - FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 5d0bbeb1f729c3304637a15979303ba6efdbe52bb5d4ac73930fe9b86dbb73a5d74325476809863b26e1a3fc39a205d9d3a9909bce7bbdc5869de3e30f1bc317 - ) - endif() -else() - if(VCPKG_TARGET_IS_WINDOWS) # 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-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" - FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 91f35727afc652f537ce242eb0a9e10878b51b63f9c10f72bddd6491481f10eec5d9d8469f79da3b95adeab7d6848eb1e8bad4e43f61db63daf796a2cd205d61 + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" + FILENAME ACE-TAO-${ACE_VERSION}.tar.gz + SHA512 deb84570a000c6bbd8d8debe6f2dd099ad446df00a80715fd536a551ceb253915d4fc4e7886657299e16909a89175f4c8fe0610c33a893396cb56399bede38ed ) - else() +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-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 9770fab3552835803a93c9a234218c9dd961ecde67227ee92e0972cd2e2ff267147b255ab437453a887bc47b20f70c7a64efeada5dde5d3ea2cade54200e8354 + SHA512 80aac11ba99abade016b8532e8e67f752f383db3fa1cfcd79a78cad3713f69fb0ef5e9d0b3685f54de4114e0178fc367fa800aa29fd31b6c790b8d072d6a38c6 ) - endif() endif() vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/ace/vcpkg.json b/external_imported/vcpkg/ports/ace/vcpkg.json index 3d2ff0a71..625db7292 100644 --- a/external_imported/vcpkg/ports/ace/vcpkg.json +++ b/external_imported/vcpkg/ports/ace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ace", - "version": "7.0.6", - "port-version": 3, + "version": "7.0.8", "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", diff --git a/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake b/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake index 0645eaf23..595326c51 100644 --- a/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/activemq-cpp/portfile.cmake @@ -38,6 +38,12 @@ if (VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}") vcpkg_copy_pdbs() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() else() set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj") @@ -126,5 +132,7 @@ else() vcpkg_clean_msbuild() endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json index c2bdb9c17..112861100 100644 --- a/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 8, + "port-version": 9, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "supports": "!(uwp | osx)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/air-ctl/portfile.cmake b/external_imported/vcpkg/ports/air-ctl/portfile.cmake new file mode 100644 index 000000000..78df4e36f --- /dev/null +++ b/external_imported/vcpkg/ports/air-ctl/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO inie0722/CTL + REF fc9129720646b7e4e2bda9565aff8b2f447fbc2c #v1.1.2 + SHA512 23cd6d17997ab6bba8fba117fc0bd5a50fd4a37a2f2ce11164596b19fe3284536dbe19108ca27576842fdf808c40961c471c898844fe74580d3d6d1877833920 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DCTL_CACHE_LINE_SIZE=0" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/air-ctl/vcpkg.json b/external_imported/vcpkg/ports/air-ctl/vcpkg.json new file mode 100644 index 000000000..03a8eb766 --- /dev/null +++ b/external_imported/vcpkg/ports/air-ctl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "air-ctl", + "version": "1.1.2", + "port-version": 1, + "description": "C template container library", + "homepage": "https://github.com/inie0722/CTL", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/aixlog/portfile.cmake b/external_imported/vcpkg/ports/aixlog/portfile.cmake index 5249e4d23..2092d84ca 100644 --- a/external_imported/vcpkg/ports/aixlog/portfile.cmake +++ b/external_imported/vcpkg/ports/aixlog/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_from_github( REPO badaix/aixlog REF fd4a341740ee840092963de852584ec8ff811c4f # v1.5.0 SHA512 10ab07dcb1e67064c0d69ddcf9289d79d914c70fe6922f32179f9ac38d5c682a4ebe08b686d8160c699a6b966bc7aa2fd7d0268664570a10ce146850e78b292d - ) +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLE=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/aixlog/vcpkg.json b/external_imported/vcpkg/ports/aixlog/vcpkg.json index 978c86f3f..6670f4d9b 100644 --- a/external_imported/vcpkg/ports/aixlog/vcpkg.json +++ b/external_imported/vcpkg/ports/aixlog/vcpkg.json @@ -1,7 +1,10 @@ { "name": "aixlog", - "version-semver": "1.5.0", + "version": "1.5.0", + "port-version": 1, "description": "Header-only C++ logging library", + "homepage": "https://github.com/badaix/aixlog", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/akali/portfile.cmake b/external_imported/vcpkg/ports/akali/portfile.cmake index 4c6a52472..3ed9ff364 100644 --- a/external_imported/vcpkg/ports/akali/portfile.cmake +++ b/external_imported/vcpkg/ports/akali/portfile.cmake @@ -1,40 +1,38 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/akali - REF 57fea619dea42aa116679b22340f56fc94eb83a9 - SHA512 b80f7e72396032e8b24464e159f4a6c24663d671bcbe9ffa46f68e5bc0398fd0caf3ac918f8ccb8d304be4d5a3fade2821f87f7270e02ec8aae722e2faeab0f3 + REF 2e35164a9a2a48a50af06c8ae59fcad0f4d6584e + SHA512 103c4da3d318d7ae7da4821e58eced918c9d64dbc6d97e9e6c15fa69731331cf6160f593437366cb3a844fa292a8d875e3e63a679e7fbdeae22bb4d73e3d3144 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DAKALI_STATIC:BOOL=${AKALI_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/akali) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/akali) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/akali) +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() -file(READ ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h AKALI_EXPORT_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "#ifdef AKALI_STATIC" "#if 1" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 1") else() - string(REPLACE "#ifdef AKALI_STATIC" "#if 0" AKALI_EXPORT_H "${AKALI_EXPORT_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h" "#ifdef AKALI_STATIC" "#if 0") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/akali/akali_export.h "${AKALI_EXPORT_H}") -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) +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") + -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/akali/vcpkg.json b/external_imported/vcpkg/ports/akali/vcpkg.json index 1977d5a26..c06a223e7 100644 --- a/external_imported/vcpkg/ports/akali/vcpkg.json +++ b/external_imported/vcpkg/ports/akali/vcpkg.json @@ -1,8 +1,19 @@ { "name": "akali", - "version-string": "1.42", - "port-version": 3, + "version": "1.43", + "port-version": 1, "description": "C++ Common Library.", "homepage": "https://github.com/winsoft666/akali", - "supports": "!(arm | arm64 | uwp)" + "license": "MIT", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/alpaca/portfile.cmake b/external_imported/vcpkg/ports/alpaca/portfile.cmake new file mode 100644 index 000000000..78643e9bb --- /dev/null +++ b/external_imported/vcpkg/ports/alpaca/portfile.cmake @@ -0,0 +1,28 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/alpaca + REF v0.2.0 + SHA512 0ac2c1c4f8e0534319bf852bac3852ee3674db7b1a9eda30462821ec4c9ddeeb6ceff09ef5f16eed9131af6c357a09f2cb909a12ea2f135ca7d496d90ff1865d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DALPACA_BUILD_TESTS=OFF + -DALPACA_BUILD_BENCHMARKS=OFF + -DALPACA_BUILD_SAMPLES=OFF +) + +vcpkg_cmake_install() + +#Copy missing details/types folder from source path +file(COPY "${SOURCE_PATH}/include/alpaca/detail/types" DESTINATION "${CURRENT_PACKAGES_DIR}/include/alpaca/detail/") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/alpaca PACKAGE_NAME alpaca) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/alpaca/vcpkg.json b/external_imported/vcpkg/ports/alpaca/vcpkg.json new file mode 100644 index 000000000..9cfb77d80 --- /dev/null +++ b/external_imported/vcpkg/ports/alpaca/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "alpaca", + "version": "0.2.0", + "description": "Alpaca is a serialization library written in C++17 - Pack C++ structs into a compact byte-array without any macros or boilerplate code", + "homepage": "https://github.com/p-ranav/alpaca", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/alpaka/portfile.cmake b/external_imported/vcpkg/ports/alpaka/portfile.cmake new file mode 100644 index 000000000..e513ba484 --- /dev/null +++ b/external_imported/vcpkg/ports/alpaka/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alpaka-group/alpaka + REF 0.9.0 + SHA512 c079c0101a1e1c0d244c074e19fcefa6c15751fbb6be072c6f245e515dece8700a40fd101b2b0ba5f9760f4545bf23e1917ea9804accbe16a45039f8b0ed8a01 + HEAD_REF develop +) +set(VCPKG_BUILD_TYPE release) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/alpaka") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +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/external_imported/vcpkg/ports/alpaka/usage b/external_imported/vcpkg/ports/alpaka/usage new file mode 100644 index 000000000..dff3ff380 --- /dev/null +++ b/external_imported/vcpkg/ports/alpaka/usage @@ -0,0 +1,4 @@ +alpaka provides CMake targets: + + find_package(alpaka CONFIG REQUIRED) + target_link_libraries(main PRIVATE alpaka::alpaka) diff --git a/external_imported/vcpkg/ports/alpaka/vcpkg.json b/external_imported/vcpkg/ports/alpaka/vcpkg.json new file mode 100644 index 000000000..3747247bf --- /dev/null +++ b/external_imported/vcpkg/ports/alpaka/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "alpaka", + "version": "0.9.0", + "description": "The alpaka library is a header-only abstraction library for accelerator development", + "homepage": "https://github.com/alpaka-group/alpaka", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "boost-core", + "version>=": "1.74" + }, + { + "name": "boost-predef", + "version>=": "1.74" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/ampl-mp/fix-arm-build.patch b/external_imported/vcpkg/ports/ampl-mp/fix-arm-build.patch index 443cdc457..99b236ce7 100644 --- a/external_imported/vcpkg/ports/ampl-mp/fix-arm-build.patch +++ b/external_imported/vcpkg/ports/ampl-mp/fix-arm-build.patch @@ -2,6 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 92089a3..d4c6762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -240,4 +240,4 @@ + set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc) +-add_executable(gen-expr-info EXCLUDE_FROM_ALL ++add_executable(gen-expr-info + src/gen-expr-info.cc $) + if (MINGW) @@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING) COMMAND ${CMAKE_COMMAND} -E echo "warning: cannot re-generate ${MP_EXPR_INFO_FILE}") diff --git a/external_imported/vcpkg/ports/ampl-mp/vcpkg.json b/external_imported/vcpkg/ports/ampl-mp/vcpkg.json index bc017ae15..287cd3cb3 100644 --- a/external_imported/vcpkg/ports/ampl-mp/vcpkg.json +++ b/external_imported/vcpkg/ports/ampl-mp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ampl-mp", - "version-string": "2020-11-11", - "port-version": 2, + "version-date": "2020-11-11", + "port-version": 3, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/angelscript/LICENSE b/external_imported/vcpkg/ports/angelscript/LICENSE deleted file mode 100644 index ea549c6e6..000000000 --- a/external_imported/vcpkg/ports/angelscript/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -AngelCode Scripting Library - -Copyright © 2003-2018 Andreas Jönsson - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - This notice may not be removed or altered from any source distribution. diff --git a/external_imported/vcpkg/ports/angelscript/portfile.cmake b/external_imported/vcpkg/ports/angelscript/portfile.cmake index 46fb7aa77..b63ce6d8b 100644 --- a/external_imported/vcpkg/ports/angelscript/portfile.cmake +++ b/external_imported/vcpkg/ports/angelscript/portfile.cmake @@ -6,25 +6,24 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES - mark-threads-private.patch + mark-threads-private.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}/angelscript/projects/cmake" ) vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Angelscript) # Copy the addon files if("addons" IN_LIST FEATURES) - file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") + file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") endif() -file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/angelscript/vcpkg.json b/external_imported/vcpkg/ports/angelscript/vcpkg.json index 39fd3916f..a7b48cb40 100644 --- a/external_imported/vcpkg/ports/angelscript/vcpkg.json +++ b/external_imported/vcpkg/ports/angelscript/vcpkg.json @@ -1,8 +1,10 @@ { "name": "angelscript", "version": "2.35.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", "supports": "!arm", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/angle/CMakeLists.txt b/external_imported/vcpkg/ports/angle/CMakeLists.txt index 70a2e2143..184f5c951 100644 --- a/external_imported/vcpkg/ports/angle/CMakeLists.txt +++ b/external_imported/vcpkg/ports/angle/CMakeLists.txt @@ -72,7 +72,21 @@ elseif(APPLE) set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac") endif() endif() + +if(APPLE) + set(ANGLE_COMMON_PLATFORM_SOURCES + "src/common/apple/*.h" + "src/common/apple/*.cpp" + "src/common/apple/*.mm" + "src/common/gl/cgl/*.h" + "src/common/gl/cgl/*.cpp" + "src/common/gl/cgl/*.mm") +else() + set(ANGLE_COMMON_PLATFORM_SOURCES ) +endif() + file(GLOB ANGLE_COMMON_SOURCES + ${ANGLE_COMMON_PLATFORM_SOURCES} "src/common/*.h" "src/common/*.inc" "src/common/*.cpp" @@ -341,6 +355,9 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) "src/libANGLE/renderer/gl/cgl/*.mm" "src/libANGLE/renderer/gl/cgl/*.cpp" "src/libANGLE/renderer/gl/cgl/*.h" + "src/libANGLE/renderer/gl/apple/*.mm" + "src/libANGLE/renderer/gl/apple/*.cpp" + "src/libANGLE/renderer/gl/apple/*.h" "gpu_info_util/SystemInfo_macos.mm" ) elseif(LINUX) diff --git a/external_imported/vcpkg/ports/angle/vcpkg.json b/external_imported/vcpkg/ports/angle/vcpkg.json index e51cf0978..2c582aeb5 100644 --- a/external_imported/vcpkg/ports/angle/vcpkg.json +++ b/external_imported/vcpkg/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 2, + "port-version": 3, "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/external_imported/vcpkg/ports/antlr4/fix_LNK2001.patch b/external_imported/vcpkg/ports/antlr4/fix_LNK2001.patch new file mode 100644 index 000000000..442de8b2d --- /dev/null +++ b/external_imported/vcpkg/ports/antlr4/fix_LNK2001.patch @@ -0,0 +1,50 @@ +diff --git a/runtime/src/misc/MurmurHash.cpp b/runtime/src/misc/MurmurHash.cpp +index 73562cd..57aa3bf 100644 +--- a/runtime/src/misc/MurmurHash.cpp ++++ b/runtime/src/misc/MurmurHash.cpp +@@ -63,23 +63,6 @@ size_t MurmurHash::update(size_t hash, size_t value) { + return hash; + } + +-size_t MurmurHash::update(size_t hash, const void *data, size_t size) { +- size_t value; +- const uint8_t *bytes = static_cast(data); +- while (size >= sizeof(size_t)) { +- std::memcpy(&value, bytes, sizeof(size_t)); +- hash = update(hash, value); +- bytes += sizeof(size_t); +- size -= sizeof(size_t); +- } +- if (size != 0) { +- value = 0; +- std::memcpy(&value, bytes, size); +- hash = update(hash, value); +- } +- return hash; +-} +- + size_t MurmurHash::finish(size_t hash, size_t entryCount) { + hash ^= entryCount * 8; + hash ^= hash >> 33; +@@ -118,3 +101,20 @@ size_t MurmurHash::finish(size_t hash, size_t entryCount) { + #else + #error "Expected sizeof(size_t) to be 4 or 8." + #endif ++ ++size_t MurmurHash::update(size_t hash, const void *data, size_t size) { ++ size_t value; ++ const uint8_t *bytes = static_cast(data); ++ while (size >= sizeof(size_t)) { ++ std::memcpy(&value, bytes, sizeof(size_t)); ++ hash = update(hash, value); ++ bytes += sizeof(size_t); ++ size -= sizeof(size_t); ++ } ++ if (size != 0) { ++ value = 0; ++ std::memcpy(&value, bytes, size); ++ hash = update(hash, value); ++ } ++ return hash; ++} +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch b/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch deleted file mode 100644 index a055df470..000000000 --- a/external_imported/vcpkg/ports/antlr4/fix_utfcpp_dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -51,27 +51,6 @@ else() - - if (utf8cpp_HEADER) - include_directories(${utf8cpp_HEADER}) -- else() -- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) -- set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty) -- set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp) -- ExternalProject_Add( -- utf8cpp -- GIT_REPOSITORY "https://github.com/nemtrif/utfcpp" -- GIT_TAG "v3.1.1" -- SOURCE_DIR ${UTFCPP_DIR} -- UPDATE_DISCONNECTED 1 -- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -DUTF8_TESTS=off -DUTF8_SAMPLES=off -- STEP_TARGETS build) -- -- include_directories( -- ${UTFCPP_DIR}/install/include/utf8cpp -- ${UTFCPP_DIR}/install/include/utf8cpp/utf8 -- ) -- -- add_dependencies(antlr4_shared utf8cpp) -- add_dependencies(antlr4_static utf8cpp) -- set(INSTALL_utf8cpp TRUE) - endif() - endif() - diff --git a/external_imported/vcpkg/ports/antlr4/fixed_build.patch b/external_imported/vcpkg/ports/antlr4/fixed_build.patch index e0f8ff91f..ff4369230 100644 --- a/external_imported/vcpkg/ports/antlr4/fixed_build.patch +++ b/external_imported/vcpkg/ports/antlr4/fixed_build.patch @@ -1,38 +1,97 @@ -diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt +index baf46ca..80fa49a 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt -@@ -25,7 +25,7 @@ +@@ -23,10 +23,13 @@ file(GLOB libantlrcpp_SRC + "${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath/*.cpp" + ) + ++if(BUILD_SHARED_LIBS) add_library(antlr4_shared SHARED ${libantlrcpp_SRC}) ++else() add_library(antlr4_static STATIC ${libantlrcpp_SRC}) - ++endif() + -set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. -+# set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. ++#set(LIB_OUTPUT_DIR "${CMAKE_HOME_DIRECTORY}/dist") # put generated libraries here. message(STATUS "Output libraries to ${LIB_OUTPUT_DIR}") - + # make sure 'make' works fine even if ${LIB_OUTPUT_DIR} is deleted. -@@ -63,15 +63,15 @@ +@@ -34,8 +37,11 @@ add_custom_target(make_lib_output_dir ALL + COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_OUTPUT_DIR} + ) + ++if(BUILD_SHARED_LIBS) + add_dependencies(antlr4_shared make_lib_output_dir) ++else() + add_dependencies(antlr4_static make_lib_output_dir) ++endif() + + if (ANTLR_BUILD_CPP_TESTS) + include(FetchContent) +@@ -70,11 +76,17 @@ if (ANTLR_BUILD_CPP_TESTS) + endif() + + if(CMAKE_SYSTEM_NAME MATCHES "Linux") ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${UUID_LIBRARIES}) ++ else() + target_link_libraries(antlr4_static ${UUID_LIBRARIES}) ++ endif() + elseif(APPLE) ++ if(BUILD_SHARED_LIBS) + target_link_libraries(antlr4_shared ${COREFOUNDATION_LIBRARY}) ++ else() + target_link_libraries(antlr4_static ${COREFOUNDATION_LIBRARY}) ++ endif() + endif() + + if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") +@@ -96,7 +108,7 @@ if(WIN32) set(extra_share_compile_flags "-DANTLR4CPP_EXPORTS") set(extra_static_compile_flags "-DANTLR4CPP_STATIC") endif(WIN32) -if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") -- if(WITH_STATIC_CRT) -- target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") -- target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") -- else() -- target_compile_options(antlr4_shared PRIVATE "/MD$<$:d>") -- target_compile_options(antlr4_static PRIVATE "/MD$<$:d>") -- endif() --endif() -+# if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") -+# if(WITH_STATIC_CRT) -+# target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") -+# target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") -+# else() -+# target_compile_options(antlr4_shared PRIVATE "/MD$<$:d>") -+# target_compile_options(antlr4_static PRIVATE "/MD$<$:d>") -+# endif() -+# endif() - - set(static_lib_suffix "") - if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - \ No newline at end of file ++if(0) + if(WITH_STATIC_CRT) + target_compile_options(antlr4_shared PRIVATE "/MT$<$:d>") + target_compile_options(antlr4_static PRIVATE "/MT$<$:d>") +@@ -116,6 +128,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + set(extra_static_compile_flags "-DANTLR4CPP_STATIC -MP") + endif() + ++if(BUILD_SHARED_LIBS) + set_target_properties(antlr4_shared + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} +@@ -126,25 +139,27 @@ set_target_properties(antlr4_shared + RUNTIME_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_share_compile_flags}") +- ++else() + set_target_properties(antlr4_static + PROPERTIES VERSION ${ANTLR_VERSION} + SOVERSION ${ANTLR_VERSION} + OUTPUT_NAME "antlr4-runtime${static_lib_suffix}" + ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR} + COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}") +- ++endif() ++if(BUILD_SHARED_LIBS) + install(TARGETS antlr4_shared + EXPORT antlr4-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +- ++else() + install(TARGETS antlr4_static + EXPORT antlr4-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++endif() + + install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/" + DESTINATION "include/antlr4-runtime" diff --git a/external_imported/vcpkg/ports/antlr4/portfile.cmake b/external_imported/vcpkg/ports/antlr4/portfile.cmake index 312bb6881..5ca40c3f1 100644 --- a/external_imported/vcpkg/ports/antlr4/portfile.cmake +++ b/external_imported/vcpkg/ports/antlr4/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 4.9.3) +set(VERSION 4.10.1) vcpkg_download_distfile(ARCHIVE URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip" FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip" - SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722 + SHA512 f4926987946d17bf51b2d8a31ac06cf16eea7fb49ce535abb2d4759c9e6113d173c4504ffe4c8d2f9a58d845507dfdedaaba3dde70cc09c03c6bd6a2afe892a6 ) # license not exist in antlr folder. @@ -21,62 +21,24 @@ vcpkg_extract_source_archive_ex( PATCHES fixed_build.patch uuid_discovery_fix.patch - export_guid.patch - fix_utfcpp_dependency.patch + fix_LNK2001.patch #The related upstream issue https://github.com/antlr/antlr4/issues/3674 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DANTLR4_INSTALL=ON + -DANTLR_BUILD_CPP_TESTS=OFF OPTIONS_DEBUG -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist OPTIONS_RELEASE -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-generator CONFIG_PATH lib/cmake/antlr4-generator DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME antlr4-runtime CONFIG_PATH lib/cmake/antlr4-runtime) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/include -) - -if (NOT VCPKG_CMAKE_SYSTEM_NAME) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime-static.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime-static.lib - ) - - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.dll ${CURRENT_PACKAGES_DIR}/bin/antlr4-runtime.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.dll ${CURRENT_PACKAGES_DIR}/debug/bin/antlr4-runtime.dll) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.lib - ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.dll - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.dll - ) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime-static.lib ${CURRENT_PACKAGES_DIR}/lib/antlr4-runtime.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime-static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/antlr4-runtime.lib) - endif() -else() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.a - ) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.so - ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.so.${VERSION} - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.so - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.so.${VERSION} - ) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.dylib - ${CURRENT_PACKAGES_DIR}/lib/libantlr4-runtime.${VERSION}.dylib - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.dylib - ${CURRENT_PACKAGES_DIR}/debug/lib/libantlr4-runtime.${VERSION}.dylib - ) - endif() -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch b/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch index 9221d296c..d3211798a 100644 --- a/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch +++ b/external_imported/vcpkg/ports/antlr4/uuid_discovery_fix.patch @@ -14,22 +14,3 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt endif() if(APPLE) find_library(COREFOUNDATION_LIBRARY CoreFoundation) -diff --git a/runtime/src/support/Guid.cpp b/runtime/src/support/Guid.cpp ---- a/runtime/src/support/Guid.cpp -+++ b/runtime/src/support/Guid.cpp -@@ -24,6 +24,7 @@ - - #include - -+#include "antlr4-common.h" - #include "Guid.h" - - #ifdef GUID_LIBUUID -@@ -35,6 +36,7 @@ - #endif - - #ifdef GUID_WINDOWS -+#define NOMINMAX - #include - #endif - diff --git a/external_imported/vcpkg/ports/antlr4/vcpkg.json b/external_imported/vcpkg/ports/antlr4/vcpkg.json index 442ba9515..a7b0bd094 100644 --- a/external_imported/vcpkg/ports/antlr4/vcpkg.json +++ b/external_imported/vcpkg/ports/antlr4/vcpkg.json @@ -1,9 +1,9 @@ { "name": "antlr4", - "version": "4.9.3", - "port-version": 1, + "version": "4.10.1", "description": "ANother Tool for Language Recognition", "homepage": "https://www.antlr.org", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { @@ -13,6 +13,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/anyrpc/mingw.patch b/external_imported/vcpkg/ports/anyrpc/mingw.patch new file mode 100644 index 000000000..e2a8e5428 --- /dev/null +++ b/external_imported/vcpkg/ports/anyrpc/mingw.patch @@ -0,0 +1,216 @@ +diff --color -ur a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake +--- a/cmake/FindLog4cplus.cmake 2020-01-13 18:31:55.000000000 +0100 ++++ b/cmake/FindLog4cplus.cmake 2022-07-19 19:35:41.701935383 +0200 +@@ -61,12 +61,12 @@ + + endif () + ++# needed to use find_package_handle_standard_args ++include(FindPackageHandleStandardArgs) ++ + if (LOG4CPLUS_INCLUDE_DIR) + # set the correct variable name for the header directories + set(LOG4CPLUS_INCLUDE_DIRS ${LOG4CPLUS_INCLUDE_DIR}) +- +- # needed to use find_package_handle_standard_args +- include(FindPackageHandleStandardArgs) + + if (LOG4CPLUS_LIBRARY_RELEASE AND LOG4CPLUS_LIBRARY_DEBUG) + # set the libaries varible to use the release and debug versions +diff --color -ur a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake +--- a/cmake/FindMsgpack.cmake 2020-01-13 18:31:55.000000000 +0100 ++++ b/cmake/FindMsgpack.cmake 2022-07-19 19:35:41.702935385 +0200 +@@ -61,13 +61,13 @@ + + endif () + ++# needed to use find_package_handle_standard_args ++include(FindPackageHandleStandardArgs) ++ + if (MSGPACK_INCLUDE_DIR) + # set the correct variable name for the header directories + set(MSGPACK_INCLUDE_DIRS ${MSGPACK_INCLUDE_DIR}) + +- # needed to use find_package_handle_standard_args +- include(FindPackageHandleStandardArgs) +- + if (MSGPACK_LIBRARY_RELEASE AND MSGPACK_LIBRARY_DEBUG) + # set the libaries varible to use the release and debug versions + find_package_handle_standard_args(MSGPACK DEFAULT_MSG MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY_RELEASE MSGPACK_LIBRARY_DEBUG) +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/CMakeLists.txt 2022-07-19 19:36:01.112980511 +0200 +@@ -63,6 +63,7 @@ + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc" ) + elseif (MINGW) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__STRICT_ANSI__" ) ++ add_definitions( -D _POSIX_THREAD_SAFE_FUNCTIONS ) + elseif (BUILD_WITH_ADDRESS_SANITIZE) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer" ) + SET( ASAN_LIBRARY asan ) +diff --color -ur a/example/CMakeLists.txt b/example/CMakeLists.txt +--- a/example/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/example/CMakeLists.txt 2022-07-19 19:35:41.696935371 +0200 +@@ -48,5 +48,13 @@ + + # Add the necessary external library references + target_link_libraries( ${SOURCEFILE} anyrpc ${ASAN_LIBRARY} ${LOG4CPLUS_LIBRARIES} ${MSGPACK_LIBRARIES}) ++ ++ if (WIN32) ++ target_compile_definitions(${SOURCEFILE} ++ PRIVATE ++ WINVER=0x0A00 ++ _WIN32_WINNT=0x0A00 ++ ) ++ endif () + endforeach () + +diff --color -ur a/include/anyrpc/connection.h b/include/anyrpc/connection.h +--- a/include/anyrpc/connection.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/connection.h 2022-07-19 19:35:41.698935376 +0200 +@@ -22,11 +22,7 @@ + #define ANYRPC_CONNECTION_H_ + + #if defined(ANYRPC_THREADING) +-# if defined(__MINGW32__) +-# include "internal/mingw.thread.h" +-# else +-# include +-# endif // defined(__MINGW32__) ++# include + #endif // defined(ANYRPC_THREADING) + + #if defined(ANYRPC_REGEX) +diff --color -ur a/include/anyrpc/internal/time.h b/include/anyrpc/internal/time.h +--- a/include/anyrpc/internal/time.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/internal/time.h 2022-07-19 19:35:41.698935376 +0200 +@@ -32,10 +32,6 @@ + int gettimeofday(struct timeval * tp, struct timezone * tzp); + #endif + +-#if defined(__MINGW32__) +-struct tm* localtime_r(const time_t *timep, struct tm *result); +-#endif +- + //! Compute the difference between the two times in milliseconds + ANYRPC_API int MilliTimeDiff(struct timeval &time1, struct timeval &time2); + +diff --color -ur a/include/anyrpc/server.h b/include/anyrpc/server.h +--- a/include/anyrpc/server.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/server.h 2022-07-19 19:35:41.699935378 +0200 +@@ -22,24 +22,9 @@ + #define ANYRPC_SERVER_H_ + + #if defined(ANYRPC_THREADING) +-# if defined(__MINGW32__) +-// These constants are not defined for mingw but are needed in the following libraries +-# ifndef EOWNERDEAD +-# define EOWNERDEAD 133 /* File too big */ +-# endif +-# ifndef EPROTO +-# define EPROTO 134 /* Protocol error */ +-# endif +- +-# include "internal/mingw.thread.h" +-# include +-# include "internal/mingw.mutex.h" +-# include "internal/mingw.condition_variable.h" +-# else +-# include +-# include +-# include +-# endif //defined(__MINGW32__) ++# include ++# include ++# include + #endif //defined(ANYRPC_THREADING) + + namespace anyrpc +diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/CMakeLists.txt 2022-07-19 19:35:41.697935374 +0200 +@@ -57,6 +57,12 @@ + # Need the winsock library for Windows + if (WIN32) + target_link_libraries(anyrpc ws2_32) ++ ++ target_compile_definitions(anyrpc ++ PRIVATE ++ WINVER=0x0A00 ++ _WIN32_WINNT=0x0A00 ++ ) + endif () + + set_target_properties( anyrpc PROPERTIES VERSION ${ANYRPC_VERSION} SOVERSION ${ANYRPC_VERSION_MAJOR} ) +diff --color -ur a/src/internal/time.cpp b/src/internal/time.cpp +--- a/src/internal/time.cpp 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/internal/time.cpp 2022-07-19 19:35:41.699935378 +0200 +@@ -26,11 +26,8 @@ + #include + #endif + +-#if defined(_MSC_VER) +-#elif defined(__MINGW32__) +-#include +-#else +-#include ++#if !defined(_MSC_VER) ++# include + #endif + + namespace anyrpc +@@ -57,16 +54,6 @@ + } + #endif + +-#if defined(__MINGW32__) +-struct tm* localtime_r(const time_t *timep, struct tm *result) +-{ +- // with Windows localtime is threadsafe since the pointer is to thread local storage +- struct tm *t=localtime(timep); +- memcpy(result,t,sizeof(struct tm)); +- return result; +-} +-#endif +- + int MilliTimeDiff( struct timeval &time1, struct timeval &time2 ) + { + return (time1.tv_sec - time2.tv_sec) * 1000 + (time1.tv_usec - time2.tv_usec)/1000; +diff --color -ur a/src/socket.cpp b/src/socket.cpp +--- a/src/socket.cpp 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/socket.cpp 2022-07-19 19:35:41.701935383 +0200 +@@ -98,7 +98,7 @@ + int Socket::SetKeepAliveInterval(int startTime, int interval, int probeCount) + { + log_debug( "SetKeepAliveInterval: startTime=" << startTime << ", interval=" << interval << ", probeCount=" << probeCount); +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) || defined(__MINGW32__) + DWORD outBytes; + tcp_keepalive tcp_ka; + tcp_ka.onoff = 1; +@@ -109,7 +109,7 @@ + if (result < 0) + log_debug( "SetKeepAliveInterval: result = " << result ); + return result; +-#elif defined(__MINGW32__) || defined(__CYGWIN__) ++#elif defined(__CYGWIN__) + // don't see how this can be performed right now + #elif (__APPLE__) + int result = setsockopt( fd_, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&startTime, sizeof(startTime) ); +@@ -554,15 +554,11 @@ + + port = ntohs(receiveAddr.sin_port); + +-#if defined(__MINGW32__) +- // should be thread-safe since it would use the Windows call +- ipAddress = inet_ntoa(receiveAddr.sin_addr); +-#else + // Only need this buffer to perform the address conversion in a thread-safe call + const unsigned bufferLength = 100; + char addrBuffer[bufferLength]; + ipAddress = inet_ntop(AF_INET,&receiveAddr.sin_addr, addrBuffer, bufferLength); +-#endif ++ + log_debug("Udp Receive: address=" << ipAddress << ", port=" << port); + + eof = (numBytes == 0); diff --git a/external_imported/vcpkg/ports/anyrpc/portfile.cmake b/external_imported/vcpkg/ports/anyrpc/portfile.cmake index 3090d2db9..666fa0166 100644 --- a/external_imported/vcpkg/ports/anyrpc/portfile.cmake +++ b/external_imported/vcpkg/ports/anyrpc/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( SHA512 8c674d29e80ec2522d6c1ec959663958ab4e1bf1135727c3c2aaa19e62a81ddbbd1e6a46f3e4679ee02894ad2ab26e70ca7e1e6c8750f3289994311069221b53 HEAD_REF master FILE_DISAMBIGUATOR 1 + PATCHES + mingw.patch # Remove this when https://github.com/sgieseking/anyrpc/pull/46 is released ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) diff --git a/external_imported/vcpkg/ports/anyrpc/vcpkg.json b/external_imported/vcpkg/ports/anyrpc/vcpkg.json index 02ffac66d..a9bc22ada 100644 --- a/external_imported/vcpkg/ports/anyrpc/vcpkg.json +++ b/external_imported/vcpkg/ports/anyrpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "anyrpc", "version-date": "2021-08-24", + "port-version": 1, "description": "A multiprotocol remote procedure call system for C++.", "homepage": "https://github.com/sgieseking/anyrpc" } diff --git a/external_imported/vcpkg/ports/aom/portfile.cmake b/external_imported/vcpkg/ports/aom/portfile.cmake index 2daeebea5..81152e05a 100644 --- a/external_imported/vcpkg/ports/aom/portfile.cmake +++ b/external_imported/vcpkg/ports/aom/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083 - TAG v3.2.0 + FETCH_REF v3.2.0 PATCHES aom-rename-static.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream @@ -20,9 +20,16 @@ vcpkg_from_git( aom-uninitialized-pointer.diff ) +set(aom_target_cpu "") +if(VCPKG_TARGET_IS_UWP) + # UWP + aom's assembler files result in weirdness and build failures + set(aom_target_cpu "-DAOM_TARGET_CPU=generic") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS + ${aom_target_cpu} -DENABLE_DOCS=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTDATA=OFF diff --git a/external_imported/vcpkg/ports/aom/vcpkg.json b/external_imported/vcpkg/ports/aom/vcpkg.json index 76a736ad0..8ecb61261 100644 --- a/external_imported/vcpkg/ports/aom/vcpkg.json +++ b/external_imported/vcpkg/ports/aom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aom", "version-semver": "3.2.0", - "port-version": 2, + "port-version": 3, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!(windows & arm & !uwp)", diff --git a/external_imported/vcpkg/ports/apr-util/portfile.cmake b/external_imported/vcpkg/ports/apr-util/portfile.cmake index d50966c4e..6cafce466 100644 --- a/external_imported/vcpkg/ports/apr-util/portfile.cmake +++ b/external_imported/vcpkg/ports/apr-util/portfile.cmake @@ -12,6 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PATCHES use-vcpkg-expat.patch apr.patch + unglue.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/external_imported/vcpkg/ports/apr-util/unglue.patch b/external_imported/vcpkg/ports/apr-util/unglue.patch new file mode 100644 index 000000000..5391a7cb0 --- /dev/null +++ b/external_imported/vcpkg/ports/apr-util/unglue.patch @@ -0,0 +1,17 @@ +diff --git a/include/apu_version.h b/include/apu_version.h +index e4fb2e64e..c6addf142 100644 +--- a/include/apu_version.h ++++ b/include/apu_version.h +@@ -98,9 +98,9 @@ + + /** An alternative formatted string of APR's version */ + /* macro for Win32 .rc files using numeric csv representation */ +-#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION ##, \ +- ##APU_MINOR_VERSION ##, \ +- ##APU_PATCH_VERSION ++#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION , \ ++ APU_MINOR_VERSION , \ ++ APU_PATCH_VERSION + + + #ifndef APU_VERSION_ONLY diff --git a/external_imported/vcpkg/ports/apr-util/vcpkg.json b/external_imported/vcpkg/ports/apr-util/vcpkg.json index 0dbff727e..4b623c016 100644 --- a/external_imported/vcpkg/ports/apr-util/vcpkg.json +++ b/external_imported/vcpkg/ports/apr-util/vcpkg.json @@ -1,9 +1,10 @@ { "name": "apr-util", "version": "1.6.1", - "port-version": 7, + "port-version": 8, "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", "dependencies": [ "apr", "expat", diff --git a/external_imported/vcpkg/ports/apr/fix-configcmake.patch b/external_imported/vcpkg/ports/apr/fix-configcmake.patch new file mode 100644 index 000000000..8104810d0 --- /dev/null +++ b/external_imported/vcpkg/ports/apr/fix-configcmake.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4632c3..0b86d12 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -259,27 +259,35 @@ SET(install_targets) + SET(install_bin_pdb) + + # libapr-1 is shared, apr-1 is static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) + SET(install_targets ${install_targets} libapr-1) + SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb) + TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT") + ADD_DEPENDENCIES(libapr-1 test_char_header) +- ++TARGET_INCLUDE_DIRECTORIES(libapr-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} apr-1) + TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS}) + SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT") + ADD_DEPENDENCIES(apr-1 test_char_header) ++TARGET_INCLUDE_DIRECTORIES(apr-1 INTERFACE $) ++ENDIF() + + # libaprapp-1 and aprapp-1 are static ++IF(BUILD_SHARED_LIBS) + ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} libaprapp-1) + SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") +- ++TARGET_INCLUDE_DIRECTORIES(libaprapp-1 INTERFACE $) ++ELSE() + ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + SET(install_targets ${install_targets} aprapp-1) + SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++TARGET_INCLUDE_DIRECTORIES(aprapp-1 INTERFACE $) ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -385,12 +393,18 @@ ENDIF (APR_BUILD_TESTAPR) + + # Installation + +-INSTALL(TARGETS ${install_targets} ++INSTALL(TARGETS ${install_targets} EXPORT unofficial-apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + ++INSTALL(EXPORT unofficial-apr-config ++ NAMESPACE unofficial::apr:: ++ DESTINATION share/unofficial-apr ++ FILE unofficial-apr-config.cmake ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin diff --git a/external_imported/vcpkg/ports/apr/portfile.cmake b/external_imported/vcpkg/ports/apr/portfile.cmake index eb0fc8708..9416ecf21 100644 --- a/external_imported/vcpkg/ports/apr/portfile.cmake +++ b/external_imported/vcpkg/ports/apr/portfile.cmake @@ -10,12 +10,15 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + fix-configcmake.patch + unglue.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - private-headers INSTALL_PRIVATE_H + private-headers APR_INSTALL_PRIVATE_H ) vcpkg_cmake_configure( @@ -24,29 +27,14 @@ if (VCPKG_TARGET_IS_WINDOWS) -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON - -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} ${FEATURE_OPTIONS} ) vcpkg_cmake_install() - + vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr) # There is no way to suppress installation of the headers in debug builds. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # Both dynamic and static are built, so keep only the one needed - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/apr-1.lib" - "${CURRENT_PACKAGES_DIR}/lib/aprapp-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/apr-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/aprapp-1.lib") - else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libapr-1.lib" - "${CURRENT_PACKAGES_DIR}/lib/libaprapp-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/libapr-1.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/libaprapp-1.lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - vcpkg_copy_pdbs() else() # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". @@ -73,9 +61,12 @@ else() vcpkg_install_make() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" - "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" - ) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" + "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" + ) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc" "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" ) @@ -84,11 +75,19 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - diff --git a/external_imported/vcpkg/ports/apr/unglue.patch b/external_imported/vcpkg/ports/apr/unglue.patch new file mode 100644 index 000000000..0ce518b8a --- /dev/null +++ b/external_imported/vcpkg/ports/apr/unglue.patch @@ -0,0 +1,17 @@ +diff --git a/include/apr_version.h b/include/apr_version.h +index e96de3835..de3437d71 100644 +--- a/include/apr_version.h ++++ b/include/apr_version.h +@@ -114,9 +114,9 @@ + + /** An alternative formatted string of APR's version */ + /* macro for Win32 .rc files using numeric csv representation */ +-#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \ +- ##APR_MINOR_VERSION ##, \ +- ##APR_PATCH_VERSION ++#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION , \ ++ APR_MINOR_VERSION , \ ++ APR_PATCH_VERSION + + + #ifndef APR_VERSION_ONLY diff --git a/external_imported/vcpkg/ports/apr/vcpkg.json b/external_imported/vcpkg/ports/apr/vcpkg.json index afeff1d23..fca57ea32 100644 --- a/external_imported/vcpkg/ports/apr/vcpkg.json +++ b/external_imported/vcpkg/ports/apr/vcpkg.json @@ -1,15 +1,21 @@ { "name": "apr", "version": "1.7.0", - "port-version": 7, + "port-version": 11, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", "host": true, "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" } ], "features": { diff --git a/external_imported/vcpkg/ports/apsi/portfile.cmake b/external_imported/vcpkg/ports/apsi/portfile.cmake index 500089791..6440b09bb 100644 --- a/external_imported/vcpkg/ports/apsi/portfile.cmake +++ b/external_imported/vcpkg/ports/apsi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 6365cb774b81a2a731334c656db21e5fdfb92870 - SHA512 f21d710a345663aeb35035565c55fd900076589d087a03a1ad7df8b8004ae0e059196f3c94ee63b5ad815a858e5404eea34ae203f7778d4190fd323fd08b7084 + REF ba71aeb28a9f21e4ad59c45aa88232b099ce0b87 #0.8.2 + SHA512 810bcbe0afa3d1c9d299a85bc4266135bdf9adc33bfc754c59731f6cfa6a89d449fb134cef34c4614742bd50e9f8f3916e5b64998dcea69883ca27b7da3c5f04 HEAD_REF main ) @@ -14,6 +14,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zeromq APSI_USE_ZMQ ) +set(CROSSCOMP_OPTIONS "") +if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="") + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -21,11 +28,12 @@ vcpkg_cmake_configure( "-DAPSI_BUILD_TESTS=OFF" "-DAPSI_BUILD_CLI=OFF" ${FEATURE_OPTIONS} + ${CROSSCOMP_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.7") +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.8") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/apsi/vcpkg.json b/external_imported/vcpkg/ports/apsi/vcpkg.json index 29b3035df..32b639830 100644 --- a/external_imported/vcpkg/ports/apsi/vcpkg.json +++ b/external_imported/vcpkg/ports/apsi/vcpkg.json @@ -1,10 +1,9 @@ { "name": "apsi", - "version-semver": "0.7.0", - "port-version": 2, + "version-semver": "0.8.2", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", - "supports": "static & !(arm & osx)", + "license": "MIT", "dependencies": [ "flatbuffers", "jsoncpp", diff --git a/external_imported/vcpkg/ports/argh/portfile.cmake b/external_imported/vcpkg/ports/argh/portfile.cmake index ccaec1449..176567767 100644 --- a/external_imported/vcpkg/ports/argh/portfile.cmake +++ b/external_imported/vcpkg/ports/argh/portfile.cmake @@ -3,32 +3,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adishavit/argh - REF a1edee559757e076e570b8f6c2f555d8d00b373c - SHA512 a100c7ff20ef9ed39d53efeac5507a6ed59fb99ccba36ac4b5f8f5aaac6782f8e951b2f26b9b50f6c6fdbc53b5bceaabbb9dd9b9539f968fc1037733342e17a6 + REF v1.3.2 + SHA512 66073718ef1fc31fbd0feb9daf366a2e28c759de44fb1882dc46a6d10f7a44635ae1155882dff916f55c51fad88bedebdfe361418f7669fac241feead68f2b5b HEAD_REF master - PATCHES - remove_unnamespaced_license_file.patch # https://github.com/adishavit/argh/pull/51 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=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 ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/argh/remove_unnamespaced_license_file.patch b/external_imported/vcpkg/ports/argh/remove_unnamespaced_license_file.patch deleted file mode 100644 index f6742c86c..000000000 --- a/external_imported/vcpkg/ports/argh/remove_unnamespaced_license_file.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 83f364a2eb1b137453772ae9fcf5d7973770637f Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 29 Apr 2020 13:01:31 -0700 -Subject: [PATCH] Don't install 'LICENSE' or 'README.md' directly to the - installation directory. - -This change unconditionally uses GNUInstallDirs which will correctly 'namespace' these files with the 'argh' project name. - -========= - -The names 'LICENSE' and 'README.md' are extremely common and likely to be taken by other ports. This happened in a recent full vcpkg catalog rebuild: - -Starting package 757/1254: qt-advanced-docking-system:x86-windows -Building package qt-advanced-docking-system[core]:x86-windows... -Could not locate cached archive: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip --- Downloading https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz... --- Extracting source C:/agent/_work/1/s/downloads/githubuser0xFFFF-Qt-Advanced-Docking-System-661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz --- Applying patch config_changes.patch --- Using source at C:/agent/_work/1/s/buildtrees/qt-advanced-docking-system/src/bab86dad13-3088149a9b --- Configuring x86-windows --- Building x86-windows-dbg --- Building x86-windows-rel --- Installing: C:/agent/_work/1/s/packages/qt-advanced-docking-system_x86-windows/share/qt-advanced-docking-system/copyright --- Performing post-build validation --- Performing post-build validation done -Stored binary cache: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip -Building package qt-advanced-docking-system[core]:x86-windows... done -Installing package qt-advanced-docking-system[core]:x86-windows... -The following files are already installed in C:/agent/_work/1/s/installed/x86-windows and are in conflict with qt-advanced-docking-system:x86-windows - -Installed by argh:x86-windows - license/LICENSE - -Elapsed time for package qt-advanced-docking-system:x86-windows: 11.09 s ---- - CMakeLists.txt | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13bc879..f6264f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,19 +36,17 @@ endif() - - install(TARGETS argh EXPORT arghTargets) - -+include(GNUInstallDirs) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ - if(CMAKE_SYSTEM_NAME STREQUAL Linux) - # this might be a bit too restrictive, since for other (BSD, ...) this might apply also - # but this can be fixed later in extra pull requests from people on the platform -- include(GNUInstallDirs) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) - install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - else() -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .) - install(FILES argh-config.cmake DESTINATION CMake) - install(EXPORT arghTargets DESTINATION CMake) - endif() diff --git a/external_imported/vcpkg/ports/argh/vcpkg.json b/external_imported/vcpkg/ports/argh/vcpkg.json index 38835e1cd..2329517f0 100644 --- a/external_imported/vcpkg/ports/argh/vcpkg.json +++ b/external_imported/vcpkg/ports/argh/vcpkg.json @@ -1,6 +1,17 @@ { "name": "argh", - "version-string": "2018-12-18", - "port-version": 3, - "description": "Argh! A minimalist argument handler." + "version": "1.3.2", + "description": "Argh! A minimalist argument handler.", + "homepage": "https://github.com/adishavit/argh", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/argon2/CMakeLists.txt b/external_imported/vcpkg/ports/argon2/CMakeLists.txt new file mode 100644 index 000000000..88b7f7e75 --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/CMakeLists.txt @@ -0,0 +1,83 @@ +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + +project(argon2) + +set(ARGON2_VERSION 20190702) + +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") +endif() + +find_package(Threads REQUIRED) + +set(ARGON2_HEADERS + include/argon2.h +) + +set (ARGON2_SRC + "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") +else() + 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") + +install(TARGETS libargon2 + EXPORT unofficial-libargon2 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-libargon2 + NAMESPACE unofficial::argon2:: + DESTINATION "share/unofficial-libargon2" +) + +install(TARGETS argon2_tool + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/external_imported/vcpkg/ports/argon2/portfile.cmake b/external_imported/vcpkg/ports/argon2/portfile.cmake new file mode 100644 index 000000000..54da71466 --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO P-H-C/phc-winner-argon2 + REF 20190702 + SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f + HEAD_REF master + PATCHES + visibility.patch + thread-header.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-libargon2 PACKAGE_NAME unofficial-libargon2) + +vcpkg_copy_tools(TOOL_NAMES argon2_tool AUTO_CLEAN) + +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) diff --git a/external_imported/vcpkg/ports/argon2/thread-header.patch b/external_imported/vcpkg/ports/argon2/thread-header.patch new file mode 100644 index 000000000..4edcf7a8b --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/thread-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/thread.h b/src/thread.h +index d4ca10c..43bd542 100644 +--- a/src/thread.h ++++ b/src/thread.h +@@ -19,6 +19,7 @@ + #define ARGON2_THREAD_H + + #if !defined(ARGON2_NO_THREADS) ++#include + + /* + Here we implement an abstraction layer for the simpĺe requirements diff --git a/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake b/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake new file mode 100644 index 000000000..2723beed5 --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/unofficial-libargon2-config.cmake @@ -0,0 +1,6 @@ +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2.cmake") diff --git a/external_imported/vcpkg/ports/argon2/vcpkg.json b/external_imported/vcpkg/ports/argon2/vcpkg.json new file mode 100644 index 000000000..9a6b0e1d7 --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "argon2", + "version": "20190702", + "description": "Password-hashing library.", + "homepage": "https://github.com/P-H-C/phc-winner-argon2", + "license": "Apache-2.0 OR CC0-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "hwopt": { + "description": "Enable SSE2/AVX2/AVX512 optimizations if supported on architecture" + } + } +} diff --git a/external_imported/vcpkg/ports/argon2/visibility.patch b/external_imported/vcpkg/ports/argon2/visibility.patch new file mode 100644 index 000000000..53bcce7e1 --- /dev/null +++ b/external_imported/vcpkg/ports/argon2/visibility.patch @@ -0,0 +1,46 @@ +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 +--- 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"))) +-#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 + #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/external_imported/vcpkg/ports/argparse/portfile.cmake b/external_imported/vcpkg/ports/argparse/portfile.cmake index 82142c63e..e8558e7e4 100644 --- a/external_imported/vcpkg/ports/argparse/portfile.cmake +++ b/external_imported/vcpkg/ports/argparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/argparse - REF b0cb28ab177cdbd19d439c02cdc217bdfc508ba9 # v2.2 - SHA512 247f27aa45994ee4629b947e3fe1b1df8fae4e773992c740a7c3d544e45ce83a68ecdcfdedf38c461ccb81cf93d88dfee21dc4f7d027677a3c7d930170446971 + REF 4f10f378c526c8570288daa92e269a26c6ea07ad # v2.8 + SHA512 29dd57431cea73d88d6dfca58c76c2f14bfa9c661ed2b5dbfa517f8ed2504371ec68939a35dd01e26a50a45d8688169993e971dd98eca5e889ebb5bb6363592a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/argparse/vcpkg.json b/external_imported/vcpkg/ports/argparse/vcpkg.json index ca94bbc8b..94365194d 100644 --- a/external_imported/vcpkg/ports/argparse/vcpkg.json +++ b/external_imported/vcpkg/ports/argparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "argparse", - "version": "2.2", + "version": "2.8", "description": "Argument parser for modern C++", "homepage": "https://github.com/p-ranav/argparse", "license": "MIT", diff --git a/external_imported/vcpkg/ports/aricpp/portfile.cmake b/external_imported/vcpkg/ports/aricpp/portfile.cmake index f9c96b5bd..189e85e6a 100644 --- a/external_imported/vcpkg/ports/aricpp/portfile.cmake +++ b/external_imported/vcpkg/ports/aricpp/portfile.cmake @@ -1,21 +1,20 @@ +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/aricpp - REF v1.1.1 - SHA512 b1e02b9ba9afc1f3315e238cd61b98a8d28eee08ddbaccaf171aa77d27ecec2b3abfaa5aae6905f9c2a1c83b0095a135f2186c977a0ae0cfafb48e3690814183 + REF v1.1.2 + SHA512 bf325de240cdc9c567524cdc127c256d1ac783e785779117374f1d2a5fd4f352545e87f3d1556c2a24e47a203b55bc581a92fb20426295f5f9dcb4a8078cb215 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/aricpp) - -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_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/aricpp/vcpkg.json b/external_imported/vcpkg/ports/aricpp/vcpkg.json index acfc7e0fb..ec4431ea9 100644 --- a/external_imported/vcpkg/ports/aricpp/vcpkg.json +++ b/external_imported/vcpkg/ports/aricpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "aricpp", - "version-semver": "1.1.1", - "port-version": 1, + "version-semver": "1.1.2", "description": "Asterisk ARI interface bindings for modern C++", "homepage": "https://github.com/daniele77/aricpp", + "license": "BSL-1.0", "dependencies": [ "boost-asio", "boost-beast", diff --git a/external_imported/vcpkg/ports/armadillo/add-disable-find-package.patch b/external_imported/vcpkg/ports/armadillo/add-disable-find-package.patch index b5d67d5c2..69ff6c4ba 100644 --- a/external_imported/vcpkg/ports/armadillo/add-disable-find-package.patch +++ b/external_imported/vcpkg/ports/armadillo/add-disable-find-package.patch @@ -14,7 +14,7 @@ index 1a709ad..3029c25 100644 find_library(ARPACK_LIBRARY NAMES arpack diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake -index 491a361..e40a0ff 100644 +index 6ad1eee..6dd372e 100644 --- a/cmake_aux/Modules/ARMA_FindATLAS.cmake +++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake @@ -1,3 +1,8 @@ @@ -23,11 +23,11 @@ index 491a361..e40a0ff 100644 + return() +endif() + - find_path(ATLAS_CBLAS_INCLUDE_DIR - NAMES cblas.h - PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ + set(ATLAS_NAMES) + set(ATLAS_NAMES ${ATLAS_NAMES} tatlas) + set(ATLAS_NAMES ${ATLAS_NAMES} satlas) diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake -index 0fd5b06..d6bcd49 100644 +index 38f6675..4702ab4 100644 --- a/cmake_aux/Modules/ARMA_FindMKL.cmake +++ b/cmake_aux/Modules/ARMA_FindMKL.cmake @@ -6,6 +6,11 @@ @@ -43,7 +43,7 @@ index 0fd5b06..d6bcd49 100644 #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -index abf046d..e496cb0 100644 +index 88dcb9c..16a26b8 100644 --- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake @@ -5,6 +5,11 @@ @@ -56,5 +56,5 @@ index abf046d..e496cb0 100644 +endif() + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h - /usr/include/superlu/ - /usr/include/SuperLU/ + PATHS ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include /usr/local/include /opt/local/include + PATH_SUFFIXES superlu SuperLU "" diff --git a/external_imported/vcpkg/ports/armadillo/fix-CMakePath.patch b/external_imported/vcpkg/ports/armadillo/fix-CMakePath.patch index cfafc4f28..74eeeb3f7 100644 --- a/external_imported/vcpkg/ports/armadillo/fix-CMakePath.patch +++ b/external_imported/vcpkg/ports/armadillo/fix-CMakePath.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea5516e..ecd14bc 100644 +index c60cd53..855391a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION +@@ -664,7 +664,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION # and install it set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/external_imported/vcpkg/ports/armadillo/portfile.cmake b/external_imported/vcpkg/ports/armadillo/portfile.cmake index aa501fc5d..e293d56ed 100644 --- a/external_imported/vcpkg/ports/armadillo/portfile.cmake +++ b/external_imported/vcpkg/ports/armadillo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.6.2.tar.xz" - SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba + FILENAME "armadillo-11.2.3.tar.xz" + SHA512 db3457adbc799c68c928aaf22714598b4b9df91ec83aff33bf2d0096b755bd316d4bae12ac973bf1821759a71f3a58a7dd8dc64cbcb1f53ea2646d8bb0bc9a3b PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/external_imported/vcpkg/ports/armadillo/remove_custom_modules.patch b/external_imported/vcpkg/ports/armadillo/remove_custom_modules.patch index 88631b573..5937f6a64 100644 --- a/external_imported/vcpkg/ports/armadillo/remove_custom_modules.patch +++ b/external_imported/vcpkg/ports/armadillo/remove_custom_modules.patch @@ -1,23 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab7dbed..ea5516e 100644 +index e5dcf54..c60cd53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -324,15 +324,15 @@ if(APPLE) - else() - +@@ -335,13 +335,12 @@ else() + else() + set(FlexiBLAS_FOUND false) + endif() +- ++ ++ find_package(BLAS) ++ find_package(LAPACK) include(ARMA_FindMKL) - include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) + include(ARMA_FindATLAS) # TODO: remove support for ATLAS in next major version - include(ARMA_FindBLAS) - include(ARMA_FindLAPACK) - - if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) - include(ARMA_FindFlexiBLAS) - endif() - -+ find_package(BLAS) -+ find_package(LAPACK) -+ +- ++ + message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" ) message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) - message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) diff --git a/external_imported/vcpkg/ports/armadillo/vcpkg.json b/external_imported/vcpkg/ports/armadillo/vcpkg.json index 27e432049..4b641a135 100644 --- a/external_imported/vcpkg/ports/armadillo/vcpkg.json +++ b/external_imported/vcpkg/ports/armadillo/vcpkg.json @@ -1,9 +1,9 @@ { "name": "armadillo", - "version": "10.6.2", - "port-version": 5, + "version": "11.2.3", "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", + "license": "Apache-2.0", "dependencies": [ "blas", "lapack", diff --git a/external_imported/vcpkg/ports/arrayfire/fix-dependency-clfft.patch b/external_imported/vcpkg/ports/arrayfire/fix-dependency-clfft.patch new file mode 100644 index 000000000..8072746e3 --- /dev/null +++ b/external_imported/vcpkg/ports/arrayfire/fix-dependency-clfft.patch @@ -0,0 +1,14 @@ +diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt +index f970da0..b543433 100644 +--- a/src/backend/opencl/CMakeLists.txt ++++ b/src/backend/opencl/CMakeLists.txt +@@ -12,7 +12,8 @@ set_property(CACHE AF_OPENCL_BLAS_LIBRARY PROPERTY STRINGS "clBLAS" "CLBlast") + + af_deprecate(OPENCL_BLAS_LIBRARY AF_OPENCL_BLAS_LIBRARY) + +-include(build_clFFT) ++find_package(clFFT CONFIG REQUIRED) ++add_library(clFFT::clFFT ALIAS clFFT) + + file(GLOB kernel_src kernel/*.cl kernel/KParam.hpp) + diff --git a/external_imported/vcpkg/ports/arrayfire/portfile.cmake b/external_imported/vcpkg/ports/arrayfire/portfile.cmake index 29322df6c..85c4e587a 100644 --- a/external_imported/vcpkg/ports/arrayfire/portfile.cmake +++ b/external_imported/vcpkg/ports/arrayfire/portfile.cmake @@ -7,7 +7,8 @@ vcpkg_from_github( PATCHES build.patch Fix-constexpr-error-with-vs2019-with-half.patch - ) + fix-dependency-clfft.patch +) # arrayfire cpu thread lib needed as a submodule for the CPU backend vcpkg_from_github( @@ -16,7 +17,7 @@ vcpkg_from_github( REF b666773940269179f19ef11c8f1eb77005e85d9a SHA512 b3e8b54acf3a588b1f821c2774d5da2d8f8441962c6d99808d513f7117278b9066eb050b8b501bddbd3882e68eb5cc5da0b2fca54e15ab1923fe068a3fe834f5 HEAD_REF master - ) +) # Get forge. We only need headers and aren't actually linking. # We don't want to use the vcpkg dependency since it is broken in many @@ -44,8 +45,7 @@ set(AF_DEFAULT_VCPKG_CMAKE_FLAGS -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib -DAF_BUILD_FORGE=OFF - -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets - ) +) # bin/dll directory for Windows non-static builds for the unified backend dll if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -73,11 +73,19 @@ vcpkg_cmake_configure( OPTIONS ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} ${AF_BACKEND_FEATURE_OPTIONS} - ) + OPTIONS_DEBUG + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" # for CMake configs/targets + OPTIONS_RELEASE + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/share/${PORT}" # for CMake configs/targets + MAYBE_UNUSED_VARIABLES + AF_CPU_THREAD_PATH +) vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/arrayfire/vcpkg.json b/external_imported/vcpkg/ports/arrayfire/vcpkg.json index 91a39717c..5e1470f3f 100644 --- a/external_imported/vcpkg/ports/arrayfire/vcpkg.json +++ b/external_imported/vcpkg/ports/arrayfire/vcpkg.json @@ -1,7 +1,10 @@ { "name": "arrayfire", "version-semver": "3.8.0", + "port-version": 2, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", + "homepage": "https://github.com/arrayfire/arrayfire", + "license": "BSD-3-Clause", "supports": "x64", "dependencies": [ "boost-compute", @@ -39,6 +42,7 @@ "opencl": { "description": "ArrayFire OpenCL backend", "dependencies": [ + "clfft", "opencl" ] }, diff --git a/external_imported/vcpkg/ports/arrow/cuda-ptr.patch b/external_imported/vcpkg/ports/arrow/cuda-ptr.patch new file mode 100644 index 000000000..928c0d2ab --- /dev/null +++ b/external_imported/vcpkg/ports/arrow/cuda-ptr.patch @@ -0,0 +1,61 @@ +diff --git a/cpp/src/arrow/gpu/cuda_context.h b/cpp/src/arrow/gpu/cuda_context.h +index 00bcf94c8..0115ed19a 100644 +--- a/cpp/src/arrow/gpu/cuda_context.h ++++ b/cpp/src/arrow/gpu/cuda_context.h +@@ -76,7 +76,7 @@ class ARROW_EXPORT CudaDeviceManager { + static std::unique_ptr instance_; + + class Impl; +- std::unique_ptr impl_; ++ std::shared_ptr impl_; + + friend class CudaContext; + friend class CudaDevice; +@@ -146,7 +146,7 @@ class ARROW_EXPORT CudaDevice : public Device { + /// \endcond + + explicit CudaDevice(Impl); +- std::unique_ptr impl_; ++ std::shared_ptr impl_; + }; + + /// \brief Return whether a device instance is a CudaDevice +@@ -297,7 +297,7 @@ class ARROW_EXPORT CudaContext : public std::enable_shared_from_this impl_; ++ std::shared_ptr impl_; + + friend class CudaBuffer; + friend class CudaBufferReader; +diff --git a/cpp/src/arrow/gpu/cuda_internal.h b/cpp/src/arrow/gpu/cuda_internal.h +index 25eb6e06c..d70873634 100644 +--- a/cpp/src/arrow/gpu/cuda_internal.h ++++ b/cpp/src/arrow/gpu/cuda_internal.h +@@ -33,6 +33,7 @@ namespace internal { + + std::string CudaErrorDescription(CUresult err); + ++ARROW_EXPORT + Status StatusFromCuda(CUresult res, const char* function_name = nullptr); + + #define CU_RETURN_NOT_OK(FUNC_NAME, STMT) \ +diff --git a/cpp/src/arrow/gpu/cuda_memory.h b/cpp/src/arrow/gpu/cuda_memory.h +index 4efd38894..18c23a507 100644 +--- a/cpp/src/arrow/gpu/cuda_memory.h ++++ b/cpp/src/arrow/gpu/cuda_memory.h +@@ -250,10 +250,12 @@ Result> AllocateCudaHostBuffer(int device_number + const int64_t size); + + /// Low-level: get a device address through which the CPU data be accessed. ++ARROW_EXPORT + Result GetDeviceAddress(const uint8_t* cpu_data, + const std::shared_ptr& ctx); + + /// Low-level: get a CPU address through which the device data be accessed. ++ARROW_EXPORT + Result GetHostAddress(uintptr_t device_ptr); + + } // namespace cuda + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch b/external_imported/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch new file mode 100644 index 000000000..7cb1db7e6 --- /dev/null +++ b/external_imported/vcpkg/ports/arrow/fix-ThirdPartyToolchain.patch @@ -0,0 +1,121 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index bca86d4c1..52f87aa97 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -737,7 +737,7 @@ endif() + + if(ARROW_WITH_BROTLI) + # Order is important for static linking +- set(ARROW_BROTLI_LIBS Brotli::brotlienc Brotli::brotlidec Brotli::brotlicommon) ++ set(ARROW_BROTLI_LIBS unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) + list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) + list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) + if(Brotli_SOURCE STREQUAL "SYSTEM") +@@ -825,10 +825,10 @@ if(ARROW_WITH_OPENTELEMETRY) + endif() + + if(ARROW_WITH_UTF8PROC) +- list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc) +- list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_LINK_LIBS utf8proc) ++ list(APPEND ARROW_STATIC_LINK_LIBS utf8proc) + if(utf8proc_SOURCE STREQUAL "SYSTEM") +- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc) + endif() + endif() + +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index 5d1da18b7..9c5adf47d 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + AWSSDK + benchmark + Boost +- Brotli ++ unofficial-brotli + BZip2 + c-ares + gflags +@@ -74,7 +74,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + Substrait + Thrift + ucx +- utf8proc ++ unofficial-utf8proc + xsimd + ZLIB + zstd) +@@ -152,6 +152,7 @@ foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES}) + endforeach() + + macro(build_dependency DEPENDENCY_NAME) ++ message(FATAL_ERROR "dependencies should never be built in vcpkg") + if("${DEPENDENCY_NAME}" STREQUAL "AWSSDK") + build_awssdk() + elseif("${DEPENDENCY_NAME}" STREQUAL "benchmark") +@@ -239,7 +240,7 @@ macro(resolve_dependency DEPENDENCY_NAME) + endif() + + if(ARG_HAVE_ALT) +- set(PACKAGE_NAME "${DEPENDENCY_NAME}Alt") ++ set(PACKAGE_NAME "${DEPENDENCY_NAME}") + else() + set(PACKAGE_NAME ${DEPENDENCY_NAME}) + endif() +@@ -1138,8 +1139,23 @@ if(ARROW_WITH_SNAPPY) + TRUE + PC_PACKAGE_NAMES + snappy) ++ set(Snappy_TARGET "Snappy::snappy") + if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) ++ get_target_property(SNAPPY_IMPLIB_DEBUG Snappy::snappy IMPORTED_IMPLIB_DEBUG) ++ get_target_property(SNAPPY_LIB_DEBUG Snappy::snappy IMPORTED_LOCATION_DEBUG) ++ get_target_property(SNAPPY_IMPLIB_RELEASE Snappy::snappy IMPORTED_IMPLIB_RELEASE) ++ get_target_property(SNAPPY_LIB_RELEASE Snappy::snappy IMPORTED_LOCATION_RELEASE) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND SNAPPY_IMPLIB_DEBUG) ++ set(SNAPPY_LIB "${SNAPPY_IMPLIB_DEBUG}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND SNAPPY_LIB_DEBUG) ++ set(SNAPPY_LIB "${SNAPPY_LIB_DEBUG}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND SNAPPY_IMPLIB_RELEASE) ++ set(SNAPPY_LIB "${SNAPPY_IMPLIB_RELEASE}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND SNAPPY_LIB_RELEASE) ++ set(SNAPPY_LIB "${SNAPPY_LIB_RELEASE}") ++ else() + get_target_property(SNAPPY_TYPE ${Snappy_TARGET} TYPE) ++ endif() + if(NOT SNAPPY_TYPE STREQUAL "INTERFACE_LIBRARY") + get_target_property(SNAPPY_LIB ${Snappy_TARGET} + IMPORTED_LOCATION_${UPPERCASE_BUILD_TYPE}) +@@ -1214,7 +1230,8 @@ macro(build_brotli) + endmacro() + + if(ARROW_WITH_BROTLI) +- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ set(Brotli_SOURCE SYSTEM) ++ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) + endif() + + if(PARQUET_REQUIRE_ENCRYPTION AND NOT ARROW_PARQUET) +@@ -1646,7 +1663,8 @@ if(ARROW_WITH_PROTOBUF) + ${ARROW_PROTOBUF_REQUIRED_VERSION} + PC_PACKAGE_NAMES + protobuf) +- ++ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf ++ INTERFACE_INCLUDE_DIRECTORIES) + if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) + add_definitions(-DPROTOBUF_USE_DLLS) + endif() +@@ -2599,9 +2617,7 @@ macro(build_utf8proc) + endmacro() + + if(ARROW_WITH_UTF8PROC) +- resolve_dependency(utf8proc +- REQUIRED_VERSION +- "2.2.0" ++ resolve_dependency(unofficial-utf8proc + PC_PACKAGE_NAMES + libutf8proc) + add_definitions(-DARROW_WITH_UTF8PROC) diff --git a/external_imported/vcpkg/ports/arrow/fix-dependencies.patch b/external_imported/vcpkg/ports/arrow/fix-dependencies.patch deleted file mode 100644 index e9b740df9..000000000 --- a/external_imported/vcpkg/ports/arrow/fix-dependencies.patch +++ /dev/null @@ -1,316 +0,0 @@ -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 2d7baf118..ace45d35b 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -699,7 +699,7 @@ endif() - - if(ARROW_WITH_BROTLI) - # Order is important for static linking -- set(ARROW_BROTLI_LIBS Brotli::brotlienc Brotli::brotlidec Brotli::brotlicommon) -+ set(ARROW_BROTLI_LIBS unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) - list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) - list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) - if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -715,9 +715,9 @@ if(ARROW_WITH_BZ2) - endif() - - if(ARROW_WITH_LZ4) -- list(APPEND ARROW_STATIC_LINK_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_LINK_LIBS lz4::lz4) - if(Lz4_SOURCE STREQUAL "SYSTEM") -- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS lz4::lz4) - endif() - endif() - -@@ -787,10 +787,10 @@ if(ARROW_WITH_OPENTELEMETRY) - endif() - - if(ARROW_WITH_UTF8PROC) -- list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc) -- list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc) -+ list(APPEND ARROW_LINK_LIBS utf8proc) -+ list(APPEND ARROW_STATIC_LINK_LIBS utf8proc) - if(utf8proc_SOURCE STREQUAL "SYSTEM") -- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc::utf8proc) -+ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc) - endif() - endif() - -diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index bc389521b..1b358ce70 100644 ---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake -@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - AWSSDK - benchmark - Boost -- Brotli -+ unofficial-brotli - BZip2 - c-ares - gflags -@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - gRPC - GTest - LLVM -- Lz4 -+ lz4 - opentelemetry-cpp - ORC - re2 -@@ -70,7 +70,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - RapidJSON - Snappy - Thrift -- utf8proc -+ unofficial-utf8proc - xsimd - ZLIB - zstd) -@@ -893,17 +893,7 @@ set(Boost_ADDITIONAL_VERSIONS - # so we first need to determine whether we're building it - if(ARROW_WITH_THRIFT AND Thrift_SOURCE STREQUAL "AUTO") - find_package(Thrift 0.11.0 MODULE COMPONENTS ${ARROW_THRIFT_REQUIRED_COMPONENTS}) -- if(Thrift_FOUND) -- find_package(PkgConfig QUIET) -- pkg_check_modules(THRIFT_PC -- thrift -- NO_CMAKE_PATH -- NO_CMAKE_ENVIRONMENT_PATH -- QUIET) -- if(THRIFT_PC_FOUND) -- string(APPEND ARROW_PC_REQUIRES_PRIVATE " thrift") -- endif() -- else() -+ if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) - set(Thrift_SOURCE "BUNDLED") - endif() - endif() -@@ -1038,7 +1028,7 @@ macro(build_snappy) - endmacro() - - if(ARROW_WITH_SNAPPY) -- resolve_dependency(Snappy PC_PACKAGE_NAMES snappy) -+ resolve_dependency(Snappy USE_CONFIG TRUE PC_PACKAGE_NAMES snappy) - if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) - get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) - string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") -@@ -1108,10 +1098,16 @@ macro(build_brotli) - endmacro() - - if(ARROW_WITH_BROTLI) -- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) -+ set(unofficial-brotli_SOURCE "SYSTEM") -+ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon -- INTERFACE_INCLUDE_DIRECTORIES) -+ if (BUILD_SHARED_LIBS) -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon -+ INTERFACE_INCLUDE_DIRECTORIES) -+ else() -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static -+ INTERFACE_INCLUDE_DIRECTORIES) -+ endif() - include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) - endif() - -@@ -1228,7 +1224,7 @@ macro(build_glog) - endmacro() - - if(ARROW_USE_GLOG) -- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) -+ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) -@@ -1302,8 +1298,7 @@ endmacro() - if(ARROW_NEED_GFLAGS) - set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") - resolve_dependency(gflags -- HAVE_ALT -- TRUE -+ USE_CONFIG TRUE - REQUIRED_VERSION - ${ARROW_GFLAGS_REQUIRED_VERSION} - IS_RUNTIME_DEPENDENCY -@@ -1402,9 +1397,10 @@ endmacro() - if(ARROW_WITH_THRIFT) - # We already may have looked for Thrift earlier, when considering whether - # to build Boost, so don't look again if already found. -- if(NOT Thrift_FOUND) -+ if(TRUE) - # Thrift c++ code generated by 0.13 requires 0.11 or greater - resolve_dependency(Thrift -+ USE_CONFIG TRUE - REQUIRED_VERSION - 0.11.0 - PC_PACKAGE_NAMES -@@ -1413,6 +1409,14 @@ if(ARROW_WITH_THRIFT) - # TODO: Don't use global includes but rather target_include_directories - include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) - -+ if(THRIFT_INCLUDE_DIR) -+ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) -+ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION -+ "${THRIFT_CONFIG_H_CONTENT}") -+ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") -+ set(THRIFT_VERSION "${THRIFT_VERSION}") -+ endif() -+ - string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) - list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) - list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) -@@ -1528,6 +1532,7 @@ if(ARROW_WITH_PROTOBUF) - set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") - endif() - resolve_dependency(Protobuf -+ USE_CONFIG TRUE - REQUIRED_VERSION - ${ARROW_PROTOBUF_REQUIRED_VERSION} - PC_PACKAGE_NAMES -@@ -1538,6 +1543,10 @@ if(ARROW_WITH_PROTOBUF) - endif() - - # TODO: Don't use global includes but rather target_include_directories -+ if (TARGET protobuf::libprotobuf) -+ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf -+ INTERFACE_INCLUDE_DIRECTORIES) -+ endif() - include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) - - if(TARGET arrow::protobuf::libprotobuf) -@@ -1586,12 +1595,18 @@ if(ARROW_WITH_PROTOBUF) - - # Log protobuf paths as we often see issues with mixed sources for - # the libraries and protoc. -+ if (NOT TARGET protobuf::protoc) - get_target_property(PROTOBUF_PROTOC_EXECUTABLE ${ARROW_PROTOBUF_PROTOC} - IMPORTED_LOCATION) -+ endif() - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake - message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ if (NOT TARGET protobuf::libprotobuf) - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) -+ else() -+ set(PROTOBUF_LIBRARY protobuf::libprotobuf) -+ endif() - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") - endif() -@@ -2001,7 +2016,7 @@ endmacro() - if(ARROW_WITH_RAPIDJSON) - set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") - resolve_dependency(RapidJSON -- HAVE_ALT -+ USE_CONFIG - TRUE - REQUIRED_VERSION - ${ARROW_RAPIDJSON_REQUIRED_VERSION} -@@ -2140,10 +2155,11 @@ macro(build_lz4) - endmacro() - - if(ARROW_WITH_LZ4) -- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) -+ set(lz4_SOURCE "SYSTEM") -+ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) - - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(LZ4_INCLUDE_DIR lz4::lz4 INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) - endif() - -@@ -2207,7 +2223,7 @@ endmacro() - if(ARROW_WITH_ZSTD) - # ARROW-13384: ZSTD_minCLevel was added in v1.4.0, required by ARROW-13091 - resolve_dependency(zstd -- PC_PACKAGE_NAMES -+ USE_CONFIG TRUE PC_PACKAGE_NAMES - libzstd - REQUIRED_VERSION - 1.4.0) -@@ -2390,9 +2406,8 @@ macro(build_utf8proc) - endmacro() - - if(ARROW_WITH_UTF8PROC) -- resolve_dependency(utf8proc -- REQUIRED_VERSION -- "2.2.0" -+ resolve_dependency(unofficial-utf8proc -+ USE_CONFIG TRUE - PC_PACKAGE_NAMES - libutf8proc) - -@@ -2400,7 +2415,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global definitions but rather - # target_compile_definitions or target_link_libraries -- get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc::utf8proc -+ get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc - INTERFACE_COMPILER_DEFINITIONS) - if(UTF8PROC_COMPILER_DEFINITIONS) - add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2408,7 +2423,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global includes but rather - # target_include_directories or target_link_libraries -- get_target_property(UTF8PROC_INCLUDE_DIR utf8proc::utf8proc -+ get_target_property(UTF8PROC_INCLUDE_DIR utf8proc - INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) - endif() -@@ -3317,7 +3332,7 @@ endmacro() - - macro(build_grpc) - resolve_dependency(c-ares -- HAVE_ALT -+ USE_CONFIG - TRUE - PC_PACKAGE_NAMES - libcares) -@@ -3555,7 +3570,7 @@ if(ARROW_WITH_GRPC) - set(gRPC_SOURCE "${Protobuf_SOURCE}") - endif() - resolve_dependency(gRPC -- HAVE_ALT -+ USE_CONFIG - TRUE - REQUIRED_VERSION - ${ARROW_GRPC_REQUIRED_VERSION} -@@ -3565,6 +3580,10 @@ if(ARROW_WITH_GRPC) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) -+ if (ABSL_USE_CXX17) -+ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") -+ set(CMAKE_CXX_STANDARD 17) -+ endif() - - if(GRPC_VENDORED) - set(GRPCPP_PP_INCLUDE TRUE) -@@ -4315,7 +4334,8 @@ if(ARROW_S3) - s3 - transfer - identity-management -- sts) -+ sts -+ CONFIG) - endif() - - # Restore previous value of BUILD_SHARED_LIBS -diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt -index b1b6847cf..444a45e4e 100644 ---- a/cpp/src/arrow/adapters/orc/CMakeLists.txt -+++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt -@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS - GTest::gtest_main - GTest::gtest - Snappy::snappy -- LZ4::lz4 -+ lz4::lz4 - ZLIB::ZLIB) - - if(ARROW_BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/arrow/all.patch b/external_imported/vcpkg/ports/arrow/msvc-static-name.patch similarity index 100% rename from external_imported/vcpkg/ports/arrow/all.patch rename to external_imported/vcpkg/ports/arrow/msvc-static-name.patch diff --git a/external_imported/vcpkg/ports/arrow/portfile.cmake b/external_imported/vcpkg/ports/arrow/portfile.cmake index 972be6641..59a4864e2 100644 --- a/external_imported/vcpkg/ports/arrow/portfile.cmake +++ b/external_imported/vcpkg/ports/arrow/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-7.0.0 - SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd + REF apache-arrow-9.0.0 + SHA512 1191793dd56471fb2b402afbe9b31cde4c5126785243e538e42ba95ccd31d523121f07b144461c99a4b7449e611aa5998bd0de95e8e4b0e3c80397499fe746f0 HEAD_REF master PATCHES - all.patch - fix-dependencies.patch + cuda-ptr.patch + msvc-static-name.patch + fix-ThirdPartyToolchain.patch + static-link-libs.patch # https://github.com/apache/arrow/pull/13707 & pull/13863 ) - file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" "${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake" @@ -34,17 +35,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS parquet PARQUET_REQUIRE_ENCRYPTION plasma ARROW_PLASMA s3 ARROW_S3 + cuda ARROW_CUDA ) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) -elseif("jemalloc" IN_LIST FEATURES) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + list(APPEND FEATURE_OPTIONS "-DARROW_USE_NATIVE_INT128=OFF") +endif() + +if("jemalloc" IN_LIST FEATURES) set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON) else() set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) endif() -if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES)) +if("mimalloc" IN_LIST FEATURES) set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON) else() set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF) @@ -74,7 +78,7 @@ vcpkg_cmake_configure( -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED} -DARROW_THRIFT_USE_SHARED=${THRIFT_USE_SHARED} -DBUILD_WARNING_LEVEL=PRODUCTION - -DARROW_WITH_BROTLI=ON + -DARROW_WITH_BROTLI=ON -DARROW_WITH_BZ2=ON -DARROW_WITH_LZ4=ON -DARROW_WITH_SNAPPY=ON @@ -86,32 +90,39 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib") message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") - -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) 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) - -file(GLOB PARQUET_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*) -file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") -file(REMOVE_RECURSE ${PARQUET_FILES}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake ${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake) +if("parquet" IN_LIST FEATURES) + file(GLOB PARQUET_FILES "${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*") + file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") + file(REMOVE_RECURSE ${PARQUET_FILES}) + file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake" "${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake") + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-parquet" usage-parquet) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-parquet}") +else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake") +endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +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 () -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}/share/doc") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}" @ONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt" "${SOURCE_PATH}/NOTICE.txt") diff --git a/external_imported/vcpkg/ports/arrow/static-link-libs.patch b/external_imported/vcpkg/ports/arrow/static-link-libs.patch new file mode 100644 index 000000000..ed0ecafab --- /dev/null +++ b/external_imported/vcpkg/ports/arrow/static-link-libs.patch @@ -0,0 +1,127 @@ +diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt +index 93dd1297b..6b04f7d46 100644 +--- a/cpp/src/arrow/CMakeLists.txt ++++ b/cpp/src/arrow/CMakeLists.txt +@@ -581,6 +581,7 @@ add_arrow_lib(arrow + ${ARROW_SHARED_PRIVATE_LINK_LIBS} + STATIC_LINK_LIBS + ${ARROW_STATIC_LINK_LIBS} ++ STATIC_INSTALL_INTERFACE_LIBS + ${ARROW_STATIC_INSTALL_INTERFACE_LIBS} + SHARED_INSTALL_INTERFACE_LIBS + ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 9e732db80afb..f0c3f30ef3d8 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -822,6 +822,17 @@ if(ARROW_WITH_OPENTELEMETRY) + opentelemetry-cpp::trace + opentelemetry-cpp::ostream_span_exporter + opentelemetry-cpp::otlp_http_exporter) ++ if(opentelemetry_SOURCE STREQUAL "SYSTEM") ++ list(APPEND ++ ARROW_STATIC_INSTALL_INTERFACE_LIBS ++ opentelemetry-cpp::trace ++ opentelemetry-cpp::ostream_span_exporter ++ opentelemetry-cpp::otlp_http_exporter) ++ endif() ++ if(Protobuf_SOURCE STREQUAL "SYSTEM") ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${ARROW_PROTOBUF_LIBPROTOBUF}) ++ endif() ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS CURL::libcurl) + endif() + + if(ARROW_WITH_UTF8PROC) +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index ad8351f9cc6e..5c1dd9d34d12 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -1083,6 +1083,7 @@ endif() + macro(find_curl) + if(NOT TARGET CURL::libcurl) + find_package(CURL REQUIRED) ++ list(APPEND ARROW_SYSTEM_DEPENDENCIES CURL) + if(NOT TARGET CURL::libcurl) + # For CMake 3.11 or older + add_library(CURL::libcurl UNKNOWN IMPORTED) +@@ -4540,11 +4541,11 @@ macro(build_opentelemetry) + + foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_LIBS}) + add_dependencies(opentelemetry-cpp::${_OPENTELEMETRY_LIB} opentelemetry_ep) ++ list(APPEND ARROW_BUNDLED_STATIC_LIBS opentelemetry-cpp::${_OPENTELEMETRY_LIB}) + endforeach() + + # Work around https://gitlab.kitware.com/cmake/cmake/issues/15052 + file(MAKE_DIRECTORY ${OPENTELEMETRY_INCLUDE_DIR}) +- + endmacro() + + if(ARROW_WITH_OPENTELEMETRY) +diff --git a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt +index 32f980060c95..c89751731575 100644 +--- a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt ++++ b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt +@@ -24,7 +24,7 @@ include(ExternalProject) + include(FindPkgConfig) + include(GNUInstallDirs) + +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") ++option(PARQUET_LINK_SHARED "Link to the Parquet shared library" ON) + + # This ensures that things like gnu++11 get passed correctly + if(NOT DEFINED CMAKE_CXX_STANDARD) +@@ -39,4 +39,8 @@ find_package(Arrow REQUIRED) + find_package(Parquet REQUIRED) + + add_executable(parquet-arrow-example reader_writer.cc) +-target_link_libraries(parquet-arrow-example parquet_shared arrow_shared) ++if(PARQUET_LINK_SHARED) ++ target_link_libraries(parquet-arrow-example parquet_shared) ++else() ++ target_link_libraries(parquet-arrow-example parquet_static) ++endif() +diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt +index 542fa5bc083b..caed26173428 100644 +--- a/cpp/src/parquet/CMakeLists.txt ++++ b/cpp/src/parquet/CMakeLists.txt +@@ -106,9 +106,11 @@ endfunction() + + if(ARROW_BUILD_STATIC) + set(PARQUET_STATIC_LINK_LIBS arrow_static ${ARROW_STATIC_LINK_LIBS}) ++ set(PARQUET_STATIC_INTERFACE_INSTALL_LIBS arrow_static) + set(ARROW_LIBRARIES_FOR_STATIC_TESTS arrow_testing_static arrow_static + ${ARROW_STATIC_LINK_LIBS}) + else() ++ set(PARQUET_STATIC_INTERFACE_INSTALL_LIBS) + set(ARROW_LIBRARIES_FOR_STATIC_TESTS arrow_testing_shared arrow_shared) + endif() + +@@ -218,8 +220,9 @@ if(NOT PARQUET_MINIMAL_DEPENDENCY) + + # Link publicly with parquet_static (because internal users need to + # transitively link all dependencies) +- set(PARQUET_STATIC_LINK_LIBS ${PARQUET_STATIC_LINK_LIBS} thrift::thrift) +-endif(NOT PARQUET_MINIMAL_DEPENDENCY) ++ list(APPEND PARQUET_STATIC_LINK_LIBS thrift::thrift) ++ list(APPEND PARQUET_STATIC_INTERFACE_INSTALL_LIBS thrift::thrift) ++endif() + + if(CXX_LINKER_SUPPORTS_VERSION_SCRIPT) + set(PARQUET_SHARED_LINK_FLAGS +@@ -243,8 +246,12 @@ add_arrow_lib(parquet + ${PARQUET_SHARED_LINK_LIBS} + SHARED_PRIVATE_LINK_LIBS + ${PARQUET_SHARED_PRIVATE_LINK_LIBS} ++ SHARED_INSTALL_INTERFACE_LIBS ++ arrow_shared + STATIC_LINK_LIBS +- ${PARQUET_STATIC_LINK_LIBS}) ++ ${PARQUET_STATIC_LINK_LIBS} ++ STATIC_INSTALL_INTERFACE_LIBS ++ ${PARQUET_STATIC_INTERFACE_INSTALL_LIBS}) + + if(WIN32 AND NOT (ARROW_TEST_LINKAGE STREQUAL "static")) + add_library(parquet_test_support STATIC + + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/arrow/usage b/external_imported/vcpkg/ports/arrow/usage index 0dcfa79cb..cd89c9308 100644 --- a/external_imported/vcpkg/ports/arrow/usage +++ b/external_imported/vcpkg/ports/arrow/usage @@ -2,6 +2,3 @@ The package arrow provides CMake targets: find_package(Arrow CONFIG REQUIRED) target_link_libraries(main PRIVATE ${ARROW_LIBRARIES}) - - find_package(Parquet CONFIG REQUIRED) - target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/arrow/usage-parquet b/external_imported/vcpkg/ports/arrow/usage-parquet new file mode 100644 index 000000000..62d7a14b7 --- /dev/null +++ b/external_imported/vcpkg/ports/arrow/usage-parquet @@ -0,0 +1,3 @@ + + find_package(Parquet CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/arrow/vcpkg.json b/external_imported/vcpkg/ports/arrow/vcpkg.json index 1c2b84085..87f34fab6 100644 --- a/external_imported/vcpkg/ports/arrow/vcpkg.json +++ b/external_imported/vcpkg/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "7.0.0", - "port-version": 2, + "version": "9.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -13,7 +12,6 @@ "brotli", "bzip2", "gflags", - "glog", "lz4", "openssl", "re2", @@ -28,6 +26,7 @@ "name": "vcpkg-cmake-config", "host": true }, + "xsimd", "zlib", "zstd" ], @@ -41,9 +40,18 @@ "csv": { "description": "CSV support" }, + "cuda": { + "description": "cuda support", + "dependencies": [ + "cuda" + ] + }, "dataset": { "description": "Dataset support" }, + "example": { + "description": "Install the minimal example (source code)" + }, "filesystem": { "description": "Filesystem support" }, @@ -57,7 +65,8 @@ ] }, "jemalloc": { - "description": "jemalloc allocator" + "description": "jemalloc allocator", + "supports": "!windows" }, "json": { "description": "JSON support", @@ -66,7 +75,8 @@ ] }, "mimalloc": { - "description": "mimalloc allocator" + "description": "mimalloc allocator", + "supports": "windows" }, "orc": { "description": "ORC support", diff --git a/external_imported/vcpkg/ports/ashes/portfile.cmake b/external_imported/vcpkg/ports/ashes/portfile.cmake index 438c62bc9..ddfea4593 100644 --- a/external_imported/vcpkg/ports/ashes/portfile.cmake +++ b/external_imported/vcpkg/ports/ashes/portfile.cmake @@ -3,17 +3,17 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/Ashes - REF f39ca2db24a9d7a2d586c85c78bb6eacd8d63b49 + REF 0f8ad8edec1b0929ebd10247d3dd0a9ee8f8c91a HEAD_REF master - SHA512 a45d443797ffe31305acca154640530c6ed767af9982d857b6e59841add3b0a373723f5f7b590512c1b0dd4064dfbae8aa8445fec59a3c3c2b8a3c002b180609 + SHA512 9f34c2f6760a74eb34fc02c5007af41a089ac8b01716f1ba3670014984ab277f02c4bbf14ce3f5996a164d24c1eb8edd525cb1c5da9fc0edbf2ccce3024cb11a ) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + REF 77734eff73c8bb9861591a9e910f34f2bafa5563 HEAD_REF master - SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 + SHA512 f6110eafc8476f41490f7f9087a83ddf90d21f3cbf455edafd02e4805d3dd7f22ed955b8cba8a26600f080de06b19ce6c712e36f03c825fd3c4015b74d030e72 ) file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") @@ -22,7 +22,6 @@ file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR} -DVCPKG_PACKAGE_BUILD=ON -DASHES_BUILD_TEMPLATES=OFF -DASHES_BUILD_TESTS=OFF diff --git a/external_imported/vcpkg/ports/ashes/vcpkg.json b/external_imported/vcpkg/ports/ashes/vcpkg.json index 0cee851d9..6924e9793 100644 --- a/external_imported/vcpkg/ports/ashes/vcpkg.json +++ b/external_imported/vcpkg/ports/ashes/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ashes", - "version-date": "2022-04-03", + "version-date": "2022-06-08", "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", "homepage": "https://github.com/DragonJoker/Ashes", "license": "MIT", diff --git a/external_imported/vcpkg/ports/asio-grpc/portfile.cmake b/external_imported/vcpkg/ports/asio-grpc/portfile.cmake index d20401ff8..d3e3afa36 100644 --- a/external_imported/vcpkg/ports/asio-grpc/portfile.cmake +++ b/external_imported/vcpkg/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.5.1 - SHA512 528a790a7414db1b03b20d4d82d510a08cba9fc3c99501955c60c28ce4d768202a4339241b9e99f0199deb379345dc75934f991bad735eda0b32eb6cb3cef587 + REF v2.1.0 + SHA512 09a8a34406726057e2db8991a7156ce23e6f1f920d71a5716abcfd303b573929703a6e6af3a1ef6e9fe80ea6d9c7f2a072c6ffca6f06109afd09ab1277835e02 HEAD_REF master ) @@ -15,13 +15,14 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} + -DASIO_GRPC_CMAKE_CONFIG_INSTALL_DIR=share/asio-grpc ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asio-grpc) +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json index 2e2923745..7059a5255 100644 --- a/external_imported/vcpkg/ports/asio-grpc/vcpkg.json +++ b/external_imported/vcpkg/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "1.5.1", + "version": "2.1.0", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/asio/portfile.cmake b/external_imported/vcpkg/ports/asio/portfile.cmake index 6f83c5f40..ee176cca7 100644 --- a/external_imported/vcpkg/ports/asio/portfile.cmake +++ b/external_imported/vcpkg/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-22-1 - SHA512 7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 + REF asio-1-24-0 + SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/asio/vcpkg.json b/external_imported/vcpkg/ports/asio/vcpkg.json index ab4d14556..b3608e5a0 100644 --- a/external_imported/vcpkg/ports/asio/vcpkg.json +++ b/external_imported/vcpkg/ports/asio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "asio", - "version": "1.22.1", + "version": "1.24.0", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", - "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", + "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/asiosdk/Findasiosdk.cmake b/external_imported/vcpkg/ports/asiosdk/Findasiosdk.cmake index b8f32f830..c88f7df3f 100644 --- a/external_imported/vcpkg/ports/asiosdk/Findasiosdk.cmake +++ b/external_imported/vcpkg/ports/asiosdk/Findasiosdk.cmake @@ -3,6 +3,13 @@ else(WIN32) message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" ) endif(WIN32) +# if this script is invoked multiple times, we end up adding +# "asiosdk" to the directory multiple times, leading to incorrect +# include paths +if (ASIOSDK_ROOT_DIR) + return() +endif() + find_path( ASIOSDK_ROOT_DIR asiosdk diff --git a/external_imported/vcpkg/ports/asiosdk/vcpkg.json b/external_imported/vcpkg/ports/asiosdk/vcpkg.json index 6d3e9ce60..55f3f5b4f 100644 --- a/external_imported/vcpkg/ports/asiosdk/vcpkg.json +++ b/external_imported/vcpkg/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 4, + "port-version": 5, "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/external_imported/vcpkg/ports/assimp/build_fixes.patch b/external_imported/vcpkg/ports/assimp/build_fixes.patch index 7590aec96..93d007cd8 100644 --- a/external_imported/vcpkg/ports/assimp/build_fixes.patch +++ b/external_imported/vcpkg/ports/assimp/build_fixes.patch @@ -1,249 +1,135 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcafb64..761040d 100644 +index 458a328..b8c2fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) +@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) - ENDIF(HUNTER_ENABLED) + ENDIF() --PROJECT( Assimp VERSION 5.0.0 ) -+PROJECT( Assimp VERSION 5.0.1 ) +-PROJECT(Assimp VERSION 5.2.4) ++PROJECT(Assimp VERSION 5.2.5) # All supported options ############################################### -@@ -130,6 +130,16 @@ OPTION ( IGNORE_GIT_HASH - OFF - ) - -+find_package(Stb REQUIRED) -+include_directories(${Stb_INCLUDE_DIR}) -+find_package(utf8cpp CONFIG REQUIRED) -+link_libraries(utf8cpp) -+find_package(RapidJSON CONFIG REQUIRED) -+include_directories(${RAPIDJSON_INCLUDE_DIRS}) -+find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") -+include_directories(${UNZIP_INCLUDE_DIRS}/minizip) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) -+ - IF (IOS AND NOT HUNTER_ENABLED) - IF (NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") -@@ -230,10 +240,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M - SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) - SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") - --IF( UNIX ) - # Use GNUInstallDirs for Unix predefined directories - INCLUDE(GNUInstallDirs) --ENDIF( UNIX ) - - # Grouped compiler settings - IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) -@@ -253,7 +261,6 @@ ELSEIF(MSVC) +@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) + ELSEIF(MSVC) + # enable multi-core compilation with MSVC + IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl +- ADD_COMPILE_OPTIONS(/bigobj /W4 /WX ) ++ ADD_COMPILE_OPTIONS(/bigobj ) + ELSE() # msvc +- ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX) ++ ADD_COMPILE_OPTIONS(/MP /bigobj ) + ENDIF() + # disable "elements of array '' will be default initialized" warning on MSVC2013 IF(MSVC12) - ADD_COMPILE_OPTIONS(/wd4351) + ADD_COMPILE_OPTIONS(/wd4351) ENDIF() -- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") - ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - IF(NOT HUNTER_ENABLED) - SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") -@@ -352,35 +359,21 @@ IF (NOT TARGET uninstall) - ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ENDIF() - --IF(HUNTER_ENABLED) -- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+ set(CONFIG_INSTALL_DIR "share/assimp") - set(INCLUDE_INSTALL_DIR "include") - -- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Configuration -- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -- set(NAMESPACE "${PROJECT_NAME}::") -+ set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Config") -+ set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake") -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Include module with fuction 'write_basic_package_version_file' - include(CMakePackageConfigHelpers) -- -- # Note: PROJECT_VERSION is used as a VERSION -- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) -- -- # Use variables: -- # * TARGETS_EXPORT_NAME -- # * PROJECT_NAME -- configure_package_config_file( -- "cmake/assimp-hunter-config.cmake.in" -- "${PROJECT_CONFIG}" -- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -- ) -+ write_basic_package_version_file("${VERSION_CONFIG}" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion) - - install( -- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ FILES ${VERSION_CONFIG} - DESTINATION "${CONFIG_INSTALL_DIR}" - ) - -@@ -389,30 +382,6 @@ IF(HUNTER_ENABLED) - NAMESPACE "${NAMESPACE}" - DESTINATION "${CONFIG_INSTALL_DIR}" - ) --ELSE(HUNTER_ENABLED) -- # cmake configuration files -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) -- IF (is_multi_config) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") -- ELSE() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ENDIF() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) -- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) -- INSTALL(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" -- ${PACKAGE_TARGETS_FILE} -- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) --ENDIF(HUNTER_ENABLED) - - FIND_PACKAGE( DirectX ) - -@@ -422,63 +391,19 @@ ENDIF( BUILD_DOCS ) - - # Look for system installed irrXML - IF ( SYSTEM_IRRXML ) -- FIND_PACKAGE( IrrXML REQUIRED ) -+ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) - ENDIF( SYSTEM_IRRXML ) + ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated +- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") +- SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ++ # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") ++ # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") ++ # SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") + ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + IF(NOT ASSIMP_HUNTER_ENABLED) + SET(CMAKE_CXX_STANDARD 17) +@@ -418,7 +418,7 @@ ENDIF() + + set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in") + set(NAMESPACE "${PROJECT_NAME}::") +@@ -426,7 +426,7 @@ IF(ASSIMP_HUNTER_ENABLED) + set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") + set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") + ELSE() +- set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}") ++ set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") + string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) + set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") +@@ -468,14 +468,14 @@ ENDIF() # Search for external dependencies, and build them from source if not found # Search for zlib --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(ZLIB) - find_package(ZLIB CONFIG REQUIRED) ++IF(1) ++ # hunter_add_package(ZLIB) + find_package(ZLIB REQUIRED) add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) set(ZLIB_FOUND TRUE) - set(ZLIB_LIBRARIES ZLIB::zlib) - set(ASSIMP_BUILD_MINIZIP TRUE) --ELSE(HUNTER_ENABLED) -- IF ( NOT ASSIMP_BUILD_ZLIB ) -- FIND_PACKAGE(ZLIB) -- ENDIF( NOT ASSIMP_BUILD_ZLIB ) -- -- IF( NOT ZLIB_FOUND ) -- MESSAGE(STATUS "compiling zlib from sources") -- INCLUDE(CheckIncludeFile) -- INCLUDE(CheckTypeSize) -- INCLUDE(CheckFunctionExists) -- -- # Explicitly turn off ASM686 and AMD64 cmake options. -- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: -- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 -- # Also prevents these options from "polluting" the cmake options if assimp is being -- # included as a submodule. -- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- -- # compile from sources -- ADD_SUBDIRECTORY(contrib/zlib) -- SET(ZLIB_FOUND 1) -- SET(ZLIB_LIBRARIES zlibstatic) -- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) -- # need to ensure we don't link with system zlib or minizip as well. -- SET(ASSIMP_BUILD_MINIZIP 1) -- ELSE(NOT ZLIB_FOUND) -- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) -- SET(ZLIB_LIBRARIES_LINKED -lz) -- ENDIF(NOT ZLIB_FOUND) + set(ZLIB_LIBRARIES ZLIB::ZLIB) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) --ENDIF(HUNTER_ENABLED) ++ set(ASSIMP_BUILD_MINIZIP OFF) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. + IF( ZLIB_FOUND ) +@@ -516,12 +516,12 @@ ELSE() + ENDIF() --IF( NOT IOS ) + IF( NOT IOS ) - IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) --ELSE ( NOT IOS ) -- IF( NOT BUILD_SHARED_LIBS ) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) + ENDIF() + ELSE () + IF( NOT BUILD_SHARED_LIBS ) - IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) -- ENDIF ( NOT BUILD_SHARED_LIBS ) --ENDIF ( NOT IOS ) -+ find_package(minizip CONFIG REQUIRED) - - IF ( ASSIMP_NO_EXPORT ) - ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) -@@ -633,7 +558,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) - INCLUDE(DebSourcePPA) - ENDIF() - --if(WIN32) -+if(0) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") - SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") -@@ -677,4 +602,4 @@ if(WIN32) - ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) ENDIF() - ENDIF(MSVC12 OR MSVC14 OR MSVC15 ) --ENDIF (WIN32) -+ENDIF (0) -diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in -index ab1a8d2..4b0729b 100644 ---- a/assimpTargets.cmake.in -+++ b/assimpTargets.cmake.in -@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) - endif() - cmake_policy(PUSH) - cmake_policy(VERSION 2.6) -+# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function -+cmake_policy(SET CMP0012 NEW) - #---------------------------------------------------------------- - # Generated CMake target import file. - #---------------------------------------------------------------- -diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp -index 1f388ad..1ccd2aa 100644 ---- a/code/3MF/D3MFExporter.cpp -+++ b/code/3MF/D3MFExporter.cpp -@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ENDIF () +diff --git a/cmake-modules/assimp-plain-config.cmake.in b/cmake-modules/assimp-plain-config.cmake.in +index 6551dcb..0796448 100644 +--- a/cmake-modules/assimp-plain-config.cmake.in ++++ b/cmake-modules/assimp-plain-config.cmake.in +@@ -1,5 +1,20 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++ ++find_dependency(pugixml CONFIG) ++if(NOT @BUILD_SHARED_LIBS@) ++ find_dependency(kubazip CONFIG) ++ find_dependency(minizip CONFIG) ++ #find_dependency(openddlparser CONFIG) ++ find_dependency(poly2tri CONFIG) ++ #find_dependency(polyclipping CONFIG) ++ find_dependency(RapidJSON CONFIG) ++ find_dependency(Stb MODULE) ++ find_dependency(utf8cpp CONFIG) ++ find_dependency(ZLIB) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + + set(ASSIMP_ROOT_DIR ${PACKAGE_PREFIX_DIR}) +diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp +index 42cd991..640e2fb 100644 +--- a/code/AssetLib/3MF/D3MFExporter.cpp ++++ b/code/AssetLib/3MF/D3MFExporter.cpp +@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_USE_HUNTER - # include + #include #else --# include -+# include +-#include ++#include #endif namespace Assimp { -@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { - hexDiffuseColor.clear(); - tmp.clear(); - hexDiffuseColor = "#"; -- -+ - tmp = DecimalToHexa( color.r ); - hexDiffuseColor += tmp; - tmp = DecimalToHexa( color.g ); -diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h -index 518e56c..ec4a653 100644 ---- a/code/Blender/BlenderTessellator.h -+++ b/code/Blender/BlenderTessellator.h +diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/BlenderTessellator.h +index 0d0ba32..c3703c4 100644 +--- a/code/AssetLib/Blender/BlenderTessellator.h ++++ b/code/AssetLib/Blender/BlenderTessellator.h @@ -147,7 +147,7 @@ namespace Assimp #ifdef ASSIMP_USE_HUNTER # include @@ -253,374 +139,371 @@ index 518e56c..ec4a653 100644 #endif namespace Assimp +diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp +index ef59542..17e00cd 100644 +--- a/code/AssetLib/IFC/IFCGeometry.cpp ++++ b/code/AssetLib/IFC/IFCGeometry.cpp +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp +index 0c20686..e6b20a3 100644 +--- a/code/AssetLib/IFC/IFCLoader.cpp ++++ b/code/AssetLib/IFC/IFCLoader.cpp +@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include ++#include + #endif + #endif + +diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.cpp +index 3c4a0b3..3fab616 100644 +--- a/code/AssetLib/IFC/IFCOpenings.cpp ++++ b/code/AssetLib/IFC/IFCOpenings.cpp +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp +index ca37ba1..2ce7bdd 100644 +--- a/code/AssetLib/MMD/MMDPmxParser.cpp ++++ b/code/AssetLib/MMD/MMDPmxParser.cpp +@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + +diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp +index 7b66afa..5adbe1d 100644 +--- a/code/AssetLib/SIB/SIBImporter.cpp ++++ b/code/AssetLib/SIB/SIBImporter.cpp +@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include "../contrib/utf8cpp/source/utf8.h" ++#include + #endif + #include + #include +diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +index d4456e6..812f29b 100644 +--- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp ++++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + #include diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 55538d9..f5553e5 100644 +index 5339454..45e07c0 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt -@@ -862,89 +862,24 @@ SET( Extra_SRCS +@@ -897,8 +897,8 @@ SET( Extra_SRCS SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - # irrXML --IF(HUNTER_ENABLED) -- hunter_add_package(irrXML) - find_package(irrXML CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # irrXML already included in contrib directory by parent CMakeLists.txt. --ENDIF(HUNTER_ENABLED) -- --# utf8 --IF(HUNTER_ENABLED) + # pugixml +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(pugixml) ++IF(1) ++ #hunter_add_package(pugixml) + find_package(pugixml CONFIG REQUIRED) + ELSE() + SET( Pugixml_SRCS +@@ -910,15 +910,15 @@ ELSE() + ENDIF() + + # utf8 +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(utf8) -- find_package(utf8 CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # utf8 is header-only, so Assimp doesn't need to do anything. --ENDIF(HUNTER_ENABLED) ++IF(1) ++ #hunter_add_package(utf8) + find_package(utf8cpp CONFIG REQUIRED) + ELSE() + # utf8 is header-only, so Assimp doesn't need to do anything. + ENDIF() # polyclipping --IF(HUNTER_ENABLED) -- hunter_add_package(polyclipping) +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + hunter_add_package(polyclipping) find_package(polyclipping CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) - SET( Clipper_SRCS - ../contrib/clipper/clipper.hpp - ../contrib/clipper/clipper.cpp - ) - SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) --ENDIF(HUNTER_ENABLED) + ELSE() +@@ -930,8 +930,8 @@ ELSE() + ENDIF() # poly2tri --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(poly2tri) ++IF(1) ++ #hunter_add_package(poly2tri) find_package(poly2tri CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( Poly2Tri_SRCS -- ../contrib/poly2tri/poly2tri/common/shapes.cc -- ../contrib/poly2tri/poly2tri/common/shapes.h -- ../contrib/poly2tri/poly2tri/common/utils.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.h -- ../contrib/poly2tri/poly2tri/sweep/sweep.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep.h -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h -- ) -- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) --ENDIF(HUNTER_ENABLED) + ELSE() + SET( Poly2Tri_SRCS +@@ -951,8 +951,8 @@ ELSE() + ENDIF() # minizip/unzip --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(minizip) ++IF(1) ++ #hunter_add_package(minizip) find_package(minizip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( unzip_SRCS -- ../contrib/unzip/crypt.h -- ../contrib/unzip/ioapi.c -- ../contrib/unzip/ioapi.h -- ../contrib/unzip/unzip.c -- ../contrib/unzip/unzip.h -- ) -- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) --ENDIF(HUNTER_ENABLED) - + ELSE() + SET( unzip_SRCS +@@ -969,9 +969,9 @@ ENDIF() # zip (https://github.com/kuba--/zip) --IF(HUNTER_ENABLED) -- hunter_add_package(zip) -- find_package(zip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( ziplib_SRCS -- ../contrib/zip/src/miniz.h -- ../contrib/zip/src/zip.c -- ../contrib/zip/src/zip.h -- ) -- -- # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only -- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") -- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- else() -- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- endif() -- -- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) --ENDIF(HUNTER_ENABLED) -+ find_package(kubazip CONFIG REQUIRED) + separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) + IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) +- IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(zip) +- find_package(zip CONFIG REQUIRED) ++ IF(1) ++ #hunter_add_package(zip) ++ find_package(kubazip CONFIG REQUIRED) + ELSE() + SET( ziplib_SRCS + ../contrib/zip/src/miniz.h +@@ -991,7 +991,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) + ENDIF() # openddlparser - IF(HUNTER_ENABLED) -@@ -1021,13 +956,7 @@ ELSE () +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + hunter_add_package(openddlparser) + find_package(openddlparser CONFIG REQUIRED) + ELSE() +@@ -1014,7 +1014,7 @@ ELSE() + ENDIF() + + # Open3DGC +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + # Nothing to do, not available in Hunter yet. + ELSE() + SET ( open3dgc_SRCS +@@ -1049,6 +1049,7 @@ ELSE() + ../contrib/Open3DGC/o3dgcVector.inl + ) + SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS}) ++ INCLUDE_DIRECTORIES("../contrib") + ENDIF() + + # Check dependencies for glTF importer with Open3DGC-compression. +@@ -1057,7 +1058,7 @@ ENDIF() + IF (NOT WIN32) + FIND_PACKAGE(RT QUIET) + ENDIF () +-IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32)) ++IF (1) + SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) + ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) + ELSE () +@@ -1067,9 +1068,10 @@ ELSE () ENDIF () # RapidJSON --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(RapidJSON) ++IF(1) ++ #hunter_add_package(RapidJSON) find_package(RapidJSON CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) -- INCLUDE_DIRECTORIES( "../contrib" ) --ENDIF(HUNTER_ENABLED) - - # VC2010 fixes - if(MSVC10) -@@ -1044,15 +973,6 @@ if ( MSVC ) ++ ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) + ELSE() + INCLUDE_DIRECTORIES("../contrib/rapidjson/include") + ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) +@@ -1080,9 +1082,9 @@ ELSE() + ENDIF() + + # stb +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(stb) +- find_package(stb CONFIG REQUIRED) ++IF(1) ++ #hunter_add_package(stb) ++ find_package(Stb REQUIRED) + ELSE() + SET( stb_SRCS + ../contrib/stb/stb_image.h +@@ -1106,7 +1108,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif ( MSVC ) - --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- SET (unzip_compile_SRCS "") -- else (UNZIP_FOUND) -- SET (unzip_compile_SRCS ${unzip_SRCS}) -- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) -- - MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") - MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") - -@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - $ + endif () + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + SET (unzip_compile_SRCS "") + else () +@@ -1157,7 +1159,7 @@ SET( assimp_src + ) + ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(1) + INCLUDE_DIRECTORIES( + ${IRRXML_INCLUDE_DIR} + ../contrib/openddlparser/include +@@ -1195,45 +1197,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + $ + $ + $ ++ PRIVATE ++ ${Stb_INCLUDE_DIR} ) --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) ++IF(1) TARGET_LINK_LIBRARIES(assimp - PUBLIC - polyclipping::polyclipping - irrXML::irrXML +- polyclipping::polyclipping - openddlparser::openddl_parser -- poly2tri::poly2tri ++ PRIVATE ++ #polyclipping::polyclipping ++ #openddlparser::openddl_parser ++ ${OPENDDL_PARSER_LIBRARIES} + poly2tri::poly2tri minizip::minizip - ZLIB::zlib - RapidJSON::rapidjson -- utf8::utf8 -- zip::zip + ZLIB::ZLIB -+ kubazip::kubazip -+ poly2tri::poly2tri ++ rapidjson + utf8cpp ++ PUBLIC + pugixml +- stb::stb ) --ELSE(HUNTER_ENABLED) -- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) --ENDIF(HUNTER_ENABLED) +- if(TARGET zip::zip) +- target_link_libraries(assimp PUBLIC zip::zip) ++ if(1) ++ target_link_libraries(assimp PRIVATE kubazip::kubazip) + endif() + + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ELSE() +- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ENDIF() if(ASSIMP_ANDROID_JNIIOSYSTEM) set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) -@@ -1208,21 +1120,12 @@ ENDIF(APPLE) + add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/) +- target_link_libraries(assimp android_jniiosystem) ++ target_link_libraries(assimp PRIVATE android_jniiosystem) + endif() + + IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) +- TARGET_LINK_LIBRARIES(assimp optimized ${C4D_RELEASE_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp debug ${C4D_DEBUG_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE optimized ${C4D_RELEASE_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE debug ${C4D_DEBUG_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${C4D_EXTRA_LIBRARIES}) + ENDIF () + + if( MSVC ) +@@ -1274,13 +1279,13 @@ if (MINGW) + ARCHIVE_OUTPUT_NAME assimp + ) + if (NOT BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES ( assimp -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. ++ TARGET_LINK_LIBRARIES ( assimp PRIVATE -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. + endif () + endif() + + if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + target_compile_definitions(assimp PUBLIC WindowsStore) +- TARGET_LINK_LIBRARIES(assimp advapi32) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE advapi32) + endif() + + SET_TARGET_PROPERTIES( assimp PROPERTIES +@@ -1310,10 +1315,10 @@ ENDIF() # Build against external unzip, or add ../contrib/unzip so # assimp can #include "unzip.h" --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) - TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) -- else (UNZIP_FOUND) -- INCLUDE_DIRECTORIES("../") -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${UNZIP_LIBRARIES}) + else () + INCLUDE_DIRECTORIES("../") + endif () +@@ -1321,7 +1326,7 @@ ENDIF() # Add RT-extension library for glTF importer with Open3DGC-compression. IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) - ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - --IF(HUNTER_ENABLED) - INSTALL( TARGETS assimp - EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -@@ -1231,14 +1134,6 @@ IF(HUNTER_ENABLED) - FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT} - INCLUDES DESTINATION "include") --ELSE(HUNTER_ENABLED) --INSTALL( TARGETS assimp -- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- COMPONENT ${LIBASSIMP_COMPONENT}) --ENDIF(HUNTER_ENABLED) - INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) - INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) - -diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp -index b77bbfe..51cba43 100644 ---- a/code/Common/BaseImporter.cpp -+++ b/code/Common/BaseImporter.cpp -@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - - // ------------------------------------------------------------------------------------------------ -@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) - data.resize(data.size()-3); - return; - } -- -- -+ -+ - // UTF 32 BE with BOM - if(*((uint32_t*)&data.front()) == 0xFFFE0000) { - -@@ -507,7 +507,7 @@ struct Assimp::BatchData { - , next_id(0xffff) - , validate( validate ) { - ai_assert( nullptr != pIO ); -- -+ - pImporter = new Importer(); - pImporter->SetIOHandler( pIO ); - } -diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp -index d1c7aee..8e11373 100644 ---- a/code/Importer/IFC/IFCGeometry.cpp -+++ b/code/Importer/IFC/IFCGeometry.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - -diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp -index d6c40b3..387c625 100644 ---- a/code/Importer/IFC/IFCOpenings.cpp -+++ b/code/Importer/IFC/IFCOpenings.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif +- TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY}) + ENDIF () -@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, - // compare base poly normal and contour normal to detect if we need to reverse the face winding - if(curmesh.mVertcnt.size() > 0) { - IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); -- -+ - std::vector worldSpaceContourVtx(it->contour.size()); -- -+ - for(size_t a = 0; a < it->contour.size(); ++a) - worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); -- -+ - IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); -- -+ - reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; - } -diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp -index 101dcdf..3f12403 100644 ---- a/code/Importer/STEPParser/STEPFileEncoding.cpp -+++ b/code/Importer/STEPParser/STEPFileEncoding.cpp +diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h +index 1265d25..18f4564 100644 +--- a/code/Common/StbCommon.h ++++ b/code/Common/StbCommon.h @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include + #pragma GCC diagnostic ignored "-Wunused-function" #endif - #include -diff --git a/code/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp -index 80f0986..47725e2 100644 ---- a/code/MMD/MMDPmxParser.cpp -+++ b/code/MMD/MMDPmxParser.cpp -@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-#include "stb/stb_image.h" ++#include + + #if _MSC_VER + #pragma warning(pop) +diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp +index 383300e..03fdd9a 100644 +--- a/code/Common/BaseImporter.cpp ++++ b/code/Common/BaseImporter.cpp +@@ -332,7 +332,7 @@ std::string BaseImporter::GetExtension(const std::string &file) { #ifdef ASSIMP_USE_HUNTER - # include + #include #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include +-#include "../contrib/utf8cpp/source/utf8.h" ++#include #endif - #include -@@ -102,7 +102,7 @@ namespace pmx - const unsigned int targetSize = size * 3; // enough to encode - char *targetStart = new char[targetSize]; - std::memset(targetStart, 0, targetSize * sizeof(char)); -- -+ - utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); - - std::string result(targetStart); -diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp -index 20cdc80..46e9a32 100644 ---- a/code/SIB/SIBImporter.cpp -+++ b/code/SIB/SIBImporter.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - #else - //# include "../contrib/ConvertUTF/ConvertUTF.h" --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -@@ -90,10 +90,10 @@ struct SIBChunk { - uint32_t Size; - } PACK_STRUCT; - --enum { -- POS, -- NRM, -- UV, -+enum { -+ POS, -+ NRM, -+ UV, - N - }; - -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 9bb2c69..525a084 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + // ------------------------------------------------------------------------------------------------ +diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp +index 3d5c72e..770cb9d 100644 +--- a/code/Common/ZipArchiveIOSystem.cpp ++++ b/code/Common/ZipArchiveIOSystem.cpp +@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_USE_HUNTER - # include + # include #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include +-# include ++# include #endif - #include - #include -diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp -index 7cdac6c..2728425 100644 ---- a/contrib/clipper/clipper.hpp -+++ b/contrib/clipper/clipper.hpp -@@ -302,5 +302,3 @@ class clipperException : public std::exception - } //ClipperLib namespace - - #endif //clipper_hpp -- -- -diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -index 8d25aaa..e4bc306 100644 ---- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -@@ -19,7 +19,7 @@ - #include - - #define STB_IMAGE_IMPLEMENTATION --#include "contrib/stb_image/stb_image.h" -+#include - - #include + namespace Assimp { diff --git a/external_imported/vcpkg/ports/assimp/irrlicht.patch b/external_imported/vcpkg/ports/assimp/irrlicht.patch deleted file mode 100644 index 3457056c4..000000000 --- a/external_imported/vcpkg/ports/assimp/irrlicht.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index f5553e5..5cffa0c 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,7 +862,7 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML -- find_package(irrXML CONFIG REQUIRED) -+ find_package(irrlicht CONFIG REQUIRED) - - # polyclipping - find_package(polyclipping CONFIG REQUIRED) -@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - - TARGET_LINK_LIBRARIES(assimp - polyclipping::polyclipping -- irrXML::irrXML -+ Irrlicht - minizip::minizip - ZLIB::ZLIB - kubazip::kubazip -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 525a084..0cbca48 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -654,8 +654,8 @@ public: - return currentNodeType; - } - -- virtual int getAttributeCount() const /*override*/ { -- return static_cast(attributes.size()); -+ virtual unsigned int getAttributeCount() const /*override*/ { -+ return static_cast(attributes.size()); - } - - virtual const char* getAttributeName(int idx) const /*override*/ { -@@ -1733,7 +1733,7 @@ public: - return reader->getNodeType(); - } - -- virtual int getAttributeCount() const /*override*/ { -+ virtual unsigned int getAttributeCount() const /*override*/ { - return reader->getAttributeCount(); - } - -diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h -index 77cfd5e..ba584a0 100644 ---- a/include/assimp/irrXMLWrapper.h -+++ b/include/assimp/irrXMLWrapper.h -@@ -133,8 +133,8 @@ public: - - // ---------------------------------------------------------------------------------- - //! Returns size of file in bytes -- virtual int getSize() { -- return (int)data.size(); -+ virtual long getSize() const override { -+ return (long)data.size(); - } - - private: diff --git a/external_imported/vcpkg/ports/assimp/portfile.cmake b/external_imported/vcpkg/ports/assimp/portfile.cmake index 3527124ce..babb0153e 100644 --- a/external_imported/vcpkg/ports/assimp/portfile.cmake +++ b/external_imported/vcpkg/ports/assimp/portfile.cmake @@ -1,51 +1,50 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF 8f0c6b04b2257a520aaab38421b2e090204b69df # v5.0.1 - SHA512 59b213428e2f7494cb5da423e6b2d51556318f948b00cea420090d74d4f5f0f8970d38dba70cd47b2ef35a1f57f9e15df8597411b6cd8732b233395080147c0f + REF v5.2.5 + SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb HEAD_REF master PATCHES build_fixes.patch - irrlicht.patch ) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindIrrXML.cmake) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/clipper) # https://github.com/assimp/assimp/issues/788 -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/poly2tri) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/gtest) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/irrXML) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/rapidjson) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/stb_image) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/unzip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/utf8cpp) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/Open3DGC) #TODO -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/openddlparser) #TODO +file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake") + +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788 +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest") +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC") #TODO +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/openddlparser") #TODO +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/poly2tri") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/pugixml") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/rapidjson") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/stb") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/unzip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/utf8cpp") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zlib") set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ASSIMP_BUILD_SHARED_LIBS) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DASSIMP_BUILD_TESTS=OFF - -DASSIMP_BUILD_ASSIMP_VIEW=OFF - -DASSIMP_BUILD_ZLIB=OFF - -DASSIMP_BUILD_SHARED_LIBS=${ASSIMP_BUILD_SHARED_LIBS} - -DASSIMP_BUILD_ASSIMP_TOOLS=OFF - -DASSIMP_INSTALL_PDB=OFF - -DSYSTEM_IRRXML=ON - -DIGNORE_GIT_HASH=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASSIMP_BUILD_ZLIB=OFF + -DASSIMP_BUILD_ASSIMP_TOOLS=OFF + -DASSIMP_BUILD_TESTS=OFF + -DASSIMP_WARNINGS_AS_ERRORS=OFF + -DASSIMP_IGNORE_GIT_HASH=ON + -DASSIMP_INSTALL_PDB=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/assimp") + +vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - set(VCVER vc140 vc141 vc142 ) + set(VCVER vc140 vc141 vc142 vc143) set(CRT mt md) set(DBG_NAMES) set(REL_NAMES) @@ -67,24 +66,9 @@ if(ASSIMP_DBG) get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") endif() - -vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below -vcpkg_copy_pdbs() - -file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake " -include(CMakeFindDependencyMacro) -find_dependency(ZLIB) -find_dependency(irrlicht CONFIG) -find_dependency(polyclipping CONFIG) -find_dependency(minizip CONFIG) -find_dependency(kubazip CONFIG) -find_dependency(poly2tri CONFIG) -find_dependency(utf8cpp CONFIG) -${ASSIMP_CONFIG}") -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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/assimp/vcpkg.json b/external_imported/vcpkg/ports/assimp/vcpkg.json index 3e573c17d..95a8179be 100644 --- a/external_imported/vcpkg/ports/assimp/vcpkg.json +++ b/external_imported/vcpkg/ports/assimp/vcpkg.json @@ -1,18 +1,26 @@ { "name": "assimp", - "version-string": "5.0.1", - "port-version": 5, + "version": "5.2.5", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", + "license": "BSD-3-Clause", "dependencies": [ - "irrlicht", + "draco", "kubazip", "minizip", "poly2tri", - "polyclipping", + "pugixml", "rapidjson", "stb", "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/atk/portfile.cmake b/external_imported/vcpkg/ports/atk/portfile.cmake index c7db36334..fe5ffd01a 100644 --- a/external_imported/vcpkg/ports/atk/portfile.cmake +++ b/external_imported/vcpkg/ports/atk/portfile.cmake @@ -1,25 +1,20 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +set(ATK_VERSION 2.38.0) -set(ATK_VERSION 2.36.0) - -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.36/atk-${ATK_VERSION}.tar.xz" - FILENAME "atk-${ATK_VERSION}.tar.xz" - SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES + REPO GNOME/atk + REF "${ATK_VERSION}" + HEAD_REF master + SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dintrospection=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' + ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson() @@ -28,4 +23,4 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/atk/vcpkg.json b/external_imported/vcpkg/ports/atk/vcpkg.json index 2c7b4360a..858249eee 100644 --- a/external_imported/vcpkg/ports/atk/vcpkg.json +++ b/external_imported/vcpkg/ports/atk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "atk", - "version": "2.36.0", + "version": "2.38.0", "port-version": 2, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", + "license": "GPL-2.0-only", "supports": "!arm", "dependencies": [ "gettext", diff --git a/external_imported/vcpkg/ports/atkmm/COPYING b/external_imported/vcpkg/ports/atkmm/COPYING deleted file mode 100644 index 2d2d780e6..000000000 --- a/external_imported/vcpkg/ports/atkmm/COPYING +++ /dev/null @@ -1,510 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/external_imported/vcpkg/ports/atkmm/portfile.cmake b/external_imported/vcpkg/ports/atkmm/portfile.cmake index 9f7a72560..a4c337b6e 100644 --- a/external_imported/vcpkg/ports/atkmm/portfile.cmake +++ b/external_imported/vcpkg/ports/atkmm/portfile.cmake @@ -2,27 +2,30 @@ if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() +set(ATKMM_VERSION 2.36.1) + +# Keep distfile, don't use GitLab! vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-2.36.0.tar.xz" - FILENAME "atkmm-2.36.0.tar.xz" - SHA512 8527dfa50191919a7dcf6db6699767352cb0dac800d834ee39ed21694eee3136a41a7532d600b8b3c0fcea52da6129b623e8e61ada728d806aa61fdc8dc8dedf + URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.36/atkmm-${ATKMM_VERSION}.tar.xz" + FILENAME "atkmm-${ATKMM_VERSION}.tar.xz" + SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Dbuild-documentation=false -Dbuild-deprecated-api=true # Build deprecated API and include it in the library - -Dmsvc14x-parallel-installable=false) # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 + -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 +) vcpkg_install_meson() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/atkmm/vcpkg.json b/external_imported/vcpkg/ports/atkmm/vcpkg.json index ac6b39011..426760e8f 100644 --- a/external_imported/vcpkg/ports/atkmm/vcpkg.json +++ b/external_imported/vcpkg/ports/atkmm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "atkmm", - "version": "2.36.0", - "port-version": 2, + "version": "2.36.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", "dependencies": [ "atk", "gettext", diff --git a/external_imported/vcpkg/ports/aubio/portfile.cmake b/external_imported/vcpkg/ports/aubio/portfile.cmake index e8d49dce4..f7ab0f1ab 100644 --- a/external_imported/vcpkg/ports/aubio/portfile.cmake +++ b/external_imported/vcpkg/ports/aubio/portfile.cmake @@ -8,7 +8,7 @@ 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_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -16,8 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_RELEASE -DTOOLS_INSTALLDIR=tools/aubio @@ -31,15 +30,7 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright and credentials -file(COPY - ${SOURCE_PATH}/COPYING - ${SOURCE_PATH}/AUTHORS - ${SOURCE_PATH}/ChangeLog - ${SOURCE_PATH}/README.md - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/${PORT}) - vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/aubio/vcpkg.json b/external_imported/vcpkg/ports/aubio/vcpkg.json index dd977ac92..e77404534 100644 --- a/external_imported/vcpkg/ports/aubio/vcpkg.json +++ b/external_imported/vcpkg/ports/aubio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 7, + "port-version": 9, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", + "license": "GPL-3.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", @@ -34,7 +35,10 @@ "libflac", "liblzma", "libogg", - "libsndfile", + { + "name": "libsndfile", + "default-features": false + }, "libvorbis" ] } diff --git a/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch b/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch new file mode 100644 index 000000000..c5cf087f8 --- /dev/null +++ b/external_imported/vcpkg/ports/avisynthplus/clang-cl.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d60332e63..0216970fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,7 +188,15 @@ endif() + endif() + ENDIF() + ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(CLANG_IN_VS "1") ++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(IntelLLVM_IN_VS "1") ++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(IntelClassic_IN_VS "1") ++ endif() ++ + IF(CLANG_IN_VS STREQUAL "1") + #these are unknown + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") diff --git a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake index c64088b2e..5e018b73c 100644 --- a/external_imported/vcpkg/ports/avisynthplus/portfile.cmake +++ b/external_imported/vcpkg/ports/avisynthplus/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus - REF v3.7.0 - SHA512 0f2d5344c4472b810667b99d9e99a2ec8135923f4185dbd7e29ca65e696ce13500ea20ef09c995486573314149a671e1256a4dd0696c4ace8d3ec3716ffdcfc7 + REF v3.7.2 + SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1 HEAD_REF master + PATCHES + clang-cl.patch # the normal lookup is not working since it doesn't take Ninja as a Generator into account ) vcpkg_download_distfile(GHC_ARCHIVE @@ -12,20 +14,19 @@ vcpkg_download_distfile(GHC_ARCHIVE SHA512 e3fe1e41b31f840ebc219fcd795e7be2973b80bb3843d6bb080786ad9e3e7f846a118673cb9e17d76bae66954e64e024a82622fb8cea7818d5d9357de661d3d1 ) -file(REMOVE_RECURSE ${SOURCE_PATH}/filesystem) +file(REMOVE_RECURSE "${SOURCE_PATH}/filesystem") vcpkg_extract_source_archive(extracted_archive ARCHIVE "${GHC_ARCHIVE}") file(RENAME "${extracted_archive}" "${SOURCE_PATH}/filesystem") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_PLUGINS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/distrib/gpl.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json index 9527fdf40..26af95e8e 100644 --- a/external_imported/vcpkg/ports/avisynthplus/vcpkg.json +++ b/external_imported/vcpkg/ports/avisynthplus/vcpkg.json @@ -1,8 +1,15 @@ { "name": "avisynthplus", - "version-semver": "3.7.0", - "port-version": 3, + "version": "3.7.2", + "port-version": 1, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "https://avs-plus.net/", - "supports": "!arm & !uwp" + "license": "GPL-2.0", + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/aws-c-common/portfile.cmake b/external_imported/vcpkg/ports/aws-c-common/portfile.cmake index 1ab9f8b72..d8672c140 100644 --- a/external_imported/vcpkg/ports/aws-c-common/portfile.cmake +++ b/external_imported/vcpkg/ports/aws-c-common/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common - REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9 - SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a + REF 68f28f8df258390744f3c5b460250f8809161041 # v0.6.20 + SHA512 a8be405e0e1586a06db038a0068df2c9277772ff7b8df2c542d18d2aae4b2bc0fd89de668ab10d84476446834390e4e27383b68d86c7d9f0d0749b57802866f1 HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json index 7d927640d..a775cf692 100644 --- a/external_imported/vcpkg/ports/aws-c-common/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-common/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-c-common", - "version": "0.6.9", - "port-version": 2, + "version": "0.6.20", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "supports": "!(windows & arm) & !uwp", diff --git a/external_imported/vcpkg/ports/aws-c-io/portfile.cmake b/external_imported/vcpkg/ports/aws-c-io/portfile.cmake index b3a5996bf..d72cdaed6 100644 --- a/external_imported/vcpkg/ports/aws-c-io/portfile.cmake +++ b/external_imported/vcpkg/ports/aws-c-io/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io - REF 57b00febac48e78f8bf8cff4c82a249e6648842a # v0.10.7 - SHA512 ffcf5ba4ccdff23ca390fc4eb935f88040447589886348234aa1c24b531401521df99a6ac578c1679a3c1a06dfcef6deb833a0b9d53e31d42576a3ad03ade6fc + REF cfe553a770e9c2d1c93b8cdfb870b9f2a46b436e # v0.10.22 + SHA512 7a741f5b1c895ceb11f73b67828fd3623c180cb8a3863f3b63a67ac1437d2c47911d50510777b13ee66fd0a009ab09a8c83fd036a0fca2f25a0835f48f023de7 HEAD_REF master PATCHES fix-cmake-target-path.patch ) diff --git a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json index 9fddd3bf3..203f3649f 100644 --- a/external_imported/vcpkg/ports/aws-c-io/vcpkg.json +++ b/external_imported/vcpkg/ports/aws-c-io/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-c-io", - "version": "0.10.7", - "port-version": 2, + "version": "0.10.22", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "supports": "!(windows & arm) & !uwp", diff --git a/external_imported/vcpkg/ports/azmq/portfile.cmake b/external_imported/vcpkg/ports/azmq/portfile.cmake index c2d333f60..3e1c73683 100644 --- a/external_imported/vcpkg/ports/azmq/portfile.cmake +++ b/external_imported/vcpkg/ports/azmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/azmq - REF 6bb101eecb357ad9735ebc36e276b7526652d42d # commit on 2019-05-01 - SHA512 18812fd73c3c57aca8b17c2df0af01afb7864253d6ac6ce042e01ef04e81dd454438c9d01f5bb0fd7a4a445082a2eb3dd334ca1e05dafbe4ba602cad95ce7134 + REF 7da2fd0a1b2bd4e6f50ccd17d54579e6084ef1f7 # v1.0.3 + SHA512 3f6b07fab9345c7506a46d7418eb672e1ee28a72bb02914ee1f945b3c41090d94722079469359664232e9688beac4e354e49d99711fc5b0bd1d6f7936ed62a3c HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/azmq/vcpkg.json b/external_imported/vcpkg/ports/azmq/vcpkg.json index 6344423fa..12dacac0e 100644 --- a/external_imported/vcpkg/ports/azmq/vcpkg.json +++ b/external_imported/vcpkg/ports/azmq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azmq", - "version-string": "2020-03-03", - "port-version": 1, + "version": "1.0.3", "description": [ "Boost Asio style bindings for ZeroMQ", "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.", diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch b/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch deleted file mode 100644 index bdf46dd1d..000000000 --- a/external_imported/vcpkg/ports/azure-c-shared-utility/openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c -index 5a9e5ac2..bb946c2d 100644 ---- a/adapters/x509_openssl.c -+++ b/adapters/x509_openssl.c -@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate) - // certificates. - - /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - SSL_CTX_clear_extra_chain_certs(ssl_ctx); - #else - if (ssl_ctx->extra_certs != NULL) diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake b/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake index 5b9a85d1a..40791ee3f 100644 --- a/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/portfile.cmake @@ -17,11 +17,10 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1a27846886a74702d409a8f0e2d77a38163cefc7 - SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd + REF 9e4322c9d88095ed276bf7e4b31b87b82b1c4d86 + SHA512 0ede2a30ed787028a48602111be7cebc65593a84a8b3dc94ed34917f44355a180d8b8acf2b6404e47428fe8f761c11485199e9bd2e9aa6628548c585357f63e8 HEAD_REF master PATCHES - openssl.patch fix-install-location.patch fix-utilityFunctions-conditions.patch disable-error.patch diff --git a/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json index f5f3c1abd..a7b3cf63a 100644 --- a/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-c-shared-utility/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-c-shared-utility", - "version-date": "2022-01-21", - "port-version": 3, + "version-date": "2022-09-15", "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", diff --git a/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake index 262cdf715..d93acdb58 100644 --- a/external_imported/vcpkg/ports/azure-core-cpp/portfile.cmake +++ b/external_imported/vcpkg/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.5.0 - SHA512 7a0b8ed9345b565e4476cb66c1e7a44350f5cd4f79a9d40a11b77f646eff353d94762803ca5931264689d390255cd9d361c5d4a54ccc89548cf640f76a26e74c + REF azure-core_1.7.2 + SHA512 f24d02bf34f8be665e08a9a2799498f78daf6103a0ac5c10d79dc6b7b4461dac8ea2f91088e11bc90d0c74b59a59dc1e6361ad053718fb6da6a0691a9ac314a6 ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json index 57bba11bd..99bb86d24 100644 --- a/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.5.0", + "version-semver": "1.7.2", "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++." @@ -10,8 +10,7 @@ "dependencies": [ { "name": "openssl", - "platform": "!windows & !uwp", - "version>=": "1.1.1n" + "platform": "!windows & !uwp" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake new file mode 100644 index 000000000..f333cffe3 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-core-tracing-opentelemetry_1.0.0-beta.3 + SHA512 184c275cdbea0384b7f5e26258828101f7cf5b6e376305e396201c7f43676f04583d8095f42d79e417a479eab0f2042b0603cfac381ab044049fa3a92c53df5d +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json new file mode 100644 index 000000000..631965ec6 --- /dev/null +++ b/external_imported/vcpkg/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "azure-core-tracing-opentelemetry-cpp", + "version-semver": "1.0.0-beta.3", + "description": [ + "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", + "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-tracing-opentelemetry", + "license": "MIT", + "supports": "!(windows & !static)", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.7.0-beta.1" + }, + { + "name": "opentelemetry-cpp", + "version>=": "1.3.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake index a6b797a23..59459b150 100644 --- a/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-identity-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.2.0 - SHA512 f27adda21a7d7b687cae08bed6b9f1e7ef10a9f36a886021c939da570c01fe4ab153bbc5852280bb147c879d6cdb4361d9655656398368814f4842ebc9ddc2dc + REF azure-identity_1.3.0 + SHA512 1ed1a16c86492971183cda7dc996c3704c525fde82f8ee87984416b45a5e003bb7a191ede0c3a33e21f6f09c3e324c44861006396dd72c830176a79c67b96bd9 ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json index d88dfb337..a2f9d36ed 100644 --- a/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-identity-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-identity-cpp", - "version-semver": "1.2.0", + "version-semver": "1.3.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." @@ -13,6 +13,7 @@ "default-features": false, "version>=": "1.4.0" }, + "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch b/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch index 9ccf48e5c..1a5173629 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch @@ -1,13 +1,14 @@ diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt -index 07ab3b7..9769a08 100644 +index 5a8f5573c..07ab3b7cb 100644 --- a/iothub_client/CMakeLists.txt +++ b/iothub_client/CMakeLists.txt -@@ -441,7 +441,7 @@ add_library(iothub_client - target_include_directories(iothub_client +@@ -442,8 +442,6 @@ target_include_directories(iothub_client PUBLIC $ - $ + $ +- $ +- $ ) applyXcodeBuildFlagsIfNeeded(iothub_client) target_link_libraries(iothub_client ${iothub_client_libs}) diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake b/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake index 8edad3688..7a7bf38a6 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 5805fb669ffe2adff021d68c62725d0bd783ac49 - SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1 + REF 3fd808bee3c88f8578dcc30c0a6d1d396c172070 + SHA512 2ee26791aca7732d21fe91cbb51be35d1589161d1d7b54542ac1a1277f1a95eb7e1d5ced7be117ce326dd118169e20ffc6bcd0ea9fd8ac9442bd466bc048f1ea HEAD_REF master PATCHES fix-install-location.patch @@ -42,6 +42,7 @@ vcpkg_cmake_configure( -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON -Dwarnings_as_errors=OFF + -Dhsm_type_sastoken=OFF MAYBE_UNUSED_VARIABLES build_as_dynamic warnings_as_errors diff --git a/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json b/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json index eb8d7405f..68171bb58 100644 --- a/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-iot-sdk-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-iot-sdk-c", - "version-date": "2022-01-21", - "port-version": 2, + "version-date": "2022-09-15", "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", "license": "MIT", diff --git a/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake index c6406d6e9..fbe4e8ce3 100644 --- a/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-attestation_1.0.0-beta.1 - SHA512 bb408ffa209c6d6416836296472f391d3418d6768f74d3fcf7962f93a991319f4f53b8588b2e82b2b366c060ad71cd1a2ad4a5515f19db97e5e5ef4bd222b926 + REF azure-security-attestation_1.0.0 + SHA512 75b616ea152a88b2cd3be261df134523f1743343542f005e85f1dc9d438584038d0d92879c3caabfd3bd60c6c37c658ad327b2fb62693d99c170e64182f6831f ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/ OPTIONS - ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF ) diff --git a/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json index 34c912c60..3a0da2011 100644 --- a/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-security-attestation-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-attestation-cpp", - "version-semver": "1.0.0-beta.1", + "version-semver": "1.0.0", "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." @@ -11,12 +11,9 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" - }, - { - "name": "openssl", - "version>=": "1.1.1n" + "version>=": "1.7.0-beta.1" }, + "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index ff74c8cd4..f44a8c9e8 100644 --- a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.0.0-beta.2 - SHA512 b8e3c2fc942854610a9ae3a0f57f1f1e5a5fe73905ca5085bb418b68e9888f7acb1d0866ba7692b055d4438bdf4f3f796e5860a95e0d9663e68353dabd07bed7 + REF azure-security-keyvault-certificates_4.0.0 + SHA512 c91d745ab009c5e66081785ba2f7279b7fad388c2f28c92e8d3c3c77a59157b8f7663e59474b325f669bc6e22aa820e7397d3a6813388133d2fa34b145b883e0 ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index a7ea53574..79da613d8 100644 --- a/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.0.0-beta.2", + "version-semver": "4.0.0", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 3589f4061..bef3d9cec 100644 --- a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.0.0-beta.2 - SHA512 471158c13cd356289f1876f68c69ce761adead141aa832d13abed8a3dd5a221666a09a9c33d8f840ec1372d4edf602d867dba5978262785bf9b9040a50e08904 + REF azure-security-keyvault-secrets_4.0.0 + SHA512 b82652debc1ce6d230ebd60fb5fab545fe633760f6be32a59bcef80ae2458a78150d072b599b91287fe9ec0d7e3b7e3852a54ddec319a5fcceacd095579abcdc ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 198577edf..4f9f9b2c4 100644 --- a/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.0.0-beta.2", + "version-semver": "4.0.0", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." diff --git a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake index 3b69597be..0b374f79e 100644 --- a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.4.0 - SHA512 8d60970d0eff794cfcb6fb8471e7b0086cd8620072845195f67ae2fe2a7e1ecdaf21f10a80a708c981afa3589115f0fd2477a8c398d06b66b4babcd49f0c4c9a + REF azure-storage-blobs_12.6.1 + SHA512 160ec230c300f568f8abbaa08ac6f95cd29a8abbaf67474ea1de70c20db974efed3bd600284c3151457ccc762c58452839c4520d6c1c74c548300a414d405801 ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json index 2847c101f..ae37d635b 100644 --- a/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.4.0", + "version-semver": "12.6.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.3" + "version>=": "12.3.0" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake b/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake index a5ce63659..6225a31ea 100644 --- a/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.2.3 - SHA512 456854fa39e98fab10e65e0bab148aeb9fee61439bcb1b689c17110343be0162174a8075eb09b0b4eba6c5f59c8d454d78cbd3c4aafb1af3db16d9f984189393 + REF azure-storage-common_12.3.0 + SHA512 9d3d24f24acc1bf5e07d238bae44fd510bebc7b38e7d68ab4d26ac1765cc38f1cd7bc08e1f77f61727d998c37a58d1a1a09762c9a824db770ecdc5c2a22069d2 ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json b/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json index cc7651dd6..ec2e2bcc1 100644 --- a/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.3", + "version-semver": "12.3.0", "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.5.0" + "version>=": "1.7.1" }, { "name": "libxml2", diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake index 8e296ff0a..3098bd346 100644 --- a/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-uamqp-c/portfile.cmake @@ -12,17 +12,16 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 85aae56beb717dddaf5512845de537d2926afb02 - SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe + REF 117c8378b80fdafec639dafb6693b7c044281abc + SHA512 6726cfb3ecb42d42957b5df94d0b173b566fdd6961814e2b10882e32ae26387a36b05d77c59efbb008b7ed37e276c35128ab4e4adf0739cbf37f5f234626481a HEAD_REF master ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON @@ -31,12 +30,12 @@ vcpkg_configure_cmake( build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp) +vcpkg_cmake_config_fixup(PACKAGE_NAME uamqp CONFIG_PATH "cmake") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json index 40c1177fd..54c351911 100644 --- a/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-uamqp-c/vcpkg.json @@ -1,14 +1,21 @@ { "name": "azure-uamqp-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake index 0478c7174..d8e3a633b 100644 --- a/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-uhttp-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 1cc70f4d21ad69768cafb9551b1b512118fba995 - SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 + REF 2b86b92628e55c9597aef8b96b0a73048ef072b3 + SHA512 bc4cadaf4f64ffff4d8839fe8f604b77d6a912ab28b6100df93f4c7fbc96fa68a4e09b4670d27d078aac32a2d7792c408aa78a580328c02759c7a1c04d82d721 HEAD_REF master ) endif() diff --git a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json index ff97c54e3..3b0aed5d6 100644 --- a/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-uhttp-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-uhttp-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", "license": "MIT", diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake index e9e65434f..acd5fe413 100644 --- a/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake +++ b/external_imported/vcpkg/ports/azure-umqtt-c/portfile.cmake @@ -14,16 +14,16 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 09558f380a314ea89b28f406cc810f47718cea49 - SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 + REF 566127ad605172735b9ac5cc6797261f3dd6c45c + SHA512 19e997e1dd7ecfbf5e8f11f44daa89cee7aa793f95aaed4bdaf792f5443173e0ca434d69f68a6633ee7cdc504d03a42f4b4e8aeec549c7ffdbd5e03db8cce6b5 HEAD_REF master ) endif() -file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) +file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/c-utility/configs/") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON diff --git a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json index ec223bd03..e5c178763 100644 --- a/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json +++ b/external_imported/vcpkg/ports/azure-umqtt-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-umqtt-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", "license": "MIT", diff --git a/external_imported/vcpkg/ports/b64/CMakeLists.txt b/external_imported/vcpkg/ports/b64/CMakeLists.txt index 274fc0788..e40d14ef3 100644 --- a/external_imported/vcpkg/ports/b64/CMakeLists.txt +++ b/external_imported/vcpkg/ports/b64/CMakeLists.txt @@ -18,18 +18,23 @@ if (BUILD_SHARED_LIBS) target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1) endif() -target_include_directories(b64 PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(b64 + PRIVATE include ${CMAKE_CURRENT_BINARY_DIR} + INTERFACE $ +) set_property(TARGET b64 PROPERTY PUBLIC_HEADER ${HEADER_FILES}) install(TARGETS b64 - EXPORT b64-targets + EXPORT unofficial-b64-config LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include/b64 ) -install(EXPORT b64-targets - FILE b64-targets.cmake - DESTINATION lib/cmake/b64) +install(EXPORT unofficial-b64-config + FILE unofficial-b64-config.cmake + NAMESPACE unofficial::b64:: + DESTINATION share/unofficial-b64 +) diff --git a/external_imported/vcpkg/ports/b64/portfile.cmake b/external_imported/vcpkg/ports/b64/portfile.cmake index dbe41a937..51ba61141 100644 --- a/external_imported/vcpkg/ports/b64/portfile.cmake +++ b/external_imported/vcpkg/ports/b64/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-b64) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/b64/vcpkg.json b/external_imported/vcpkg/ports/b64/vcpkg.json index ba4dba7a2..6c9d51104 100644 --- a/external_imported/vcpkg/ports/b64/vcpkg.json +++ b/external_imported/vcpkg/ports/b64/vcpkg.json @@ -2,7 +2,9 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "b64", "version": "2.0.0.1", + "port-version": 1, "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/basisu/portfile.cmake b/external_imported/vcpkg/ports/basisu/portfile.cmake index 8873c52fc..e04b993d9 100644 --- a/external_imported/vcpkg/ports/basisu/portfile.cmake +++ b/external_imported/vcpkg/ports/basisu/portfile.cmake @@ -7,34 +7,19 @@ vcpkg_from_github( PATCHES fix-addostream.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/basisu) -if (WIN32) - set(TOOL_NAME basisu_tool.exe) -else() - set(TOOL_NAME basisu_tool) -endif() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu) +vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu) +vcpkg_copy_tools(TOOL_NAMES "basisu_tool" AUTO_CLEAN) # Remove unnecessary files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}) +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() - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/basisu/vcpkg.json b/external_imported/vcpkg/ports/basisu/vcpkg.json index a0fe5cc68..2c51222ef 100644 --- a/external_imported/vcpkg/ports/basisu/vcpkg.json +++ b/external_imported/vcpkg/ports/basisu/vcpkg.json @@ -1,10 +1,15 @@ { "name": "basisu", - "version-string": "1.11", - "port-version": 5, + "version": "1.11", + "port-version": 6, "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.", "homepage": "https://github.com/BinomialLLC/basis_universal", + "license": "Apache-2.0", "dependencies": [ - "lodepng" + "lodepng", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/bdwgc/portfile.cmake b/external_imported/vcpkg/ports/bdwgc/portfile.cmake index 9fe8ed0f8..5273f7dbc 100644 --- a/external_imported/vcpkg/ports/bdwgc/portfile.cmake +++ b/external_imported/vcpkg/ports/bdwgc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - REF 5fab1a01931a1a6934ccf1d5eaa1e51f0a8dac4d # v8.2.0-20211115 - SHA512 b1a97aad10df33bb242985eb48f1bb2d3082d88f26c34014efce3d0f233bcd18a0f43f1bd960600ad9e22bcb19ebf04e573c74dfc1abfb771aa6b8525053c14b + REF v8.2.2 + SHA512 da6a2de30f096610ea1c0de1ff7a3ab434debaa39199bc1426daff620901fc76e5747e43171d742b17f4afa3c77ef447cba4fda69d76a711e108f3f03af917ca HEAD_REF master ) @@ -12,8 +12,6 @@ vcpkg_cmake_configure( -Denable_cplusplus=ON -Denable_docs=OFF -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops - OPTIONS_DEBUG - -Dinstall_headers=OFF ) vcpkg_cmake_install() @@ -21,6 +19,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/bdwgc/vcpkg.json b/external_imported/vcpkg/ports/bdwgc/vcpkg.json index f99581153..eb669775e 100644 --- a/external_imported/vcpkg/ports/bdwgc/vcpkg.json +++ b/external_imported/vcpkg/ports/bdwgc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "bdwgc", - "version": "8.2.0", - "port-version": 3, + "version": "8.2.2", "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", - "homepage": "http://www.hboehm.info/gc/", + "homepage": "https://www.hboehm.info/gc/", + "license": "MIT", "dependencies": [ "libatomic-ops", { diff --git a/external_imported/vcpkg/ports/bento4/LICENSE b/external_imported/vcpkg/ports/bento4/LICENSE deleted file mode 100644 index c1d00b26c..000000000 --- a/external_imported/vcpkg/ports/bento4/LICENSE +++ /dev/null @@ -1,6 +0,0 @@ -Bento4 is developed by Axiomatic Systems LLC in San Francisco, California. - -This software is available under two different licenses -For applications that are entirely distributable under the terms of the GPL(https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html), the Bento4 GPL license applies. -For applications that cannot be entirely distributable under the terms of the GPL (either the application, or code modules linked with the application are not compatible with the terms of the GPL licence), a non-GPL commercial license is available from Axiomatic Systems LLC. -Contact Gilles Boccon-Gibod (licensing@axiosys.com or bok@bok.net) for more information. \ No newline at end of file diff --git a/external_imported/vcpkg/ports/bento4/fix-install-and-c4996-error.patch b/external_imported/vcpkg/ports/bento4/fix-install-and-c4996-error.patch deleted file mode 100644 index c99fdc411..000000000 --- a/external_imported/vcpkg/ports/bento4/fix-install-and-c4996-error.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f08b2f..fccf2a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,8 @@ endif() - - add_library(ap4 STATIC ${AP4_SOURCES}) - -+add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ - # Includes - include_directories( - ${SOURCE_CORE} -@@ -43,6 +45,14 @@ include_directories( - ${SOURCE_METADATA} - ) - -+# AP4 includes -+file(GLOB AP4_INCLUDES -+ ${SOURCE_CODECS}/*.h -+ ${SOURCE_CORE}/*.h -+ ${SOURCE_CRYPTO}/*.h -+ ${SOURCE_METADATA}/*.h -+) -+ - # Apps - file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*) - foreach(app ${BENTO4_APPS}) -@@ -50,3 +60,13 @@ foreach(app ${BENTO4_APPS}) - add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp) - target_link_libraries(${binary_name} ap4) - endforeach() -+ -+# Install targets -+install(TARGETS ap4 -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+ -+# Install headers -+install(FILES ${AP4_INCLUDES} DESTINATION include) -\ No newline at end of file diff --git a/external_imported/vcpkg/ports/bento4/fix-install.patch b/external_imported/vcpkg/ports/bento4/fix-install.patch new file mode 100644 index 000000000..5de2edc72 --- /dev/null +++ b/external_imported/vcpkg/ports/bento4/fix-install.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6de3bfe..2b2239a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS}) + endif() + endforeach() + endif(BUILD_APPS) ++ ++file(GLOB AP4_INCLUDES ++ ${SOURCE_CODECS}/*.h ++ ${SOURCE_CORE}/*.h ++ ${SOURCE_CRYPTO}/*.h ++ ${SOURCE_METADATA}/*.h ++) ++ ++# Install targets ++install(TARGETS ap4 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ ++# Install headers ++install(FILES ${AP4_INCLUDES} DESTINATION include/bento4) diff --git a/external_imported/vcpkg/ports/bento4/portfile.cmake b/external_imported/vcpkg/ports/bento4/portfile.cmake index 0e5cb143b..ae6e04103 100644 --- a/external_imported/vcpkg/ports/bento4/portfile.cmake +++ b/external_imported/vcpkg/ports/bento4/portfile.cmake @@ -3,21 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axiomatic-systems/Bento4 - REF v1.5.1-628 - SHA512 2bf44f55307178cc9128e323904acbfaa2f88e06beff26cf27fc0a7707875942de89778a0ee1a8315ef2c3b19754edad77d32fdb74f3d651f03c2623e7a9122d + REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639 + SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b HEAD_REF master - PATCHES fix-install-and-c4996-error.patch + PATCHES + fix-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_APPS=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() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/bento4/vcpkg.json b/external_imported/vcpkg/ports/bento4/vcpkg.json index d5278c24f..9103b59eb 100644 --- a/external_imported/vcpkg/ports/bento4/vcpkg.json +++ b/external_imported/vcpkg/ports/bento4/vcpkg.json @@ -1,7 +1,14 @@ { "name": "bento4", - "version-string": "1.5.1", - "port-version": 629, + "version": "1.6.0-639", + "port-version": 1, "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", - "homepage": "https://github.com/axiomatic-systems/Bento4" + "homepage": "https://github.com/axiomatic-systems/Bento4", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/bext-sml/portfile.cmake b/external_imported/vcpkg/ports/bext-sml/portfile.cmake index 75d8f36aa..3701e1616 100644 --- a/external_imported/vcpkg/ports/bext-sml/portfile.cmake +++ b/external_imported/vcpkg/ports/bext-sml/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/sml - REF v1.1.4 - SHA512 0ded162e5d9d7cc9d8769fd9131d7a5cfc98187c8e9d98393eda9e0804c282e510707de38fe7229d2fe16aea70c9a8e300f14e992fff3ddedd0fa1b6a66ab1ba + REF v1.1.5 + SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/bext-sml/vcpkg.json b/external_imported/vcpkg/ports/bext-sml/vcpkg.json index 774e04321..5b04bc3fc 100644 --- a/external_imported/vcpkg/ports/bext-sml/vcpkg.json +++ b/external_imported/vcpkg/ports/bext-sml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bext-sml", - "version": "1.1.4", + "version": "1.1.5", "description": "Your scalable C++14 one header only State Machine Library with no dependencies", - "homepage": "https://github.com/boost-ext/sml" + "homepage": "https://github.com/boost-ext/sml", + "license": "BSL-1.0" } diff --git a/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch b/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch new file mode 100644 index 000000000..c1022543a --- /dev/null +++ b/external_imported/vcpkg/ports/bext-ut/avoid-cpm.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ + # ---- Add dependencies via CPM ---- + # see https://github.com/cpm-cmake/CPM.cmake for more info + +-if(CMAKE_VERSION VERSION_LESS 3.20.0) ++if(1) + # see https://github.com/TheLartians/PackageProject.cmake/pull/19 + include(cmake/PackageProject.cmake) + else() diff --git a/external_imported/vcpkg/ports/bext-ut/portfile.cmake b/external_imported/vcpkg/ports/bext-ut/portfile.cmake index 14d456bc5..a76999db0 100644 --- a/external_imported/vcpkg/ports/bext-ut/portfile.cmake +++ b/external_imported/vcpkg/ports/bext-ut/portfile.cmake @@ -1,31 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/ut - REF v1.1.8 - SHA512 0df2f8ce784dc69c3cca5554a8b2be7c1664dd66bf52e83f305db5fae84d416a851e9282e9a8cfe50fbcada85b17da00fb25c1228d9cca32226a18bae18acb83 + REF v1.1.9 + SHA512 81a6b80948d3a203534244f62f5f3ac57593083cc0c32484498a7d01d29455f7dcb33e2ec0587609b8dff33a81a5551796d7681d48fd93e817d6d0c31697234e HEAD_REF master + PATCHES + avoid-cpm.patch ) -vcpkg_download_distfile(LICENSE_FILE - URLS https://www.boost.org/LICENSE_1_0.txt - FILENAME d6078467835dba893231.txt - SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBOOST_UT_BUILD_BENCHMARKS=OFF -DBOOST_UT_BUILD_EXAMPLES=OFF -DBOOST_UT_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ut TARGET_PATH share/ut) +vcpkg_cmake_config_fixup(PACKAGE_NAME ut CONFIG_PATH lib/cmake/ut-1.1.8) -configure_file("${LICENSE_FILE}" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/bext-ut/vcpkg.json b/external_imported/vcpkg/ports/bext-ut/vcpkg.json index 8a7c5d77f..8ede04611 100644 --- a/external_imported/vcpkg/ports/bext-ut/vcpkg.json +++ b/external_imported/vcpkg/ports/bext-ut/vcpkg.json @@ -1,6 +1,17 @@ { "name": "bext-ut", - "version": "1.1.8", + "version": "1.1.9", "description": "UT: C++20 μ(micro)/Unit Testing Framework", - "homepage": "https://boost-ext.github.io/ut/" + "homepage": "https://boost-ext.github.io/ut/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake b/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake index fb9848a4f..1dcab723d 100644 --- a/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake +++ b/external_imported/vcpkg/ports/bfgroup-lyra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bfgroup/Lyra - REF 1.5.1 - SHA512 e349c57614fe18cfee49b6a3977f133de3e567aa6b1c148abf9510432f7db34b75488739850e48c7943a15151fe2eedb129179d8d73eb61fb4f9a11c54b61086 + REF 1.6 + SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json b/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json index 88b0d01ef..c7189d7d8 100644 --- a/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json +++ b/external_imported/vcpkg/ports/bfgroup-lyra/vcpkg.json @@ -1,8 +1,9 @@ { "name": "bfgroup-lyra", - "version": "1.5.1", + "version": "1.6", "description": "A simple to use, composable, command line parser for C++ 11 and beyond", "homepage": "https://bfgroup.github.io/Lyra/", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/bitmagic/portfile.cmake b/external_imported/vcpkg/ports/bitmagic/portfile.cmake index 570aa610c..90c0bd446 100644 --- a/external_imported/vcpkg/ports/bitmagic/portfile.cmake +++ b/external_imported/vcpkg/ports/bitmagic/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tlk00/BitMagic - REF v7.5.0 - SHA512 237D81D6AED1DAF612BF4F64DD7C883018198C1E1F5A58837B04D010971950C27C91B978AA8D774145B45A5B0C4121AC45CFF1094793E56066F2EFA8B4C3D6ED + REF v7.11.2 + SHA512 182456fc351a7df0cba0bb5b35d91bb8055891bf91a09fc5394149f3b0b1bd85b63ce88497d62ed68bb892481c15264cf44059d43023d1f2155ed43cafe3b933 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/bitmagic/vcpkg.json b/external_imported/vcpkg/ports/bitmagic/vcpkg.json index a41fde0ca..0a675acfb 100644 --- a/external_imported/vcpkg/ports/bitmagic/vcpkg.json +++ b/external_imported/vcpkg/ports/bitmagic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bitmagic", - "version": "7.5.0", + "version": "7.11.2", "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", "homepage": "http://bitmagic.io" } diff --git a/external_imported/vcpkg/ports/bitserializer/portfile.cmake b/external_imported/vcpkg/ports/bitserializer/portfile.cmake index 7e0f67a1d..28c43ace7 100644 --- a/external_imported/vcpkg/ports/bitserializer/portfile.cmake +++ b/external_imported/vcpkg/ports/bitserializer/portfile.cmake @@ -15,15 +15,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -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/external_imported/vcpkg/ports/bitserializer/vcpkg.json b/external_imported/vcpkg/ports/bitserializer/vcpkg.json index 09a3a8b1b..42b09e65d 100644 --- a/external_imported/vcpkg/ports/bitserializer/vcpkg.json +++ b/external_imported/vcpkg/ports/bitserializer/vcpkg.json @@ -1,8 +1,10 @@ { "name": "bitserializer", "version": "0.44", + "port-version": 1, "description": "C++ 17 library for serialization to JSON, XML, YAML", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/blake3/CMakeLists.txt b/external_imported/vcpkg/ports/blake3/CMakeLists.txt new file mode 100644 index 000000000..1ef6c3893 --- /dev/null +++ b/external_imported/vcpkg/ports/blake3/CMakeLists.txt @@ -0,0 +1,65 @@ +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/external_imported/vcpkg/ports/blake3/portfile.cmake b/external_imported/vcpkg/ports/blake3/portfile.cmake new file mode 100644 index 000000000..94da21b77 --- /dev/null +++ b/external_imported/vcpkg/ports/blake3/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BLAKE3-team/BLAKE3 + REF 1.3.1 + SHA512 9906673a9eca100a6ad8c369f4c380ac66b59ed055cb8358fe99bb67ebbcc98e24da5860b257136a1f9cc8ece5733b2ac68c55b9be65ae6f2904ffd92ef34ce6 + HEAD_REF main +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/external_imported/vcpkg/ports/blake3/vcpkg.json b/external_imported/vcpkg/ports/blake3/vcpkg.json new file mode 100644 index 000000000..1c2d1b03c --- /dev/null +++ b/external_imported/vcpkg/ports/blake3/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "blake3", + "version": "1.3.1", + "port-version": 1, + "description": "BLAKE3 cryptographic hash function.", + "homepage": "https://github.com/BLAKE3-team/BLAKE3", + "license": "CC0-1.0 OR Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/blaze/fix-vm-build.patch b/external_imported/vcpkg/ports/blaze/fix-vm-build.patch deleted file mode 100644 index 3936299e0..000000000 --- a/external_imported/vcpkg/ports/blaze/fix-vm-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5ab1f460..a23c6dbf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -145,12 +145,13 @@ if (${BLAZE_CACHE_SIZE_AUTO}) - endif (flag EQUAL 0) - endif (APPLE) - -- if (flag) -+ string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp -+ -+ if (flag OR NOT tmp) - message("Cache size not found automatically. Using default value as cache size.") - set(tmp ${BLAZE_CACHE_SIZE_DEFAULT}) - endif (flag) - -- string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp - math(EXPR BLAZE_CACHE_SIZE ${tmp}*1024) # Convert to bytes (assuming that the value is given in kibibytes) - - endif (${BLAZE_CACHE_SIZE_AUTO}) diff --git a/external_imported/vcpkg/ports/blaze/portfile.cmake b/external_imported/vcpkg/ports/blaze/portfile.cmake index 8ef5792fd..8a7954562 100644 --- a/external_imported/vcpkg/ports/blaze/portfile.cmake +++ b/external_imported/vcpkg/ports/blaze/portfile.cmake @@ -1,25 +1,22 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO blaze-lib/blaze - REF 0380370f0626de2ad0ec7ea815803e22bbf6b42e - SHA512 47df2a291febf0565787ed9c4222ee1958d03c5b76c54923e4d8e44f75321c266e81d69ba4512a4ab07d7e431c065d025e01269cf9c1d5f0927f133885def4c7 + REF v3.8.1 + SHA512 6dfd3cb46d796b94cc44a30c4cd5ebfb366d2eb312d75a28787cacb4636df52e4e4e3dce3d9501bf2c07e7fd3621e8ce7f9ffa61a950a4146375b12d75d4872b HEAD_REF master - PATCHES - fix-vm-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBLAZE_SMP_THREADS=OpenMP ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/blaze/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/blaze/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # 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/external_imported/vcpkg/ports/blaze/vcpkg.json b/external_imported/vcpkg/ports/blaze/vcpkg.json index 19a46638c..116078565 100644 --- a/external_imported/vcpkg/ports/blaze/vcpkg.json +++ b/external_imported/vcpkg/ports/blaze/vcpkg.json @@ -1,11 +1,19 @@ { "name": "blaze", - "version-string": "3.8", - "port-version": 2, + "version": "3.8.1", "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", "dependencies": [ "boost-exception", - "lapack" + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/blend2d/portfile.cmake b/external_imported/vcpkg/ports/blend2d/portfile.cmake index 09c8cf8d7..8d49c0676 100644 --- a/external_imported/vcpkg/ports/blend2d/portfile.cmake +++ b/external_imported/vcpkg/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 63db360c7eb2c1c3ca9cd92a867dbb23dc95ca7d - SHA512 cf83dd36e51fc92587633dec315b3ad8570137ab0b58836c43b8c73ba934dfc0ad03a58e633bd76b79753b12831007c2a5b3fde237d671594c62a3919507c39a + REF 0ca46df1d8ec7d8bc5250329ce281d82cfc96b99 + SHA512 fbe54a59b0dc9fd0397619e3f6b1d336d3f906322a06583fe4f90bbb8bd95188f39f162b8ee66cc464050f6f40e856b72a80f37ac190a4a584fda71e2ce73689 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/blend2d/vcpkg.json b/external_imported/vcpkg/ports/blend2d/vcpkg.json index 5db3d5ce2..36cf6f902 100644 --- a/external_imported/vcpkg/ports/blend2d/vcpkg.json +++ b/external_imported/vcpkg/ports/blend2d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "blend2d", - "version-date": "2022-02-19", + "version-date": "2022-05-02", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", diff --git a/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch b/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch deleted file mode 100644 index d0fd5ea89..000000000 --- a/external_imported/vcpkg/ports/boinc/001-add-openssl3-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/crypt.cpp b/lib/crypt.cpp -index 01249cfc340..9b1f69160b8 100644 ---- a/lib/crypt.cpp -+++ b/lib/crypt.cpp -@@ -672,7 +672,7 @@ int check_validity_of_cert( - } - #ifdef HAVE_OPAQUE_RSA_DSA_DH - RSA *rsa; -- rsa = EVP_PKEY_get0_RSA(pubKey); -+ rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey); - if (!RSA_blinding_on(rsa, c)) { - #else - if (!RSA_blinding_on(pubKey->pkey.rsa, c)) { diff --git a/external_imported/vcpkg/ports/boinc/portfile.cmake b/external_imported/vcpkg/ports/boinc/portfile.cmake index 0009b0e74..3c2497381 100644 --- a/external_imported/vcpkg/ports/boinc/portfile.cmake +++ b/external_imported/vcpkg/ports/boinc/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.18/7.18.1 - SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 + REF client_release/7.20/7.20.2 + SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb HEAD_REF master - PATCHES - 001-add-openssl3-support.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/external_imported/vcpkg/ports/boinc/vcpkg.json b/external_imported/vcpkg/ports/boinc/vcpkg.json index f962c47a5..a0a2158a4 100644 --- a/external_imported/vcpkg/ports/boinc/vcpkg.json +++ b/external_imported/vcpkg/ports/boinc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boinc", - "version": "7.18.1", - "port-version": 5, + "version": "7.20.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/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake b/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake index 157442c12..704e2c6cf 100644 --- a/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.78.0 - SHA512 b72d1d2eac58261487ec9c87a2bb6fdd0eed229c39fef62fa83b188f423e9ad96bfd6e5d177b01dec2e541d2e94ca9e548f823a05af24338d97ad98f8d85ef9c + REF boost-1.80.0 + SHA512 e3d129cf6f922f0d31e0c94f72d277758985eff9338bbc19470ea28d8f8d41202bea0f0e653acf449001da9db13bed576ff99beebda1d87ab92de7cf0ec68208 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json b/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json index dca627d17..41f489773 100644 --- a/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-accumulators/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-accumulators", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake b/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake index 32a88d3ba..383dcc363 100644 --- a/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.78.0 - SHA512 1536de626708ecef49d5d059258c5f00ea5d56a5ad8526bdb867494f7749ea7af25c10d90f642cd9d25a931dde87b2ab9eea1c2a20a2531ecd9d6b7e73ad4a4a + REF boost-1.80.0 + SHA512 4dd9e92b988b84bb18671a5742cd18e8b5a8eaee609f9fc510fb7285ce3dc43a1ceffa6ba37e2aa329bced6a24b34da85013acc7bacce848d992f667bfda07e0 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json b/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json index 94af0f626..cbaac64ae 100644 --- a/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-algorithm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-algorithm", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-align/portfile.cmake b/external_imported/vcpkg/ports/boost-align/portfile.cmake index eeed844f3..37633f3a5 100644 --- a/external_imported/vcpkg/ports/boost-align/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.78.0 - SHA512 2d7efe0a2a87942fe4e6b8e18871631c514d271f690a272e5b30e775eed60c389a2d2e7b1c6fdc7575d5ccea2d2a71a96169af60a0548d182ba9b90e5015a7b7 + REF boost-1.80.0 + SHA512 10c790d3ab48d4a46611c4c6bb75566c7e5695fb23e369ddd70e394df85c7f6aa5dc845ac6795a09ea1967eaad340f2209a2a370e60f7211aa395cb70ae05b67 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-align/vcpkg.json b/external_imported/vcpkg/ports/boost-align/vcpkg.json index 8bd47b5e7..de930667e 100644 --- a/external_imported/vcpkg/ports/boost-align/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-align/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-align", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-any/portfile.cmake b/external_imported/vcpkg/ports/boost-any/portfile.cmake index f5c102e96..530424e2b 100644 --- a/external_imported/vcpkg/ports/boost-any/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.78.0 - SHA512 fd9670fc4d7086fc28131c8d02b5dcd0d4bbcfdf54720df1859c50079d77d19d6c08a70421b1c0ec7c13f3b31b8606eaa8f8db847fd359cf03e24f913b0e660c + REF boost-1.80.0 + SHA512 f8dd40ef5b118f39b4cde16529dc10b12720b17370595a136a64fdf414ea3f974a33eb032c60a6235153595fb01469e9d5b3bb9fef5a73b5547acff0fda73db2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-any/vcpkg.json b/external_imported/vcpkg/ports/boost-any/vcpkg.json index ee3b5952a..77fcce1f2 100644 --- a/external_imported/vcpkg/ports/boost-any/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-any/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-any", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-array/portfile.cmake b/external_imported/vcpkg/ports/boost-array/portfile.cmake index eaf03c0bb..16f3a8172 100644 --- a/external_imported/vcpkg/ports/boost-array/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.78.0 - SHA512 1d07d224f3e0fd4a2d5beb4704d102a64e4f4f95bd6fb218c5b63b28acba8e5b3cac140505df94dab9082a0eae70e11821d827b2c586e6203562262dd9b8a1f2 + REF boost-1.80.0 + SHA512 0a1f6297e11864defe3bee9993c186db7bf52f0b782a6e501a8c74061e51732df465c22335a1f01cdc3049c7ff72a426ac5f347a0335b6e793df0cc3a3afc171 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-array/vcpkg.json b/external_imported/vcpkg/ports/boost-array/vcpkg.json index e678bdd00..21b0da151 100644 --- a/external_imported/vcpkg/ports/boost-array/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-array/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-array", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-asio/portfile.cmake b/external_imported/vcpkg/ports/boost-asio/portfile.cmake index b5da68b82..d313b6e8d 100644 --- a/external_imported/vcpkg/ports/boost-asio/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.78.0 - SHA512 78c58a64d669eaeabb5ba003200c581065412d33912e641143186ee95c11e0fb0411ed8dbb9a9acced8c8ecd258e0de33872b2e22dfc4a572315cd9a665db8a6 + REF boost-1.80.0 + SHA512 03f80833b124216165cc40b1787751c68b59e14f9b8499a57d968670ca1edae9e2f09e474931eea028ff485038f47b7e4c2cb8f4fd479fab2ad8a3c2b48b4f6c HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/external_imported/vcpkg/ports/boost-asio/vcpkg.json b/external_imported/vcpkg/ports/boost-asio/vcpkg.json index c0c49aa90..764289f0f 100644 --- a/external_imported/vcpkg/ports/boost-asio/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-asio/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-asio", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-array", @@ -10,12 +11,17 @@ "boost-bind", "boost-chrono", "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, "boost-core", { "name": "boost-coroutine", "platform": "!arm & !uwp & !emscripten" }, "boost-date-time", + "boost-exception", "boost-function", "boost-regex", "boost-smart-ptr", diff --git a/external_imported/vcpkg/ports/boost-assert/portfile.cmake b/external_imported/vcpkg/ports/boost-assert/portfile.cmake index 9509e3e80..d568ecf0b 100644 --- a/external_imported/vcpkg/ports/boost-assert/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.78.0 - SHA512 8ad826aa3c3865d77d4155c4c2b318b2f6204e0861f9fb3699efa9e8c22752d6f419bba92ec0a035f3e2583aa7236d4c2ad83fdcf0cd625cc20d40690669bd2c + REF boost-1.80.0 + SHA512 23bea8a04fa880aea4bb19ee1f8bcb27123997bec494c9826460ab9b1dc1b9918d2162157a2d2666cf605a739ea859bbf3998dc3485d75f47be50969a246f35e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-assert/vcpkg.json b/external_imported/vcpkg/ports/boost-assert/vcpkg.json index d486490dd..a55e90406 100644 --- a/external_imported/vcpkg/ports/boost-assert/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-assert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-assert", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-assign/portfile.cmake b/external_imported/vcpkg/ports/boost-assign/portfile.cmake index ac380be78..632358656 100644 --- a/external_imported/vcpkg/ports/boost-assign/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.78.0 - SHA512 72cb3460624d3f4fa12859edc1086ed966ffb83be94dc22c257e088ba10c9686129baa410d7b524237794dd29c983d92c25f65fad6c7c84288275a4ca77b95e8 + REF boost-1.80.0 + SHA512 219b253991d2260bde5a50fd7811856fa3348ce2f84c4a37e32338cd1ceee046b27a43c6ea5a2b3c539de94b51721a11bfeccbf8b1b7b16f5786fac3f118c833 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-assign/vcpkg.json b/external_imported/vcpkg/ports/boost-assign/vcpkg.json index 50824920f..603ca4db3 100644 --- a/external_imported/vcpkg/ports/boost-assign/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-assign/vcpkg.json @@ -1,14 +1,14 @@ { "name": "boost-assign", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-config", "boost-core", "boost-move", - "boost-mpl", "boost-preprocessor", "boost-ptr-container", "boost-range", diff --git a/external_imported/vcpkg/ports/boost-atomic/0001-fix-compilation-for-uwp.patch b/external_imported/vcpkg/ports/boost-atomic/0001-fix-compilation-for-uwp.patch deleted file mode 100644 index d4ad812af..000000000 --- a/external_imported/vcpkg/ports/boost-atomic/0001-fix-compilation-for-uwp.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bf08155d16ea8c359d1bfab6bac684cdfada4a5b Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Wed, 15 Dec 2021 02:06:11 +0300 -Subject: [PATCH] Fix compilation for UWP. - -UWP does not support APIs related to dynamic symbol binding and dlls. -Disable runtime detection of WaitOnAddress & co. for that target. These -APIs should be enabled at compile time on Windows 8. - -Fixes https://github.com/boostorg/atomic/issues/54. ---- - doc/changelog.qbk | 4 ++++ - src/wait_on_address.cpp | 16 ++++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/doc/changelog.qbk b/doc/changelog.qbk -index 9c370c9..ffbd902 100644 ---- a/doc/changelog.qbk -+++ b/doc/changelog.qbk -@@ -7,6 +7,10 @@ - - [section:changelog Changelog] - -+[heading Boost 1.79] -+ -+* Fixed compilation for Universal Windows Platform (UWP). ([github_issue 54]) -+ - [heading Boost 1.78] - - * Use process-local futex operations on Android for non-IPC waiting and notifying operations. -diff --git a/src/wait_on_address.cpp b/src/wait_on_address.cpp -index 7cf5bd0..6f8a165 100644 ---- a/src/wait_on_address.cpp -+++ b/src/wait_on_address.cpp -@@ -25,6 +25,8 @@ - #include - #include - -+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - #include - #include - #include -@@ -33,6 +35,8 @@ - - #include - -+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - #include - - namespace boost { -@@ -43,6 +47,8 @@ BOOST_ATOMIC_DECL wait_on_address_t* wait_on_address = NULL; - BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_single = NULL; - BOOST_ATOMIC_DECL wake_by_address_t* wake_by_address_all = NULL; - -+#if BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 2u }; - - BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT -@@ -90,6 +96,16 @@ BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT - } - } - -+#else // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ -+BOOST_ATOMIC_DECL once_flag wait_functions_once_flag = { 0u }; -+ -+BOOST_ATOMIC_DECL void initialize_wait_functions() BOOST_NOEXCEPT -+{ -+} -+ -+#endif // BOOST_WINAPI_PARTITION_DESKTOP || BOOST_WINAPI_PARTITION_SYSTEM -+ - } // namespace detail - } // namespace atomics - } // namespace boost --- -2.34.1.windows.1 - diff --git a/external_imported/vcpkg/ports/boost-atomic/portfile.cmake b/external_imported/vcpkg/ports/boost-atomic/portfile.cmake index a04914fb5..a5530bee3 100644 --- a/external_imported/vcpkg/ports/boost-atomic/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-atomic/portfile.cmake @@ -3,22 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.78.0 - SHA512 a6eba43c7038228fa7ce537b05429e263397bc914235d9ad9aa47badce5455f4905e15e5f1979c19088b47faca3091bd0dfcdb017290f796d34a36b682592345 + REF boost-1.80.0 + SHA512 c4fc4262deca9fbfbed4202c8965cbd7f569cbdbc4808abb8db102bbc2a742704757a2dd2f3cb750da3ac37774a590a1a7336f18f5f713ce6dfcf3f331b35a9c HEAD_REF master - PATCHES 0001-fix-compilation-for-uwp.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-atomic/vcpkg.json b/external_imported/vcpkg/ports/boost-atomic/vcpkg.json index 45840b8c9..61497f632 100644 --- a/external_imported/vcpkg/ports/boost-atomic/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-atomic/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-atomic", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-beast/portfile.cmake b/external_imported/vcpkg/ports/boost-beast/portfile.cmake index 186e878b1..3fce05860 100644 --- a/external_imported/vcpkg/ports/boost-beast/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.78.0 - SHA512 6b8c46d50833265642093d612c6a1c29e764e9fbee65e8514c377390ee69469a8a170ab5829de2d0f28641d5b15d11d7f174367d3c68eb0f36dbdd2b3bd08392 + REF boost-1.80.0 + SHA512 b8ed78521a228e91346868fd1dd1d5d543b396e49895c889887a23065aac4253c4e7cb19b89712ee6a332f5ae73807fa75b82d57ddd2bd47b49ace5cb03cfa6e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-beast/vcpkg.json b/external_imported/vcpkg/ports/boost-beast/vcpkg.json index 5ea44a974..2c7280593 100644 --- a/external_imported/vcpkg/ports/boost-beast/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-beast/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-beast", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-asio", diff --git a/external_imported/vcpkg/ports/boost-bimap/portfile.cmake b/external_imported/vcpkg/ports/boost-bimap/portfile.cmake index 23ab830ec..731bc17f6 100644 --- a/external_imported/vcpkg/ports/boost-bimap/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.78.0 - SHA512 ab681674da7c1d5cf14f93f9832d5f0010661b42dc0fff2299dd7dced026fd0a474633363d070260a57bad0b3e956431c02ab5116e7d990d04bf37cf2f274c8a + REF boost-1.80.0 + SHA512 1017fa1c290edbe5e7064c4d62626aa637b39755ba00d28bca9028283c740c28613fd6735158d39c30aa309251986ea0a0a0a7db9bd2c1cb7cbd46c96e2b857e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-bimap/vcpkg.json b/external_imported/vcpkg/ports/boost-bimap/vcpkg.json index ff6b9d7c0..2f26c64ae 100644 --- a/external_imported/vcpkg/ports/boost-bimap/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-bimap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-bimap", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", + "license": "BSL-1.0", "dependencies": [ "boost-concept-check", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-bind/portfile.cmake b/external_imported/vcpkg/ports/boost-bind/portfile.cmake index b23a81f80..0153fbcc3 100644 --- a/external_imported/vcpkg/ports/boost-bind/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.78.0 - SHA512 8fc9484da8aeacd8a9fb60ad3dc061de278ae854d9abb6e513f330e38452d3af8cfa9342f185a15c7fff907b0dec02b7e54fbb8661633639aa34d9e9cd7ae7e2 + REF boost-1.80.0 + SHA512 a16828b6750c6e929fea313ac724c295401115cfb1750c22663f0da8e0a046cb19f97ba6f4047abcade7e21da890cfb995b733656adb2fafa62226f4a925449d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-bind/vcpkg.json b/external_imported/vcpkg/ports/boost-bind/vcpkg.json index fb4e45d7b..8e9bc6fdd 100644 --- a/external_imported/vcpkg/ports/boost-bind/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-bind/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-bind", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch b/external_imported/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch deleted file mode 100644 index 8a0415c7c..000000000 --- a/external_imported/vcpkg/ports/boost-build/0001-don-t-skip-install-targets.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001 -From: Dmitry -Date: Sat, 11 Dec 2021 16:58:23 +0300 -Subject: [PATCH] Don't skip install targets if there's no in ureqs - (#113) - ---- - src/tools/stage.jam | 4 ++++ - test/install_build_no.py | 26 ++++++++++++++++++++++++++ - test/test_all.py | 1 + - 3 files changed, 31 insertions(+) - create mode 100755 test/install_build_no.py - -diff --git a/src/tools/stage.jam b/src/tools/stage.jam -index c5f02e3b..325129dc 100644 ---- a/src/tools/stage.jam -+++ b/src/tools/stage.jam -@@ -478,6 +478,10 @@ class install-target-class : basic-target - return [ sequence.unique $(result2) ] ; - } - -+ rule skip-from-usage-requirements ( ) -+ { -+ } -+ - # Returns true iff 'type' is subtype of some element of 'types-to-include'. - # - local rule include-type ( type : types-to-include * ) -diff --git a/test/install_build_no.py b/test/install_build_no.py -new file mode 100755 -index 00000000..0ccf3c5c ---- /dev/null -+++ b/test/install_build_no.py -@@ -0,0 +1,26 @@ -+#!/usr/bin/python -+ -+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) -+# Distributed under the Boost Software License, Version 1.0. -+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) -+ -+# Check that no in usage-requirements of dependencies does not affect -+# install rule, i.e. a skipped installed target does not affect insallation of -+# other targets. -+ -+import BoostBuild -+ -+t = BoostBuild.Tester() -+ -+t.write("a.cpp", "int main() {}\n") -+ -+t.write("jamroot.jam", """ -+make x : : maker : no ; -+exe a : a.cpp ; -+install install : x a ; -+""") -+ -+t.run_build_system() -+t.expect_addition("install/a.exe") -+ -+t.cleanup() -diff --git a/test/test_all.py b/test/test_all.py -index b7ef5ad7..9ed729d0 100644 ---- a/test/test_all.py -+++ b/test/test_all.py -@@ -250,6 +250,7 @@ tests = ["abs_workdir", - "inherit_toolset", - "inherited_dependency", - "inline", -+ "install_build_no", - "libjpeg", - "liblzma", - "libpng", --- -2.34.1.windows.1 - diff --git a/external_imported/vcpkg/ports/boost-build/portfile.cmake b/external_imported/vcpkg/ports/boost-build/portfile.cmake index ec913ceaf..f14b3dc86 100644 --- a/external_imported/vcpkg/ports/boost-build/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-build/portfile.cmake @@ -4,16 +4,15 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.78.0) +set(BOOST_VERSION 1.80.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 867966e3d254c0e996786587fb64ad1bda6f96546e5302c15231b17d66537798770bbd9e89f800d445a1f0a4d3be06dff8aed42dfd3a77b563d0f5d715e79324 + SHA512 11ac21b27c5c656951784734c6642a2d4efa185e074ec48561f2800203b639d4a628fec6d356bb733494889141327a7ac730ce127449bfc7d509d5d213216995 HEAD_REF master PATCHES - 0001-don-t-skip-install-targets.patch 0002-fix-get-version.patch ) diff --git a/external_imported/vcpkg/ports/boost-build/vcpkg.json b/external_imported/vcpkg/ports/boost-build/vcpkg.json index a425121de..42e04cebd 100644 --- a/external_imported/vcpkg/ports/boost-build/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-build/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-build", - "version": "1.78.0", + "version": "1.80.0", "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", + "license": "BSL-1.0", "dependencies": [ "boost-uninstall" ] diff --git a/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake b/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake index 3366f1866..562d098d1 100644 --- a/external_imported/vcpkg/ports/boost-callable-traits/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 7bdd11a059bbf81e648e44750d77d1089674f34b167d86bfcfc653d2b6a6841188bccac2e7e9769a76022e052bba5b6d4c0b72bec1f630196a5ea290ffe5ee24 + REF boost-1.80.0 + SHA512 1966bc51a605fabdb7bccefec04a7517fdc08b490eb30f865223c7da442309e224b71caa6bd8e57fac117ac35a95d29b82ed96d283f514d1baa361199af178c6 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json b/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json index 5a384b18a..367af6acc 100644 --- a/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-callable-traits/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-callable-traits", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-chrono/portfile.cmake b/external_imported/vcpkg/ports/boost-chrono/portfile.cmake index 67632cdcd..96a4ef900 100644 --- a/external_imported/vcpkg/ports/boost-chrono/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-chrono/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.78.0 - SHA512 5e4f289508f58fda3cdebe17a65b1e6eb911473b8e7ec382fdf834661e46c7645b4d864abac7a124100feb4e46bbac78cbc2d7101053c0c3538d6b74ff6830e3 + REF boost-1.80.0 + SHA512 421b8b30e7e11024c240815e2c5eb5a7c7b76fdc8ac7da9bb70c600aced9da96bd634bfb3dd5c485f00d0cf2bc9bb75cda15bcc08753cd007853fcf2ca80f8d1 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-chrono requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-chrono/vcpkg.json b/external_imported/vcpkg/ports/boost-chrono/vcpkg.json index f6e6002cf..769985c07 100644 --- a/external_imported/vcpkg/ports/boost-chrono/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-chrono/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-chrono", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake b/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake index 31d0e7d92..d3b3a9191 100644 --- a/external_imported/vcpkg/ports/boost-circular-buffer/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 07b8cbec9a4f50b06c7da5ca496c86d697d8c78fb36588a9d6b36e9042ca53d2c28a0bb6cd97904a049efe60990b81d45b14693bffc91133dde4ab253deb0ea1 + REF boost-1.80.0 + SHA512 1d7cc56dbdc66ad9a3956ee02e351fe1efca8419fa8a2a6bda1fad4f23676cd29d66a92c7ecb73295edd7a8ed3180614923e233bc55c3f3dfc39be86a8118fe2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json b/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json index bd6a20a0d..103d4521b 100644 --- a/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-circular-buffer/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-circular-buffer", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake b/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake index 78a4b6151..52aefefac 100644 --- a/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.78.0 - SHA512 902f006406d376dc5ee68d4c2429ccf7fc5159e23e9b2b8238f5008bab87505bb2ff8c92084f6c7585a24c9874d73933bc6d6b92f36cd6cd0b83da9733a4b0e0 + REF boost-1.80.0 + SHA512 1bd295c78493bb363c34868d6f8772d6ef33970de96dbbaef138f721e46b820cbeb96bb61d1bfe1baa7f9cfa4b6c9d274229559693be73ec29959c4f91d89fd8 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json b/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json index fd584bd61..aebfa8652 100644 --- a/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-compatibility/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-compatibility", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-compute/portfile.cmake b/external_imported/vcpkg/ports/boost-compute/portfile.cmake index f7ca475fb..9ee451c86 100644 --- a/external_imported/vcpkg/ports/boost-compute/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.78.0 - SHA512 5e9daaaf875e636825ece0c38f16f503f102e42c1acb02539623c4488244e966689d8af850afc4c4d2abd7009f416ddb2e0c76cd43de4e2f7b022355a3409a36 + REF boost-1.80.0 + SHA512 95434c987bf32a05c9f98f7428af434f078c67259fd39d8549152e4d6f7327de13d90898be27889e8c4df5f237e8dd732723a0c9b33e19ca2af7bee4f4814778 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-compute/vcpkg.json b/external_imported/vcpkg/ports/boost-compute/vcpkg.json index a5cfddc6c..7ddd1d435 100644 --- a/external_imported/vcpkg/ports/boost-compute/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-compute/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-compute", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake b/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake index cdb17c36d..e9f135f5d 100644 --- a/external_imported/vcpkg/ports/boost-concept-check/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 b9d7caba37731ce3aeaa32016f7055f91e15843a8a6022e6863fd9ad86af4b0b8c0b7f3828d7601906deb5c84597546f155d5ad600c4b764c6a54e1fa2f6a869 + REF boost-1.80.0 + SHA512 214946b1064da82612a2f779556bb7d619b9e3d79ac9b41f1858322a0db3373232543cc91a5c821f86292d5bcf5bd6fb74ceb0835e1ffcf433474411fae6194e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json b/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json index 685451d63..40df1184a 100644 --- a/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-concept-check/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-concept-check", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-preprocessor", diff --git a/external_imported/vcpkg/ports/boost-config/portfile.cmake b/external_imported/vcpkg/ports/boost-config/portfile.cmake index 204d3b3dd..7cc52a9a3 100644 --- a/external_imported/vcpkg/ports/boost-config/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.78.0 - SHA512 116820d81ff268e8231bfdd9160cf803bbf6f9987ab2261630bc7c21b283db9e7ef3b9576c4d3444a52ce2533fde653ff75f98f6c1cd5e78d5936df674f6f8ee + REF boost-1.80.0 + SHA512 1c2a87548e2401fcd3a5ae3ab17b0f4f930b6c5ae1f1820aeb5274132ae2c3ae52b5226b9a9b1c46c8a48aee2e6014e1f4dcfe251d5bdf367681b3ed4d933a90 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-config/vcpkg.json b/external_imported/vcpkg/ports/boost-config/vcpkg.json index 2b650f63a..3a5f2d6c9 100644 --- a/external_imported/vcpkg/ports/boost-config/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-config/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-config", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake b/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake index 7b009e656..d8bb5ef0a 100644 --- a/external_imported/vcpkg/ports/boost-container-hash/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 344ed155031904336c48c61b66a23b420cb63e5601ea1f5eb614dcac576aff8900b3cd79889b5313f2f7558ece81efc3a1944c07d0374a00a3766eb4b1dda3e0 + REF boost-1.80.0 + SHA512 330ff226663bcb4c1ba5a334b3e40a45e715bbee6973c9b1f858eb6940c6376abca79ea5a5f9907934fd4c6340e6b3da2fb1c1be77d9bdde95566232705af957 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json b/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json index 858425380..56988cdcd 100644 --- a/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-container-hash/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-container-hash", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-container/portfile.cmake b/external_imported/vcpkg/ports/boost-container/portfile.cmake index 447dedabf..90e960035 100644 --- a/external_imported/vcpkg/ports/boost-container/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-container/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.78.0 - SHA512 f20ca062d061c24caf262b6524525f4face4e7fc9e924d16b9160f7d7720c4490f131abc08f5ff9a04ea59c04cffef4f1cebf33a1d524aaed8903eb355b55700 + REF boost-1.80.0 + SHA512 a67bfbce1ceceacc3048477569e652741a7c3eec0a1c8602a23c327ca3dc1725902235620c4ea43064daa2469d984c7654da076939a0ac300626be2e335787c6 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-container requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-container/vcpkg.json b/external_imported/vcpkg/ports/boost-container/vcpkg.json index 0e6166c1b..d5d47e9a2 100644 --- a/external_imported/vcpkg/ports/boost-container/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-container/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-container", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in b/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in index a16d25fdb..c54e6b9f0 100644 --- a/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in +++ b/external_imported/vcpkg/ports/boost-context/b2-options.cmake.in @@ -7,10 +7,17 @@ if(@VCPKG_TARGET_IS_WINDOWS@) endif() if(@VCPKG_TARGET_IS_OSX@) - list(APPEND B2_OPTIONS - abi=sysv - binary-format=mach-o - ) + if(@VCPKG_TARGET_ARCHITECTURE@ MATCHES "^(ARM|arm)64$") + list(APPEND B2_OPTIONS + abi=aapcs + binary-format=mach-o + ) + else() + list(APPEND B2_OPTIONS + abi=sysv + binary-format=mach-o + ) + endif() endif() if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON") diff --git a/external_imported/vcpkg/ports/boost-context/portfile.cmake b/external_imported/vcpkg/ports/boost-context/portfile.cmake index 26e5bf522..acce482b9 100644 --- a/external_imported/vcpkg/ports/boost-context/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-context/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.78.0 - SHA512 ea2695df5301853209ed0db70cff632e27066dbd2dcfb3946022633427a45ad07f104eee7ac554038a45f4bf89fb8b39ee4d07f873aebb4571ed392d1e343879 + REF boost-1.80.0 + SHA512 4313ea48612eb4768f015a4b48ae9470e709556b9ad817da0deeaca5ea6c142339c9d670ed919bdc89b4ea139b627617386a828d2dfb6757ac9416184629a3d4 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.") -endif() +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) configure_file( "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" diff --git a/external_imported/vcpkg/ports/boost-context/vcpkg.json b/external_imported/vcpkg/ports/boost-context/vcpkg.json index 15d0080bf..c7ffd32b7 100644 --- a/external_imported/vcpkg/ports/boost-context/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-context/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-context", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", + "license": "BSL-1.0", "supports": "!uwp & !emscripten", "dependencies": [ "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-contract/portfile.cmake b/external_imported/vcpkg/ports/boost-contract/portfile.cmake index f3053c69b..80c9edd61 100644 --- a/external_imported/vcpkg/ports/boost-contract/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-contract/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.78.0 - SHA512 c746ff575a33ef21245c927249142a017bb3616b4790d30bca0473ed70c626427be67d647f49693357440f6f9a540c6152df445de922bf4e6b55756197e5fbde + REF boost-1.80.0 + SHA512 bcb2f74b3ed3af4e919054ab8b3e24b634d0ea0d9da14c308859e4bcf9382316669f38790ecd8b25c06f5cf84c924e79915159e8ddb0f5d1912d87f063aa1e71 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-contract requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-contract/vcpkg.json b/external_imported/vcpkg/ports/boost-contract/vcpkg.json index 68ea09dc9..9809aa126 100644 --- a/external_imported/vcpkg/ports/boost-contract/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-contract/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-contract", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-conversion/portfile.cmake b/external_imported/vcpkg/ports/boost-conversion/portfile.cmake index a9a1139b5..b8dd288b0 100644 --- a/external_imported/vcpkg/ports/boost-conversion/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.78.0 - SHA512 0a3d649eccf90d3a2327139f236498dd11e49e308f30b559e7c91d955685eb859a76bb92d9cec6aa066dd898a35dc1c4cbfa60751db75331261f381bee1cc600 + REF boost-1.80.0 + SHA512 fff6ae3b7be67b1346c3b2027157a828ccf9c08279a104502707e262255291612f849a2d51ff4acc7768f31f2dae5311c3928fd56f5b97623d3781b25e62dd1e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-conversion/vcpkg.json b/external_imported/vcpkg/ports/boost-conversion/vcpkg.json index c9f65045e..e67c5e67e 100644 --- a/external_imported/vcpkg/ports/boost-conversion/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-conversion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-conversion", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-convert/portfile.cmake b/external_imported/vcpkg/ports/boost-convert/portfile.cmake index 5a58a6168..f3fe39d1d 100644 --- a/external_imported/vcpkg/ports/boost-convert/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.78.0 - SHA512 0a1b91d5b8e750de42ca774b98eb59b0b5287890546548facf049b9157e82bfdd741f8aeafba311dd9a99235da93a4224db0cabbfc4e0f8e7ac9c5c1f6d528bf + REF boost-1.80.0 + SHA512 68f40fdbaa45618a4c7cf27eaf202be4407451fa9c3f575235c39b3ee2ccb2d80e5766ca1c4b5472560caf34310ccdd92f296743d12e025b5678d3e87ccd9c45 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-convert/vcpkg.json b/external_imported/vcpkg/ports/boost-convert/vcpkg.json index 0e9873522..147eeb8d3 100644 --- a/external_imported/vcpkg/ports/boost-convert/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-convert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-convert", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-core/portfile.cmake b/external_imported/vcpkg/ports/boost-core/portfile.cmake index 1403a0004..674b4c914 100644 --- a/external_imported/vcpkg/ports/boost-core/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.78.0 - SHA512 df3a14047bf50dd98d21f1251c74685440c306948301f2017525f3ad638664f5b13c353cbfd78cb1f5b35b91eb0f8c5818fcf3939e9ce52c1d00b4a50a22e311 + REF boost-1.80.0 + SHA512 4b83c749f18b5f79b52f7b400f9da3255f9b4fbf6280096a09da1ffbaab0513a0ce7d6b68c9e26fb93e632e3bb1dd46de280d721ab7ffcd66dce2f8ed97030b9 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-core/vcpkg.json b/external_imported/vcpkg/ports/boost-core/vcpkg.json index d9eb92039..9b54ae369 100644 --- a/external_imported/vcpkg/ports/boost-core/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-core/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-core", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake b/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake index 96bd3e992..afdfcfa02 100644 --- a/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-coroutine/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.78.0 - SHA512 ebb8319388b2a57143a3fb5a66cc930547a804fd8b04374632c2fbaff8f28a1d9b22ea5862e39c1e653c2062c2137e97d38fa5cb44ce5699b07cc5c7526f311f + REF boost-1.80.0 + SHA512 71e0694e7056c83593999b4cd49d9bd6abf8ff1b37f2559b12de317218601f70a1bb192dc8270f4455739486d8660dd5a4bd76420c58182086d7710883e897ec HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-coroutine requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json b/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json index 47fa52783..eb4f9b84f 100644 --- a/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-coroutine/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-coroutine", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", + "license": "BSL-1.0", "supports": "!arm & !uwp & !emscripten", "dependencies": [ "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake b/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake index 8fa27a2f9..5ad02d110 100644 --- a/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.78.0 - SHA512 e25ac3a97fe4ffd12449b324d311c4e8bb1f64db6166b460c087b09bffdcfa0746bf7731e08258b936639d319944b7f6d193ec92231d7f5d8cbee2f64d0f23e7 + REF boost-1.80.0 + SHA512 5a0ea6f9e69373edb52b83e6efeb552fc0d211e2316c65d3506ad3dd5f547a9025a14924615df35e790c9d351a0c6a5269c31ab961eadcf019f25f5e739b5bc0 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json b/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json index 5707c0f8c..38d92475b 100644 --- a/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-coroutine2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-coroutine2", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-crc/portfile.cmake b/external_imported/vcpkg/ports/boost-crc/portfile.cmake index 6904b3539..449fe21fc 100644 --- a/external_imported/vcpkg/ports/boost-crc/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.78.0 - SHA512 e913075402e98eb4a8e216bce3307d5339c924206640a1f389dfaeeca0336be29714852d1c8a40ab9a7c4f40efd37d433cc7c717324911d48ee4b845c1ebdf83 + REF boost-1.80.0 + SHA512 9365b348dba52436d717c329634b58a9731b22b289714a3618bad9a4ea6967b8170ec289c4528762cd3cf74ae768a3756ce3d876ea8297b65f941d5560080a1b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-crc/vcpkg.json b/external_imported/vcpkg/ports/boost-crc/vcpkg.json index f7fd45e50..4d9f06cf9 100644 --- a/external_imported/vcpkg/ports/boost-crc/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-crc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-crc", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-date-time/portfile.cmake b/external_imported/vcpkg/ports/boost-date-time/portfile.cmake index 7285a90ba..ec1aabfb1 100644 --- a/external_imported/vcpkg/ports/boost-date-time/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-date-time/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.78.0 - SHA512 a4fda022d4658fa4db22114cc696acbc369505eda9fab722bbc7d5149af22f8c5c4e0e12f86b1ae07223cef82d791c278c656a7f492a0f89200921964c7057fd + REF boost-1.80.0 + SHA512 6b15abc20f89d06ff225042e36685dfd3121432c72d965e94d65e5c17bff6c7dc2f4a5d2511e0496518245ada92bf178f46ba5dcb3af9e56383e3cce9c03f6f5 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-date-time requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-date-time/vcpkg.json b/external_imported/vcpkg/ports/boost-date-time/vcpkg.json index 2a3716591..f3b260b54 100644 --- a/external_imported/vcpkg/ports/boost-date-time/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-date-time/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-date-time", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-describe/portfile.cmake b/external_imported/vcpkg/ports/boost-describe/portfile.cmake index ee73f5212..d1b688f86 100644 --- a/external_imported/vcpkg/ports/boost-describe/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-describe/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/describe - REF boost-1.78.0 - SHA512 2a3601bdd98dc3248402baca147000cece14458f9478af1726c919037190f1affae0e82f26124d17531da9e0dc8180998646babe7dc14756aa36cc5d51fde1cd + REF boost-1.80.0 + SHA512 ede3b1723b30da1cb37042895d1c3e43e94d5ab67f0f78887da265e57f8e7cf5a535e3d56d637e8e251271c7fc645d17cdcb4acd568d613c0479e2bf49de1010 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-describe/vcpkg.json b/external_imported/vcpkg/ports/boost-describe/vcpkg.json index 284565557..c8e119fad 100644 --- a/external_imported/vcpkg/ports/boost-describe/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-describe/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-describe", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", + "license": "BSL-1.0", "dependencies": [ "boost-mp11", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-detail/portfile.cmake b/external_imported/vcpkg/ports/boost-detail/portfile.cmake index 72829444a..6271bf1dd 100644 --- a/external_imported/vcpkg/ports/boost-detail/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.78.0 - SHA512 7d3206d42a2af1692807845077abf2dd9330d0628a7a2dbd221f73b405bada294c5f380e3765a16df647bd4ffe4bacc5fda4a40f7c5b6c8f7dc77f20152e778f + REF boost-1.80.0 + SHA512 1f9d1a392905973a7d717bc11e7b2539711df74549e49d56ac124c44a5c1ec103c96b669ac49e37ed2fd7fa01b7851940bc43803f1a7c22250ed869411931c59 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-detail/vcpkg.json b/external_imported/vcpkg/ports/boost-detail/vcpkg.json index 125895bc6..5f99183c0 100644 --- a/external_imported/vcpkg/ports/boost-detail/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-detail/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-detail", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-dll/portfile.cmake b/external_imported/vcpkg/ports/boost-dll/portfile.cmake index 58964d276..23d9399b8 100644 --- a/external_imported/vcpkg/ports/boost-dll/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.78.0 - SHA512 bc7869b43cc2aaf69a168c8fab02d3f0eb9283ab47dd8f6d3fc15cd7f82d561f092fa77564cc70f43d14af9220f7a59addfb3c9e40744e3223aa8be6f3c5bb57 + REF boost-1.80.0 + SHA512 5d13d9b2efdad1f99a7db9dc90b0faa4845b850182915c32c195b73eadfaea77a0d15f5163a8a402561af1f5d66ca1f6273abace42a8340b7587e8cdce5d9d0a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-dll/vcpkg.json b/external_imported/vcpkg/ports/boost-dll/vcpkg.json index abb260d6e..c5c746216 100644 --- a/external_imported/vcpkg/ports/boost-dll/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-dll/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-dll", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake b/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake index 66a24c146..bb55cbf13 100644 --- a/external_imported/vcpkg/ports/boost-dynamic-bitset/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 cb3b6542f16d97126eac963a48ace71b795bcc32148c2a8608694045afd833520c104c5ac7ad98ba8196bfa182040e4edd4c54d9af88b257aee0e390251c74a7 + REF boost-1.80.0 + SHA512 ce09a94ffd67b9670be1250c81ef2e85f48c73981cbf02053ff17a7a0cab56f27348e504fbfebe3b322b94c33c78989684fa992d780be1271858e9d96a0c4979 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json b/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json index 1ab3c838d..05cea9194 100644 --- a/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-dynamic-bitset/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-dynamic-bitset", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-endian/portfile.cmake b/external_imported/vcpkg/ports/boost-endian/portfile.cmake index 9f370038e..084bdf243 100644 --- a/external_imported/vcpkg/ports/boost-endian/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.78.0 - SHA512 f010f4c1d301637fc8fbd9220eb7456cd9f0ce04cfc56af2c25092a7a53a4f7e541cfc65bab46e65fe6007184d335b99b03ec0d26ab7935ffd5d622c99caf817 + REF boost-1.80.0 + SHA512 187f758c77882f6e30a880a8ac84f450a07a275836a629bc93e8dd3bf5f77b7137172370816b78f109df58fe4757c7af5cefa0f818bdb802c8ef1138a8b12acb HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-endian/vcpkg.json b/external_imported/vcpkg/ports/boost-endian/vcpkg.json index 84f7432ac..9e3acee29 100644 --- a/external_imported/vcpkg/ports/boost-endian/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-endian/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-endian", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-exception/portfile.cmake b/external_imported/vcpkg/ports/boost-exception/portfile.cmake index e96f086cc..aae9c8830 100644 --- a/external_imported/vcpkg/ports/boost-exception/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-exception/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.78.0 - SHA512 b1e70fd27fb918cd3e6bd77307de96ccade192bbde8ddb2f27301d7b242e1d8acb1dc7590c361fb4036b0abe303b222d2b2d28263036de540044461850d31804 + REF boost-1.80.0 + SHA512 57477329a2671147db24a6fd9792f8694943c92475d03daab2284c1ca316fca9675ba3a9e6f0adcd5e7361d35869240efff10d373e30c79ba99cb9a4640e649a HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-exception requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-exception/vcpkg.json b/external_imported/vcpkg/ports/boost-exception/vcpkg.json index 6e0ec47c3..288fa7cbe 100644 --- a/external_imported/vcpkg/ports/boost-exception/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-exception/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-exception", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-fiber/fix-build-numa.patch b/external_imported/vcpkg/ports/boost-fiber/fix-build-numa.patch deleted file mode 100644 index d1b93f240..000000000 --- a/external_imported/vcpkg/ports/boost-fiber/fix-build-numa.patch +++ /dev/null @@ -1,15 +0,0 @@ - build/Jamfile.v2 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 -index 3efdb96..8a6b6dd 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -130,6 +130,7 @@ lib boost_fiber_numa - numa/algo/work_stealing.cpp - : - @numa -+ boost_fiber - [ requires cxx11_auto_declarations - cxx11_constexpr - cxx11_defaulted_functions diff --git a/external_imported/vcpkg/ports/boost-fiber/portfile.cmake b/external_imported/vcpkg/ports/boost-fiber/portfile.cmake index 08851ff72..46d25daeb 100644 --- a/external_imported/vcpkg/ports/boost-fiber/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-fiber/portfile.cmake @@ -3,19 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.78.0 - SHA512 271454964e12c0006ed9ef52911cf76d004141da54d5f96e63d106a216841d9a939d3dcd802fc9e860ac6a21d0b7fab9f385e8647ebbd2fd669e48fc9b6a80c9 + REF boost-1.80.0 + SHA512 4eb5b35fcf5c882051d0deebc55c58c40a235c8d8695cfad462036a9a7de972a40c5bb4c724d4c412e400f9f1ed74f079af3ca7f5143739068f31c0c76567a8d HEAD_REF master - PATCHES fix-build-numa.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-fiber requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-fiber/vcpkg.json b/external_imported/vcpkg/ports/boost-fiber/vcpkg.json index a7145abf7..d814be69d 100644 --- a/external_imported/vcpkg/ports/boost-fiber/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-fiber/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-fiber", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", + "license": "BSL-1.0", "supports": "!osx & !uwp & !arm & !emscripten", "dependencies": [ "boost-algorithm", diff --git a/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake b/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake index 0d5b3bfcc..509a066f3 100644 --- a/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-filesystem/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.78.0 - SHA512 5a17a3084db574325394e56dc5fb740dfe6d0aa53026040ce98e6248a62501cf7b8f37721d7f6d6d0366ab5bdcbc52be9084ebf3147c91c6208fd9a67bfbac1c + REF boost-1.80.0 + SHA512 9e8c3151f65af1242014987b10009c6b0467d0da3da1813e709a7238669a54a7256097ec205e3ff430b3b00c8a29d06a7b666562c3285e4d6fb5e73857e24604 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-filesystem requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json b/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json index 57abd3b2c..6fff2f3e8 100644 --- a/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-filesystem/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-filesystem", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", @@ -24,6 +25,7 @@ "boost-predef", "boost-smart-ptr", "boost-system", + "boost-throw-exception", "boost-type-traits", "boost-vcpkg-helpers", "boost-winapi", diff --git a/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake b/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake index eec3b1079..3ad6bd266 100644 --- a/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.78.0 - SHA512 192a9985ab4026284d703993e71db88feccc045bc3039763daa87078cd5881e0fee9e65024f264813d508d4cf53b41661befef50dbec911d4ad5063eb11da144 + REF boost-1.80.0 + SHA512 84e2ab0e65e1dd8d05c4e5f98a603b99b85faed8c7ab50244ba6d252ecc62c2a8c14f542958d8833b8ed8c13d364db1e33a872a94cf5c204dd33f280a7986ff2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json b/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json index 2b348bff5..452b00f95 100644 --- a/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-flyweight/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-flyweight", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-foreach/portfile.cmake b/external_imported/vcpkg/ports/boost-foreach/portfile.cmake index 3338bf2c2..906a41904 100644 --- a/external_imported/vcpkg/ports/boost-foreach/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.78.0 - SHA512 dfc27c7f6353270e910a26511abef83d1f89cfbeeb6fe6da3cd51d1d6f832369734449b0c56e0476631216688d005047e5724a13df03cd3eeaba2b30b4c926d2 + REF boost-1.80.0 + SHA512 4ce33f0b1157ee29c2bd2f9a68b2992b1839da220789b2146632f7a2a859bf756ac60ebf0ed7876c4d57c5a814f51561e3b13fafc58f80ac653b2d93b572abae HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-foreach/vcpkg.json b/external_imported/vcpkg/ports/boost-foreach/vcpkg.json index 4b9f83930..1abb85ce6 100644 --- a/external_imported/vcpkg/ports/boost-foreach/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-foreach/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-foreach", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-format/portfile.cmake b/external_imported/vcpkg/ports/boost-format/portfile.cmake index 95ff3d495..fa814a67e 100644 --- a/external_imported/vcpkg/ports/boost-format/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.78.0 - SHA512 5d104eaff0d91984c5ac712af1e53f0d73215dad4252b065dec119bbad5dde72a35bf23f56dc2f765902045ca94d5472c1ab15241ef631fdf784cd950a98e86f + REF boost-1.80.0 + SHA512 89dc4daf80d7663472839f66455c747c0944b336302a09be6bdf3e186956a703fe136e7e9c4d27b11cde7baf517f46b289ffaa6a1dd762e5c5810eb1470cf2c8 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-format/vcpkg.json b/external_imported/vcpkg/ports/boost-format/vcpkg.json index 920041648..c7c987022 100644 --- a/external_imported/vcpkg/ports/boost-format/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-format/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-format", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-function-types/portfile.cmake b/external_imported/vcpkg/ports/boost-function-types/portfile.cmake index d4fd306c4..cc8271fef 100644 --- a/external_imported/vcpkg/ports/boost-function-types/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 9cd5a8c91e3fa32e3d5aed48da82c5b22c4a3309eecb18adf07e716393e58bd61ae273a5077222ad4c036561b317591934c876392effeb47b231554a20ff291b + REF boost-1.80.0 + SHA512 6fafbcbecaca0fc44d674484340823d8561f64ed94f13f11b994a8c34a1a36a90b1d8355fbb2c3adfa15bcd8618d3fac1874670c8677ef02f8edcb2a25f04183 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-function-types/vcpkg.json b/external_imported/vcpkg/ports/boost-function-types/vcpkg.json index 37bf9d59c..d1e764909 100644 --- a/external_imported/vcpkg/ports/boost-function-types/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-function-types/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-function-types", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-function/portfile.cmake b/external_imported/vcpkg/ports/boost-function/portfile.cmake index 922f9dcd6..068359db3 100644 --- a/external_imported/vcpkg/ports/boost-function/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.78.0 - SHA512 b8a1da6c586948f3a7981c8adf0b3bc556da8aff9cae5dbb3bf4a7610e035a1969e89e3039d09105d28bcf73c04fd041b2c972fde9706657ac3996a9062fa96d + REF boost-1.80.0 + SHA512 fa3383b2876bc5fc8c9a5f79d2757d232f327b7ff380dedb9993a684dd2ce7a5de9a5c3cc15c94341c62faeea7c8d718418ed166a2171375c8d4f5ec74863e4f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-function/vcpkg.json b/external_imported/vcpkg/ports/boost-function/vcpkg.json index 13efb0089..476a7780f 100644 --- a/external_imported/vcpkg/ports/boost-function/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-function/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-function", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-functional/portfile.cmake b/external_imported/vcpkg/ports/boost-functional/portfile.cmake index e1b2257ba..246cc1da7 100644 --- a/external_imported/vcpkg/ports/boost-functional/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.78.0 - SHA512 d4fea4d4c5af107fb26b025c30dca05e5875e0ee2046f54f86a1acf3ea25864776783fdedc3922cd9fa8124cb10ad68c778dcd82f7575f70e6c14d6ff9b339f8 + REF boost-1.80.0 + SHA512 c7af977120c64b44d28b26fcc0f897731b1baa770d87659eddffcab32646e0b754a022ea5beddd930b7043f15beb083befb23303ab5363f8abd67c0ad822b592 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-functional/vcpkg.json b/external_imported/vcpkg/ports/boost-functional/vcpkg.json index 5ffb24d9a..083145d31 100644 --- a/external_imported/vcpkg/ports/boost-functional/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-functional/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-functional", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-fusion/portfile.cmake b/external_imported/vcpkg/ports/boost-fusion/portfile.cmake index 9d6d94a2b..614a0db01 100644 --- a/external_imported/vcpkg/ports/boost-fusion/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.78.0 - SHA512 dd76b330c21943ca05789756705dd62be3c987eb5023cf4ae9330e90a0020065cd7544bb8b7238b9e4c85ce5ed0db2b3f5895aecd222c0db3275b855323f2e7c + REF boost-1.80.0 + SHA512 77121dc0bf188b530d2d7e2ab6ab5c6d3e8c01f9a063e581187bd3cce5ab35002c08f47dc5bce03487344b50c1fc1817f9cf4e1daeece9ce96ae5a2a99ac632e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-fusion/vcpkg.json b/external_imported/vcpkg/ports/boost-fusion/vcpkg.json index 90ab4bb8b..aa73ce1be 100644 --- a/external_imported/vcpkg/ports/boost-fusion/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-fusion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-fusion", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-container-hash", diff --git a/external_imported/vcpkg/ports/boost-geometry/portfile.cmake b/external_imported/vcpkg/ports/boost-geometry/portfile.cmake index d8b6b6f4b..27ca8729e 100644 --- a/external_imported/vcpkg/ports/boost-geometry/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.78.0 - SHA512 8b348420555d070412e543190e201b85b1e090911e6e299fd5cf375d1927e63092f95c8b17723d6477f96b7fb9edffaea2b0070a7794c1b2af2b63e62704c40e + REF boost-1.80.0 + SHA512 3b195957afa51292f21430b9dad8f1ac4a69320bc423de86813c0f3740ee6dc5a33264f91eedbd022a1ccfd520fff45acc39d87c13e70031935b76ce3a584ce1 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-geometry/vcpkg.json b/external_imported/vcpkg/ports/boost-geometry/vcpkg.json index deb897465..551fefde5 100644 --- a/external_imported/vcpkg/ports/boost-geometry/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-geometry/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-geometry", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-any", diff --git a/external_imported/vcpkg/ports/boost-gil/portfile.cmake b/external_imported/vcpkg/ports/boost-gil/portfile.cmake index 88602ed17..de5aaa8e4 100644 --- a/external_imported/vcpkg/ports/boost-gil/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.78.0 - SHA512 6f8b94bb75cf5a1e8781454490d6873bf8c91e85ba7c98f81ece382000051c42512dc76939c693b9b24e97a3496f5fd97581a5665508bdb2ba11e570bc77bdfe + REF boost-1.80.0 + SHA512 4e562691addb9a1e58a90842c91439a6a906933d3de886e1d6d5c670d0774b493e427a986b7a37ff0d2c039e49142b5b37e4326815ada1946eab64ee69101be1 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-gil/vcpkg.json b/external_imported/vcpkg/ports/boost-gil/vcpkg.json index 32e00e207..54771317e 100644 --- a/external_imported/vcpkg/ports/boost-gil/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-gil/vcpkg.json @@ -1,18 +1,20 @@ { "name": "boost-gil", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", "boost-config", + "boost-container-hash", "boost-core", "boost-integer", "boost-iterator", "boost-mp11", - "boost-numeric-conversion", "boost-preprocessor", + "boost-type-traits", "boost-variant2", "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake b/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake index 6d0ca9b8e..574094963 100644 --- a/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-graph-parallel/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.78.0 - SHA512 50efce738dcdb001c5d429274f1d699caa45e68998f60dfdd5c0a572981ca72a2d08159619adda8a011c1d6237bf615572f74ebe10f2fb98334984a54c9f653d + REF boost-1.80.0 + SHA512 dde026b845d38468e041dbc3f9c2c65febfe8f378a526920d09de00ae4019d36a88051741163becf3cc560fe5f0919302d100ac38e5c140dd0fe23e9e7bc2a17 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-graph-parallel requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json b/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json index d663fdd36..cfabf9ed7 100644 --- a/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-graph-parallel/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-graph-parallel", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-algorithm", diff --git a/external_imported/vcpkg/ports/boost-graph/portfile.cmake b/external_imported/vcpkg/ports/boost-graph/portfile.cmake index b74e79157..d9026bc31 100644 --- a/external_imported/vcpkg/ports/boost-graph/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-graph/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.78.0 - SHA512 af51d2d0c07bc3d6c880b114c34aec2ebde9f4c1b2ee73a7e8be4edf2a8175ae341b0ce8fb36fe7b4899aebaafe054720f573233b72849648ca0a97c92098d77 + REF boost-1.80.0 + SHA512 b6a2007fdc0739fdb397621c297f60001f512216a578fba35fe60766ee8e6649c9e2c4e1d0ab6e21a2c7d5fd2b2dfcbeb9d99cc7d88dc05b9ed13bca8949c8b6 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-graph requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-graph/vcpkg.json b/external_imported/vcpkg/ports/boost-graph/vcpkg.json index b89fa9f63..2e01a0861 100644 --- a/external_imported/vcpkg/ports/boost-graph/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-graph/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-graph", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-any", diff --git a/external_imported/vcpkg/ports/boost-hana/portfile.cmake b/external_imported/vcpkg/ports/boost-hana/portfile.cmake index 1e7c706aa..90add160f 100644 --- a/external_imported/vcpkg/ports/boost-hana/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.78.0 - SHA512 407cc2dbf4fee28182564925cf2a11074728322e03b2c5acbc9d34ed4d7e30befde9f74176270b63179f09504b42375249f09d336546ebdf2e24b4956d2fb885 + REF boost-1.80.0 + SHA512 ada58ec5f99a65e5affad995c0afd0fd37478beaa1efd6f376a0532b062f281571512f7ae279e672595b0f7f765bd130abac68744532537d33537a1bf81e0b25 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-hana/vcpkg.json b/external_imported/vcpkg/ports/boost-hana/vcpkg.json index 6b5880314..3ce9d470d 100644 --- a/external_imported/vcpkg/ports/boost-hana/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-hana/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-hana", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-heap/portfile.cmake b/external_imported/vcpkg/ports/boost-heap/portfile.cmake index 64c78f82b..d67499677 100644 --- a/external_imported/vcpkg/ports/boost-heap/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.78.0 - SHA512 f8360f4cd5772e5e2fc62b4174778b227c34876fbda6b4a245d959ef895a20eb3fc88084de7f9f22caa89a9a6b4be50b5aff9088a8c81c4216450b5ebcdc5dc3 + REF boost-1.80.0 + SHA512 29185c23e783075d75ca5faef4013206ff21a9f570cd556b6b10ca2699890fa90e11b41239373225589d2784507c7fd8c7317355d4cceb55c2fa9a47e1920535 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-heap/vcpkg.json b/external_imported/vcpkg/ports/boost-heap/vcpkg.json index 204c7c05d..a9776e0dc 100644 --- a/external_imported/vcpkg/ports/boost-heap/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-heap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-heap", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-histogram/portfile.cmake b/external_imported/vcpkg/ports/boost-histogram/portfile.cmake index 743a07449..78221a015 100644 --- a/external_imported/vcpkg/ports/boost-histogram/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.78.0 - SHA512 1124b52f68f6a240ca5fc8e1514fe3350a1f16260b137b5fbdd67c9fd68573f11a9d95cfcc6f370201ef6ae95a35098e1c8a457180c26ffaeb9b29bb6fbb0a2a + REF boost-1.80.0 + SHA512 3dbaf900167f77f7bdfa97688e08f942f79a075c4fbe449392b8de7438ac499417c09a3c40322992bcd54e54ac765491f2461ea8a6bbd87105e1fcb4083c6775 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-histogram/vcpkg.json b/external_imported/vcpkg/ports/boost-histogram/vcpkg.json index 60a7ce773..29bfae50c 100644 --- a/external_imported/vcpkg/ports/boost-histogram/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-histogram/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-histogram", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-hof/portfile.cmake b/external_imported/vcpkg/ports/boost-hof/portfile.cmake index d82fb2460..c48a3f038 100644 --- a/external_imported/vcpkg/ports/boost-hof/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.78.0 - SHA512 120ff5db96651321eb2512b672c204219e6e6612e2a5764c933cd3b3d7afd82e2fe5ec57a0a293e83d276ee171aaca06eaa856dc8b7e5f891fdbd3bc536373a7 + REF boost-1.80.0 + SHA512 5958a7599aee973d76012b5b83eb3306383bebf9321f0c0293c16b8144cc0cb2baef8f6415ecb63330cc6ba945311794e833311633cf5c7b76ce7fd4005aa6f8 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-hof/vcpkg.json b/external_imported/vcpkg/ports/boost-hof/vcpkg.json index 3839b5919..154d5c013 100644 --- a/external_imported/vcpkg/ports/boost-hof/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-hof/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-hof", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-icl/portfile.cmake b/external_imported/vcpkg/ports/boost-icl/portfile.cmake index 5d3ecbfad..73accc7d5 100644 --- a/external_imported/vcpkg/ports/boost-icl/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.78.0 - SHA512 83d4f74ef6c4dbe7e6e9eaf1665bc2e013fa4236a92ea5b702889cb67e86d2c141897a8a9b627ef693c6514ddd148ea9f2120fc606e255238dd7ebd083a5fc47 + REF boost-1.80.0 + SHA512 798fbf8a88df27f117b820a36b2d2eecbb505948c70962284ec3ce1e6f5e96b4309b43fe39c5c983b65712fc3392ecac057c5aee766fbf94ec23f071decb925f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-icl/vcpkg.json b/external_imported/vcpkg/ports/boost-icl/vcpkg.json index 6e0df276f..ef28f54f2 100644 --- a/external_imported/vcpkg/ports/boost-icl/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-icl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-icl", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/external_imported/vcpkg/ports/boost-integer/portfile.cmake b/external_imported/vcpkg/ports/boost-integer/portfile.cmake index abc67f883..ade825867 100644 --- a/external_imported/vcpkg/ports/boost-integer/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.78.0 - SHA512 c0d87b0c8ccfc3923d61862429b22dcf09b9905c57927277bbef7c45ca1ae2ba57c35fd7d7ec3aec19eedf73598c4c1bf2d49c9d66af297fc2978cb196b6a64d + REF boost-1.80.0 + SHA512 eea19b26071cd4ea11afc5877ac23459897a40d278777b7ba2e8aa05a4f009a056e415b49766552460a2cc89c2cd02129ad5bcaa246b43075c0ff4f559083def HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-integer/vcpkg.json b/external_imported/vcpkg/ports/boost-integer/vcpkg.json index 4b6ac510f..9863ba1f3 100644 --- a/external_imported/vcpkg/ports/boost-integer/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-integer/vcpkg.json @@ -1,14 +1,16 @@ { "name": "boost-integer", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", "boost-core", "boost-static-assert", "boost-throw-exception", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake b/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake index 35c64ee14..76b1a1b68 100644 --- a/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.78.0 - SHA512 47ac928bc47f4fe0d504031e51c344f733820db2c40bb1e55187778692d480e692a3c3fee62e05d24b389b0117761ee8147fe8aaff1510a088047fb38a703986 + REF boost-1.80.0 + SHA512 75547ae0e829d11c742c01a43fb9c178e178323ca197b5063eae01aec89babd812f987ce0eff3a34994d355b27cc26b0edee1795d0671dd7dcbd7d98007a02a5 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json b/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json index 771a5c3e4..779aa3a67 100644 --- a/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-interprocess/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-interprocess", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-interval/portfile.cmake b/external_imported/vcpkg/ports/boost-interval/portfile.cmake index 9388382e2..d6e92adf8 100644 --- a/external_imported/vcpkg/ports/boost-interval/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.78.0 - SHA512 8de185456a462e76a73b01b016e71ab4586a2676cbaaa666e52dbddd37341a6ba313bd51814f3d2bb22541c4cc067626b3d3c8346a02e7a0a38d6cae6cc59f80 + REF boost-1.80.0 + SHA512 16bafe92e11ac15ec08b7c7ecdf8456fd898f469b2f15970806bd0c4aff48e77b3392574e57d3e4c812f5e6afa1a4156a64a1650bc89e4e43af618ed7c95e267 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-interval/vcpkg.json b/external_imported/vcpkg/ports/boost-interval/vcpkg.json index 7d7f46270..54e204b52 100644 --- a/external_imported/vcpkg/ports/boost-interval/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-interval/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-interval", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-detail", diff --git a/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake b/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake index 598bc3786..344b582c2 100644 --- a/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.78.0 - SHA512 8a9431af2346348c0981d296f5bf9126833d6831c50fee91c85b3bcafd117d9b39454837a40a3aca4385ebf1d59b795ea7ee8a5c0a6c8adbfe3f3de8a2e805d4 + REF boost-1.80.0 + SHA512 b13c07d16117b2151a495bc02520ff198f5953a8b70e7757ddb727550f44822fbacda42072489f6f83d180312f628acade3a063abfa2b97cafd6d3d05de84726 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json b/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json index bd09c4b4b..7657b72de 100644 --- a/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-intrusive/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-intrusive", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-io/portfile.cmake b/external_imported/vcpkg/ports/boost-io/portfile.cmake index cca5ca4e5..ccf419543 100644 --- a/external_imported/vcpkg/ports/boost-io/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.78.0 - SHA512 349333ed588658ed631a615a62808757216a09931fc1f4cb2ced9f7e8d5206fbe44fb29015f623dd174f6b743427ad6df6e69463b281b9824d29581736b1d658 + REF boost-1.80.0 + SHA512 9c37f72be450ca0fac5e10540732f43779665d9b03a90ad5a9abaca558fec40f62ca04f2a41894131b0661220206c4e4bd93671a1e2a26747f3361adab2c51a5 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-io/vcpkg.json b/external_imported/vcpkg/ports/boost-io/vcpkg.json index d3bb556c1..b8d2db6be 100644 --- a/external_imported/vcpkg/ports/boost-io/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-io/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-io", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake b/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake index 3160968ab..aefe2ccca 100644 --- a/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-iostreams/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.78.0 - SHA512 ad766d5b922bf959480dbaaae80c82211118a11db2a1cc7790ac2885a9c2d85d883d320f6dc19a4cadb0d857398f4a21c173fd3ccf2ff2068718b32dc5cb67c1 + REF boost-1.80.0 + SHA512 861e6810cc5cb180aadea7980a3c8bd7ea5a0dfe1e45145debdbe1c5083d94e17f5c92cf9f4892ab391e7b531df1c00bebd07c814950b9ac9ffbff41bbc78a16 HEAD_REF master PATCHES Removeseekpos.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-iostreams requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json index 080cec0a1..5163061a2 100644 --- a/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-iostreams/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-iostreams", - "version": "1.78.0", - "port-version": 2, + "version": "1.80.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/boost-iterator/portfile.cmake b/external_imported/vcpkg/ports/boost-iterator/portfile.cmake index 6d970bfd3..2af94bf81 100644 --- a/external_imported/vcpkg/ports/boost-iterator/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.78.0 - SHA512 a6cea7025926b9482e3e0b0c19d9ba6d2bd2fe358c418d27b69ee8f9aa25204869f29412639242e244acb5eb5a7d5e79786d3bae649b1603f9123eeae16dc32b + REF boost-1.80.0 + SHA512 f8824624a5e635e3909638db74816291e871ae443934645cfa38a0682547923c1daa11152a35de66704d7da54d952e652cefef504de05fba9608fe100aeaf572 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-iterator/vcpkg.json b/external_imported/vcpkg/ports/boost-iterator/vcpkg.json index a98590423..e06cbde67 100644 --- a/external_imported/vcpkg/ports/boost-iterator/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-iterator/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-iterator", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-concept-check", diff --git a/external_imported/vcpkg/ports/boost-json/portfile.cmake b/external_imported/vcpkg/ports/boost-json/portfile.cmake index 3e8c8f3a7..cc6cf3d40 100644 --- a/external_imported/vcpkg/ports/boost-json/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-json/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.78.0 - SHA512 245eb006392cea71fc4da0100a804cff0f4f0a63baf5e4d95ea3b8234a8b2a72344090ccf827a6334fe1819dc207d84a2c1709c62f71361a8e8824d84a51edab + REF boost-1.80.0 + SHA512 cf18af252ef10e07c008cd360df9bd7683758bb53b401f01a37378e4c82d95f743f1a10af0aed9a9f60d3ca64469af4c2fa03ff7ac1b3b693237bc1fefd0aec6 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-json/vcpkg.json b/external_imported/vcpkg/ports/boost-json/vcpkg.json index 28efe2fca..59c5287cd 100644 --- a/external_imported/vcpkg/ports/boost-json/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-json/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-json", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-assert", @@ -12,7 +13,7 @@ }, "boost-config", "boost-container", - "boost-exception", + "boost-core", { "name": "boost-modular-build-helper", "host": true @@ -20,7 +21,6 @@ "boost-mp11", "boost-system", "boost-throw-exception", - "boost-utility", "boost-vcpkg-helpers", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/boost-lambda/portfile.cmake b/external_imported/vcpkg/ports/boost-lambda/portfile.cmake index 28adb4a18..309c39258 100644 --- a/external_imported/vcpkg/ports/boost-lambda/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.78.0 - SHA512 b3d923435133ba4bcffd0fb722d92ccf4f7b739a51390319db10ac43452141c1d786755ae143149102324548d4beb7e87e5767381b93cc814593ce9123f2dffb + REF boost-1.80.0 + SHA512 ca572e0d76260a7ffdad33ee3eaf9924c8ff275fbce54747f11358a439a2e6f5e9b968aea8d365ff448924d91c3247319d190cdccd832b7efa5f4484b4e09ba8 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-lambda/vcpkg.json b/external_imported/vcpkg/ports/boost-lambda/vcpkg.json index 3687066be..c51fcb2b8 100644 --- a/external_imported/vcpkg/ports/boost-lambda/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-lambda/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lambda", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", + "license": "BSL-1.0", "dependencies": [ "boost-bind", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake b/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake index 43c1d15af..e49ae6b65 100644 --- a/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-lambda2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda2 - REF boost-1.78.0 - SHA512 56c8e14dea12e32d8b049c6de2c5ed4ea299b169fc43d76c65aa1057dc5cad9e1182fdf9761381855c3b940ed4e34a794ea8aeca11fde116bc25c4ae1065cc58 + REF boost-1.80.0 + SHA512 1e3e11c4cbc0a926ada538382ab78ad0b81719cf2bb418a0962474fc5714fa9aef380f766495c76285ad425078912b4752cbbea8965d1b206878be9c0e3ebd8b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json b/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json index 068794a93..9c8e2d348 100644 --- a/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-lambda2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lambda2", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-leaf/portfile.cmake b/external_imported/vcpkg/ports/boost-leaf/portfile.cmake index 1159bbf45..a08e9fe2a 100644 --- a/external_imported/vcpkg/ports/boost-leaf/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.78.0 - SHA512 07f15896fe8dd1029aefe2988c82b688243b11f344fafe7ad80a93e70e75c7b35083d1a84944bc564aa591a086f20dfcb4010fc701b1e6780f93ac2dd5701c6b + REF boost-1.80.0 + SHA512 ec43985c02e6353d101309b829948f3e7c2dc1044e4f09f3de36404c8e196b65a98218943b427f1a2b5849aed1f756493b550834de3704ac0fc1d5899a8ff555 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-leaf/vcpkg.json b/external_imported/vcpkg/ports/boost-leaf/vcpkg.json index a4f670c4f..6737d50a5 100644 --- a/external_imported/vcpkg/ports/boost-leaf/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-leaf/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-leaf", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake b/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake index 40c528853..97a20dd36 100644 --- a/external_imported/vcpkg/ports/boost-lexical-cast/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 01b544b29f8c4e7de7cb1f4d11835bf4c434fd65fa48983794cd4ec2847d3fc12692722025177552b4653f213d033811bafecf64ce3572885ea7cf522ab3f406 + REF boost-1.80.0 + SHA512 b708917e7f5cc3c1cfde0856233a4ba8d3d717006d8cee1c3c7522b2b713b7a8a170de1e87e2b55cee412ec904d64d54333a64ef8ee10ac2cbad7a73b62ff173 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json b/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json index 7da42431e..f646ae2a7 100644 --- a/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-lexical-cast/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lexical-cast", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-local-function/portfile.cmake b/external_imported/vcpkg/ports/boost-local-function/portfile.cmake index 3c44ceac6..e40649d3d 100644 --- a/external_imported/vcpkg/ports/boost-local-function/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 4df1e13e9314dc31fabd2e0451e09a69b6f976efa41b2fae87766bb9ba271ab47604f15ae138c694b8e15ea51289ca8c2e882179ca55b9abd904bd166b0bd2b4 + REF boost-1.80.0 + SHA512 a5dbb5b849003b47a7e7595db427a59aa80ec1e1ff15aea9b4d18bfc82570201097ab91edee28de5610e720ea265bddd256bb86a5c91f26695a6b57813b15c0b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-local-function/vcpkg.json b/external_imported/vcpkg/ports/boost-local-function/vcpkg.json index a54f88961..b075bbf7a 100644 --- a/external_imported/vcpkg/ports/boost-local-function/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-local-function/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-local-function", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-mpl", diff --git a/external_imported/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch b/external_imported/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch deleted file mode 100644 index 134cb81a1..000000000 --- a/external_imported/vcpkg/ports/boost-locale/allow-force-finding-iconv.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 -index 88a8cb1..e6a6b7f 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -17,6 +17,7 @@ import feature ; - # Features - - feature.feature boost.locale.iconv : on off : optional propagated ; -+feature.feature boost.locale.force-found-iconv : on off : optional propagated ; - feature.feature boost.locale.icu : on off : optional propagated ; - feature.feature boost.locale.posix : on off : optional propagated ; - feature.feature boost.locale.std : on off : optional propagated ; -@@ -164,6 +164,11 @@ local flags-result ; - - local found-iconv ; - -+ if on in $(properties) -+ { -+ found-iconv = true ; -+ } -+ - if on in $(properties) - || ! in $(properties:G) - && ! solaris in $(properties) diff --git a/external_imported/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch b/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch similarity index 52% rename from external_imported/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch rename to external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch index cd02f742e..95e77f5ce 100644 --- a/external_imported/vcpkg/ports/boost-locale/0001-Fix-boost-ICU-support.patch +++ b/external_imported/vcpkg/ports/boost-locale/fix-dependencies.patch @@ -1,37 +1,43 @@ ---- - libs/locale/build/Jamfile.v2 | 63 ++++++-------------------------------- - libs/locale/build/has_icu_test.cpp | 4 --- - libs/regex/build/Jamfile.v2 | 47 +++++++--------------------- - 3 files changed, 20 insertions(+), 94 deletions(-) + build/Jamfile.v2 | 69 +++++++++++--------------------------------------- + build/has_icu_test.cpp | 4 --- + 2 files changed, 15 insertions(+), 58 deletions(-) -diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 -index 578e722..5f25917 100644 +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index 450ec87..653f592 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 -@@ -70,62 +70,17 @@ if $(ICU_LINK) - } - else +@@ -20,6 +20,7 @@ project /boost/locale + # Features + + feature.feature boost.locale.iconv : on off : optional propagated ; ++feature.feature boost.locale.force-found-iconv : on off : optional propagated ; + feature.feature boost.locale.icu : on off : optional propagated ; + feature.feature boost.locale.posix : on off : optional propagated ; + feature.feature boost.locale.std : on off : optional propagated ; +@@ -86,62 +87,17 @@ if $(ICU_LINK) + ICU64_OPTS = $(icu-path)/include $(ICU_LINK) $(icu-path)/bin64 shared ; + } else { - searched-lib icuuc : : icuuc -- $(ICU_PATH)/lib -- shared +- $(icu-path)/lib +- shared - shared ; - - searched-lib icuuc : : msvc - debug - icuucd -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - - searched-lib icuuc : : this_is_an_invalid_library_name ; - -- searched-lib icudt : : $(ICU_PATH)/lib +- searched-lib icudt : : $(icu-path)/lib - icudata - shared - shared ; - -- searched-lib icudt : : $(ICU_PATH)/lib +- searched-lib icudt : : $(icu-path)/lib - icudt - msvc - shared @@ -39,7 +45,7 @@ index 578e722..5f25917 100644 - - searched-lib icudt : : this_is_an_invalid_library_name ; - -- searched-lib icuin : : $(ICU_PATH)/lib +- searched-lib icuin : : $(icu-path)/lib - icui18n - shared - shared ; @@ -47,14 +53,14 @@ index 578e722..5f25917 100644 - searched-lib icuin : : msvc - debug - icuind -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - - searched-lib icuin : : msvc - release - icuin -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - @@ -67,24 +73,36 @@ index 578e722..5f25917 100644 + + explicit icuuc icuin icudt ; - ICU_OPTS = $(ICU_PATH)/include -- icuuc/shared/shared -- icudt/shared/shared + ICU_OPTS = $(icu-path)/include +- icuuc/shared/shared +- icudt/shared/shared - icuin/shared/shared -- $(ICU_PATH)/bin +- $(icu-path)/bin - shared ; + icuuc + icuin + icudt -+ $(ICU_PATH)/bin ; ++ $(icu-path)/bin ; + +@@ -221,6 +177,11 @@ rule configure-full ( properties * : flags-only ) -diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp -index 9419b30..ed9be05 100644 + local found-iconv ; + ++ if on in $(properties) ++ { ++ found-iconv = true ; ++ } ++ + # The system Iconv on Solaris may have bugs, while the GNU Iconv is fine. + # So enable by default only if not on Solaris. + if on in $(properties) +diff --git a/build/has_icu_test.cpp b/build/has_icu_test.cpp +index 344c8ea..f200bce 100644 --- a/build/has_icu_test.cpp +++ b/build/has_icu_test.cpp -@@ -15,10 +15,6 @@ +@@ -9,10 +9,6 @@ #include #include @@ -95,6 +113,3 @@ index 9419b30..ed9be05 100644 int main() { icu::Locale loc; --- -2.12.2.windows.2 - diff --git a/external_imported/vcpkg/ports/boost-locale/portfile.cmake b/external_imported/vcpkg/ports/boost-locale/portfile.cmake index f20b77334..0b62dc038 100644 --- a/external_imported/vcpkg/ports/boost-locale/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-locale/portfile.cmake @@ -3,17 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.78.0 - SHA512 17870d13898fe1c8df3958757aba81f385924ee063e9f92f821ced912346b89d106b2256d659239323efba125ecd8507a8f3fbc326285cc243befdab5dcaf72d + REF boost-1.80.0 + SHA512 b05bdef8bc0f1f1c1183ce97394e008d69ff316e934570dfb50fef49503d7c4dba8e3d742a701b70d8df21559a577b5f114714214ef8974ada36796c221a2d32 HEAD_REF master - PATCHES - 0001-Fix-boost-ICU-support.patch - allow-force-finding-iconv.patch + PATCHES fix-dependencies.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-locale requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) configure_file( "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in" diff --git a/external_imported/vcpkg/ports/boost-locale/vcpkg.json b/external_imported/vcpkg/ports/boost-locale/vcpkg.json index 47c2adc8f..62aad6d2c 100644 --- a/external_imported/vcpkg/ports/boost-locale/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-locale/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-locale", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", @@ -11,12 +12,14 @@ "host": true }, "boost-config", + "boost-core", "boost-function", "boost-iterator", { "name": "boost-modular-build-helper", "host": true }, + "boost-predef", "boost-smart-ptr", "boost-static-assert", "boost-thread", diff --git a/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake b/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake index b71418373..b2b40a153 100644 --- a/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.78.0 - SHA512 f0e56532c369dcf9adb20ea1da6f647d083a67aea067109d7743e5eb4d26ebe2b21b8e2b131265db03f8155845d6948197acfbecb2da41f9f54c11f80e078ba9 + REF boost-1.80.0 + SHA512 18d1af8881ec9c043a877c633af4f5750ddd867d49c2f801dd69561514ea3590923739b0897c1d46fc34d5cadfb07e4a3f5e29326c858a6ad42047bab1c21685 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json b/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json index 65fb1c896..8a3925418 100644 --- a/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-lockfree/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-lockfree", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", + "license": "BSL-1.0", "dependencies": [ "boost-align", "boost-array", diff --git a/external_imported/vcpkg/ports/boost-log/portfile.cmake b/external_imported/vcpkg/ports/boost-log/portfile.cmake index f3d3e8da8..36fcdf960 100644 --- a/external_imported/vcpkg/ports/boost-log/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.78.0 - SHA512 86f2c99647236f49a8a18a10a3c4a7409f15e5d5cdf8f925a7bd87a7eb196d3c53595b7ddc7fd56354181d5b7c433645f3ee349db59d5b971583166366550613 + REF boost-1.80.0 + SHA512 1538ce8d2a37b93d4d091b5da3a6937ac47fca084132d622d06938157b5d9f6b6ecf877677145531855b76479643b33a3401a1f15723aa85fda71543451d0c4b HEAD_REF master ) @@ -12,17 +12,11 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") - -file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-log requires a newer version of vcpkg in order to build.") -endif() +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-log/vcpkg.json b/external_imported/vcpkg/ports/boost-log/vcpkg.json index 131e173ab..2674c1c90 100644 --- a/external_imported/vcpkg/ports/boost-log/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-log/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-log", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", + "license": "BSL-1.0", "supports": "!uwp & !emscripten", "dependencies": [ "boost-align", diff --git a/external_imported/vcpkg/ports/boost-logic/portfile.cmake b/external_imported/vcpkg/ports/boost-logic/portfile.cmake index c51df0518..9e2cfa83a 100644 --- a/external_imported/vcpkg/ports/boost-logic/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.78.0 - SHA512 0f190c66e1f6ae30173c95db14c7a4373ffc55d3f48a0c54a1814e222b1cba05cf6668e6d90a780506dfa40b5060c0c0c1a4a0c76929fb420770d2134a8cbcd0 + REF boost-1.80.0 + SHA512 17c9a38212bc851bef2ab43db1c7027b51d4726bcb8225bdcdc52a84872b3e40e0f37722b9b10840116f200135dd80d850085caf9b70b8fbf2ae2fc99882cbde HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-logic/vcpkg.json b/external_imported/vcpkg/ports/boost-logic/vcpkg.json index fd1fc2c52..38c7419a8 100644 --- a/external_imported/vcpkg/ports/boost-logic/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-logic/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-logic", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-math/portfile.cmake b/external_imported/vcpkg/ports/boost-math/portfile.cmake index 668a22fa8..f8098aa83 100644 --- a/external_imported/vcpkg/ports/boost-math/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-math/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.78.0 - SHA512 a5de0dfddca56ef67c750db55d103e41822ae3823c023f884211a1d993ebd4a35cceab024b405e48f51acc7f2ae7d1e97aa7e4c603eca929027b62ca2d234ff9 + REF boost-1.80.0 + SHA512 980dd906951ea835433d87b6c8c7828483146ed1e6061af9671008cca0d9acd014795c5eb8297469171fe8d192b46c33f8d18a0d25608fa5b835c19d10eb8390 HEAD_REF master PATCHES 001-remove-checks.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-math/vcpkg.json b/external_imported/vcpkg/ports/boost-math/vcpkg.json index 86a66c666..177272c87 100644 --- a/external_imported/vcpkg/ports/boost-math/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-math/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-math", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake b/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake index 23eaea290..05ed9875d 100644 --- a/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.78.0 - SHA512 d068680be7609e3a9c87f8c027373eb68fe3c212944fe63369bca94842fd8ceb032a43a455a93248bf5578170acdb76c99aa1d04abc53901636d8e74c261755c + REF boost-1.80.0 + SHA512 7f6e6acedf2896f03d3d7b3557fe58f1fedee44e318cbf8b513eae79cb4c0ad99b8ac3cd6838c1c0d25ba28a291fdda766a76753f940e3a271c9af58e639f503 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json b/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json index 41ccb8944..2d8830463 100644 --- a/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-metaparse/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-metaparse", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-mpl", diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt b/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt index 368c60174..a222f165c 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/CMakeLists.txt @@ -9,7 +9,7 @@ set(USER_CONFIG_TOOLSET_OPTIONS "") set(USER_CONFIG_EXTRA_LINES "") set(USER_CONFIG_REQUIREMENTS "") -set(B2_OPTIONS) +set(B2_OPTIONS "") include("${VCPKG_CMAKE_VARS_FILE}") @@ -38,6 +38,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STR list(APPEND B2_OPTIONS architecture=arm) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") list(APPEND B2_OPTIONS architecture=power) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") + list(APPEND B2_OPTIONS architecture=loongarch) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips64") + list(APPEND B2_OPTIONS architecture=mips64) +elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE) + list(APPEND B2_OPTIONS architecture=arm+x86) else() list(APPEND B2_OPTIONS architecture=x86) endif() @@ -66,9 +72,15 @@ endif() if(WIN32) list(APPEND B2_OPTIONS target-os=windows) elseif(APPLE) - list(APPEND B2_OPTIONS target-os=darwin) + if(IOS) + list(APPEND B2_OPTIONS target-os=iphone) + else() + list(APPEND B2_OPTIONS target-os=darwin) + endif() elseif(ANDROID) list(APPEND B2_OPTIONS target-os=android) +elseif(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND B2_OPTIONS target-os=freebsd) else() list(APPEND B2_OPTIONS target-os=linux) endif() @@ -96,12 +108,9 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(TRANSFORM libpath_args PREPEND "/AI\"") list(TRANSFORM libpath_args APPEND "\"") list(JOIN libpath_args " " libpath_arg) - - string(APPEND CXXFLAGS " /ZW") string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") - string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) - list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) + list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) # TODO: Fix this; Probably should use a VCPKG_DETECTED_ variable and also be applied in the !store case endif() set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") @@ -112,10 +121,23 @@ string(APPEND CFLAGS "${COMPILEFLAGS}") foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) string(REPLACE [[\]] [[\\]] ${var} "${${var}}") string(REPLACE [["]] [[\"]] ${var} "${${var}}") + if(WIN32) + # env variables need extra %%var%% to be not expanded early + string(REGEX REPLACE [[(%[^%]+%)]] [[%\1%]] ${var} "${${var}}") + # remove PDB flag, until the pdb install rule of boost-build can be deactivated. + string(REGEX REPLACE "-PDB:[^ ]+" "" ${var} "${${var}}") + endif() string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") string(STRIP "${${var}}" ${var}) endforeach() +if(CFLAGS MATCHES "-Zi" OR CXXFLAGS MATCHES "-Zi") + list(APPEND B2_OPTIONS + debug-store=database + pch=off + ) +endif() + if(USER_CONFIG_TOOLSET STREQUAL "msvc") file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) string(APPEND USER_CONFIG_TOOLSET_OPTIONS @@ -205,6 +227,15 @@ if(WITH_PYTHON3) list(APPEND python_versions "${python3_version}") endif() +if(NOT python_versions STREQUAL "") + list(JOIN python_versions "," python_versions) + list(APPEND B2_OPTIONS "python=${python_versions}") + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS "python-debugging=on") + endif() +endif() + if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") string(APPEND USER_CONFIG_EXTRA_LINES "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" @@ -221,11 +252,6 @@ if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") endif() endif() -if(NOT python_versions STREQUAL "") - list(JOIN python_versions "," python_versions) - list(APPEND B2_OPTIONS "python=${python_versions}") -endif() - # Include port specific CMake fragment if(DEFINED BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake b/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake index 344deb615..416e431d2 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -1,10 +1,11 @@ include_guard(GLOBAL) include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") 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.78.0) +set(BOOST_VERSION 1.80.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}") @@ -153,6 +154,7 @@ function(boost_modular_build) string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs + string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries diff --git a/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json b/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json index a70e22280..8b1db10f6 100644 --- a/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-modular-build-helper/vcpkg.json @@ -1,11 +1,18 @@ { "name": "boost-modular-build-helper", - "version": "1.78.0", - "port-version": 3, + "version": "1.80.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ "boost-uninstall", - "vcpkg-cmake" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/boost-move/portfile.cmake b/external_imported/vcpkg/ports/boost-move/portfile.cmake index 3bed2eb82..7181de3f7 100644 --- a/external_imported/vcpkg/ports/boost-move/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.78.0 - SHA512 e17ceeaf96375e2fed7ad8be88970cdcb9b94ff3e101bdf4291ef48bf64485da3c1b7449f77881a7a757a9f5a81568cb387733e1b1b3c66f99058db1487e7554 + REF boost-1.80.0 + SHA512 66c2d25f6ee2a17bf378ee000bf367341aa6f11bfc0c029aee53501b77aa37b503393048071f8f96a6b528202954f448d50e166c96cb494fc7914ff5fae65bc3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-move/vcpkg.json b/external_imported/vcpkg/ports/boost-move/vcpkg.json index 513b88ea0..9c1e9bd84 100644 --- a/external_imported/vcpkg/ports/boost-move/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-move/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-move", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-mp11/portfile.cmake b/external_imported/vcpkg/ports/boost-mp11/portfile.cmake index a8d399799..d587c38be 100644 --- a/external_imported/vcpkg/ports/boost-mp11/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.78.0 - SHA512 e98ca08ffa766760f20f3e94a97cfe82a024c4a3ed7d1101e2a5a790c9d50dc19d83a2a9a934432f452c2746de1a8fb81c105e379703c4e2be745ef697c38a42 + REF boost-1.80.0 + SHA512 bc7e7d9d8d6e48fc367d9680ccb230ee31b6a1a54d8ac5ef4d421ce47227d5a0f4170a0e1ca44eff6df7d3bf960775a8371543f1391ee47747f4c22e5565db6a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-mp11/vcpkg.json b/external_imported/vcpkg/ports/boost-mp11/vcpkg.json index 77700e66b..6c916e041 100644 --- a/external_imported/vcpkg/ports/boost-mp11/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-mp11/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mp11", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-mpi/portfile.cmake b/external_imported/vcpkg/ports/boost-mpi/portfile.cmake index 628897c5a..2881fa531 100644 --- a/external_imported/vcpkg/ports/boost-mpi/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-mpi/portfile.cmake @@ -3,15 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.78.0 - SHA512 22037c92eb0f2a8e26b39637003b0b470d1e34f85cb6c83cb6d63d84ff9b57adcf172ff4ecf86a30d07bd89f422a4b39eb12a7e5940648f6ebb2b7af66a00f2e + REF boost-1.80.0 + SHA512 76d93705a76a7e1e805d48106dd7cb53850db635af70f3c76f0cdb5c86ab417e1433713d5e30431ddfc92f77e89b9cbee6b312949caec88f8586e8a43ecf2962 HEAD_REF master PATCHES fix-build-boost_mpi_python-on-windows.patch ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-mpi requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-mpi/vcpkg.json b/external_imported/vcpkg/ports/boost-mpi/vcpkg.json index 8e0512dc9..0e9ec4abf 100644 --- a/external_imported/vcpkg/ports/boost-mpi/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mpi", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-mpl/portfile.cmake b/external_imported/vcpkg/ports/boost-mpl/portfile.cmake index 4f454995b..1688bf7c9 100644 --- a/external_imported/vcpkg/ports/boost-mpl/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.78.0 - SHA512 0aa3d20b10f5a4a655d07499372ac74114458a6209dc536a3a061e13683a12c98c9b129e3e5d103d95773fcf14afc6f94ac82ddb84d21dee55338bb5bbf2a47f + REF boost-1.80.0 + SHA512 83b34d01ef1e45c9a71324eaf07b897ea1d4848ab8259c54f1227e16690ac399155f7791fff51063521ba62adee8ca97f77956d526461c80f77bfe1467bba293 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-mpl/vcpkg.json b/external_imported/vcpkg/ports/boost-mpl/vcpkg.json index 5677301d2..5f6d8b13c 100644 --- a/external_imported/vcpkg/ports/boost-mpl/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-mpl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mpl", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-msm/portfile.cmake b/external_imported/vcpkg/ports/boost-msm/portfile.cmake index 159e23fa2..572e4fe4c 100644 --- a/external_imported/vcpkg/ports/boost-msm/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.78.0 - SHA512 0cc80428548b5fbde38efd8426bca954205e26ea2b9da1d9c682cd9315b298759c8db0540d0e216ff57bd613cebe9317764b2b52d24143ebee6c1eb080908eb1 + REF boost-1.80.0 + SHA512 52e7e59d54d108a260c059f5e668b802fb0535fdeab9e0d7901eae626ab4a3b785b4e0b87694e0732993f9813f5af6f7566d20da1f503df207a1b98820cd9e8f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-msm/vcpkg.json b/external_imported/vcpkg/ports/boost-msm/vcpkg.json index 6c3e65a06..36d46c9ad 100644 --- a/external_imported/vcpkg/ports/boost-msm/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-msm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-msm", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake b/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake index e6e85919b..cd314f6a6 100644 --- a/external_imported/vcpkg/ports/boost-multi-array/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 835a43e508ef2b2e03ecc8268770eb2e523414406d0da34ab5fdedf65e65b0f6d3dcfa8efbd2f4ee226331a56cb977106d8bdf8f285aa36f9055017be5be080b + REF boost-1.80.0 + SHA512 5e66cd038dd9d86a04b1631ba11245e0fa6742ffa73b12a2b09093891f0c5ebb53844cc0c23acaece067dceea721a1f003360bc90c632e2eab90a5446359123a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json b/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json index 6ed7ba4f5..5c28d54eb 100644 --- a/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-multi-array/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multi-array", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake b/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake index 19dd38b06..e280407d2 100644 --- a/external_imported/vcpkg/ports/boost-multi-index/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 ea183d2e87d5d8655f96085ace78e8ee12678ae4603077773c658f6aa4d7bd86e1c120e0e0b6fef3b4fb42bf9ecbb79c4819c508eae4f5bf71c0ac6b50ec712a + REF boost-1.80.0 + SHA512 0a584c17acec728791b6094da407ed708fa81733910858310397d25473cfb0a0c8cf8dc702e5a3b5530483cc465c6578d0dc3fbee1e8af8cde2c2435c953d365 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json b/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json index 2b7da5ec7..232784b3e 100644 --- a/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-multi-index/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multi-index", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch b/external_imported/vcpkg/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch deleted file mode 100644 index 3f393ce11..000000000 --- a/external_imported/vcpkg/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e1ae1e4dc3d450e47693f3b190520b598f88fc60 Mon Sep 17 00:00:00 2001 -From: jzmaddock -Date: Sat, 18 Dec 2021 16:58:47 +0000 -Subject: [PATCH] Fix selection logic in intel_intrinsics.hpp To correctly - exclude msvc+arm. Fixes https://github.com/boostorg/multiprecision/issues/405 - ---- - include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -index fcfacef1..eb4624bb 100644 ---- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp -@@ -31,9 +31,9 @@ - #undef BOOST_MP_HAS_IMMINTRIN_H - #endif - --#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_ARM64) && !defined(_M_X64) -+#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_X64) && !defined(_M_AMD64) - // --// When targeting platforms such as ARM, msvc still has the INtel headers in it's include path -+// When targeting platforms such as ARM, msvc still has the Intel headers in it's include path - // even though they're not usable. See https://github.com/boostorg/multiprecision/issues/321 - // - #undef BOOST_MP_HAS_IMMINTRIN_H --- -2.34.1.windows.1 - diff --git a/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake b/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake index 1169ef02f..0a69f07c0 100644 --- a/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-multiprecision/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.78.0 - SHA512 eef97b9a53e85e921d29dcea521ba8f751d71f03782d53eda345628d1ba400b83c7f656f41340128ded0a54a6d7955b1493cdca3804bea586158aa28b02fc941 + REF boost-1.80.0 + SHA512 b444a29f9f6d8739ab2f9b73c16c2e74556a8c2d92837d7fc4b0c5bad68479381411bfdc43247643560b5b6ec8645f4c452ffddffc035350aaf40dc081f6ff81 HEAD_REF master - PATCHES 0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json b/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json index 6ab23e879..2a0884b2a 100644 --- a/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-multiprecision/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-multiprecision", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", @@ -12,6 +13,7 @@ "boost-math", "boost-predef", "boost-random", + "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/external_imported/vcpkg/ports/boost-nowide/portfile.cmake b/external_imported/vcpkg/ports/boost-nowide/portfile.cmake index e5520a7ed..06cff6e68 100644 --- a/external_imported/vcpkg/ports/boost-nowide/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-nowide/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.78.0 - SHA512 115ec3a2c98e316ecc1c657467c79cdddb28a07181929d3ac496db34f1b29faad460dfd47d98f110374534f2257db4b52088ed234ff1feeabff15a52ff525426 + REF boost-1.80.0 + SHA512 9f9c1cb3586a9c780ead2059b19257697151729a90afa7f3f58ce887f8a4c3a312a0b3c6929eb9a94e9c85bfcde0f7d6f417b8b613badb92a2423707a717e805 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-nowide requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-nowide/vcpkg.json b/external_imported/vcpkg/ports/boost-nowide/vcpkg.json index 00befbddf..05346e5fd 100644 --- a/external_imported/vcpkg/ports/boost-nowide/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-nowide/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-nowide", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", + "license": "BSL-1.0", "dependencies": [ { "name": "boost-build", diff --git a/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake b/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake index ab35aa1ac..90a16361b 100644 --- a/external_imported/vcpkg/ports/boost-numeric-conversion/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 de22f330cfa890c2633f021500b1e6ad5836c93905bd6d228bb60acf52fde94783a7594d4722dfd645a957f5a1868f5e71510f7e359e0167bcc7b2161a369de7 + REF boost-1.80.0 + SHA512 88013af11aa4b7eff97a905884d1afd2ca91bff990946f3a23bc7237dc7ea9f85ebdedc19aabf733d09d8a9662f57d89f2f1dcac83a4bd68b423f0c8144154f2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json b/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json index 2018aa801..de06b6e71 100644 --- a/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-numeric-conversion/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-numeric-conversion", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-conversion", diff --git a/external_imported/vcpkg/ports/boost-odeint/portfile.cmake b/external_imported/vcpkg/ports/boost-odeint/portfile.cmake index 573353f41..3b8103fc7 100644 --- a/external_imported/vcpkg/ports/boost-odeint/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.78.0 - SHA512 780e08bc8f36e3d6cb3c98dff10ae9c35f84ad468a9358d95238a08475c3091c7ed44d5b76067cc0a6db5ec1c364f3bc43ab58bd120e110353d6f39115022d93 + REF boost-1.80.0 + SHA512 9bcebd443556e3d122e4474b728b277d801195adc26ba4e82ee6609c6bd1c902b1a6220d8d5c3856be2daf04b86dc0a56d4bd2d56ae1a17dd88a50b6fa5f97f3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-odeint/vcpkg.json b/external_imported/vcpkg/ports/boost-odeint/vcpkg.json index ef06fbd44..55f2f09c8 100644 --- a/external_imported/vcpkg/ports/boost-odeint/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-odeint/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-odeint", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-optional/portfile.cmake b/external_imported/vcpkg/ports/boost-optional/portfile.cmake index 3f42b4584..58e1b1467 100644 --- a/external_imported/vcpkg/ports/boost-optional/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.78.0 - SHA512 490eadd8017595a5c019da8c0c3b0e2569829d58ab31b2b575a2bbf9f218b9fc7aa42dcec3f6e9178ca10c438966889bbd77bb6013bf749bde9ba49e7fba2d97 + REF boost-1.80.0 + SHA512 87934f110311e329ec7d08f6a16d17feb1e550bba2b66d261e04d9a367136e3067fedd5ecf8abd19fb68876b7bad95cbd2b731a15f786063fe50b51066ff8870 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-optional/vcpkg.json b/external_imported/vcpkg/ports/boost-optional/vcpkg.json index 488c98847..b6f18feaf 100644 --- a/external_imported/vcpkg/ports/boost-optional/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-optional/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-optional", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-outcome/portfile.cmake b/external_imported/vcpkg/ports/boost-outcome/portfile.cmake index 3749fb302..3ce82b566 100644 --- a/external_imported/vcpkg/ports/boost-outcome/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.78.0 - SHA512 39ed3377a61c72fcc30256359988df54370423c54bb2586e9e0d6a42157c1825828a0fb710ccc1b2c44a9cc93baae2a33f30fd5a86e4c759f0902081aa65fc64 + REF boost-1.80.0 + SHA512 0ee69623ddfda236dee7c6a07ed251cc5a2e17523078fd4006a5fd46a06e670fdfe833ab48bc46f4859144b42ce8da269d5ea941094e2eb5207ea1533939ae26 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-outcome/vcpkg.json b/external_imported/vcpkg/ports/boost-outcome/vcpkg.json index eeea24f3a..4df2807e5 100644 --- a/external_imported/vcpkg/ports/boost-outcome/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-outcome/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-outcome", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-exception", diff --git a/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake b/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake index bb0f0cd74..e9ffb81cc 100644 --- a/external_imported/vcpkg/ports/boost-parameter-python/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 137929b7e257ace791e4b8a27ea481db986d7e47d1e105369bd44dacf6886c8b04cf7f95cb2cbe640e58e50fa33dd16df95034bf56a021ea8aad6a02e171db05 + REF boost-1.80.0 + SHA512 377deeba670b75f36601e6e9754c6ed9a2f68e5873314b1a13eca1ccd6f5a5865256429c316963b8ee7208462492d481467580d846359f886c854acbd7f42ccc HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json b/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json index e2a22c6e7..f14880a6b 100644 --- a/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-parameter-python/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-parameter-python", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-mpl", diff --git a/external_imported/vcpkg/ports/boost-parameter/portfile.cmake b/external_imported/vcpkg/ports/boost-parameter/portfile.cmake index caa8be6f0..b48b8b057 100644 --- a/external_imported/vcpkg/ports/boost-parameter/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.78.0 - SHA512 9e524ed3627852962b6a7a8dd324341b1ef181aac5300e78065846ee20dc110cdcfab348e02050d4cd82ff800ef361c980a1b3c95da2c24372aedb581fe8478d + REF boost-1.80.0 + SHA512 492718a20f284c9b509efad0acdf4522daad0d2b9128578ea38c98f2386f93bd33a5f5b3cb866bc95af831020909ccc0d1760478796f7517339b66b95cdfc0ef HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-parameter/vcpkg.json b/external_imported/vcpkg/ports/boost-parameter/vcpkg.json index 9f89bcee1..5a3208a26 100644 --- a/external_imported/vcpkg/ports/boost-parameter/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-parameter/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-parameter", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-pfr/portfile.cmake b/external_imported/vcpkg/ports/boost-pfr/portfile.cmake index 31215172c..e9d96e978 100644 --- a/external_imported/vcpkg/ports/boost-pfr/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.78.0 - SHA512 0c333e25cb63e94b8119341ffe74b805373818e46a5048662152c3c8b23ad19c1efc16c8700a9efcb029b295cf7e853d4f3fd561b6d8569177b1a9d14dd1ddf3 + REF boost-1.80.0 + SHA512 f0c8f70730c41beb1a940172f53cb394146da4b3e3e8c6a0ed15162747254392743c9bc65bd73e96926bae92414f135c4e0d88760e587279227947289e902b51 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-pfr/vcpkg.json b/external_imported/vcpkg/ports/boost-pfr/vcpkg.json index 1007cd64d..ee1d43a12 100644 --- a/external_imported/vcpkg/ports/boost-pfr/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-pfr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-pfr", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake b/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake index 878b8ed11..64cb1998d 100644 --- a/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.78.0 - SHA512 38d64222a205f76f94ca6822c9f67c41fad7001b0939548fdd725588cd0f95c0acbff64eb8ca93ca3184328d54d4b312bbf768237010ca20dff17c455589a9fc + REF boost-1.80.0 + SHA512 a8afd8d8318f9267cf4021de62d85332503a38b3f71ee6161f3b459e8fe890ab89813e99ac5d082b2dee7012797631b6641881d2964f5e964c6000ca02a13703 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json b/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json index 21f06c403..bc03303b3 100644 --- a/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-phoenix/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-phoenix", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake b/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake index a21f82832..37a267de7 100644 --- a/external_imported/vcpkg/ports/boost-poly-collection/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 24bdc5bcda3b2da29cf34bbf97e47a97881c0e68bbcdb432939f7d25adb5c2994e1a02e5105e2e4b34a9e78d03e70ba7dccaa20b9510601bc4a30b5b2d1e3ab3 + REF boost-1.80.0 + SHA512 fedd917078448e42e5ba6542acc32b2d5a19bdb70c1ed6e3345b799ce4d0bd6f630c073272d7b13bbbaf01bbf19073e0e31661fb5aba7a44585e3d1d35a22d91 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json b/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json index ff39ee3bf..6a43da7cf 100644 --- a/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-poly-collection/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-poly-collection", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-polygon/portfile.cmake b/external_imported/vcpkg/ports/boost-polygon/portfile.cmake index 3ea715734..99559dc93 100644 --- a/external_imported/vcpkg/ports/boost-polygon/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.78.0 - SHA512 9c03be93205e61b344493c5e40deeb59e42d4e47e45b27405c55b5bcdacbfc3a680400aa9c338440ef1fa6b366ffaab63e8a7a87ae2d6a9a7d3e135eb0bec7ad + REF boost-1.80.0 + SHA512 2b6751c422e9cbc5369389017dcf38f2c113ea321f2b534a40fed23ea12b5e8897e67780656525f72661e3514eb13918928f6697dac49e338433f53d5816d4f7 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-polygon/vcpkg.json b/external_imported/vcpkg/ports/boost-polygon/vcpkg.json index 6d1879080..1ce8e71fc 100644 --- a/external_imported/vcpkg/ports/boost-polygon/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-polygon/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-polygon", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-pool/portfile.cmake b/external_imported/vcpkg/ports/boost-pool/portfile.cmake index 826a97cdc..93ed3d715 100644 --- a/external_imported/vcpkg/ports/boost-pool/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.78.0 - SHA512 1cf8cd5659bf260f0bfc57c799bc37f8313e8420918c4b96ab8526caedca8ffe344bb7770d3c0c52b0ea421c360df038e1d5c1d2e882c8ab497996feb7d7d90e + REF boost-1.80.0 + SHA512 ba7b65256ae92a8fccfafa067bfeffa974c33a8258db89e1d2081bb98f8c8904611ddc7c3f381559b3af4518fdb3ae9554efed9bc9455fcd8eba83bf29137b67 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-pool/vcpkg.json b/external_imported/vcpkg/ports/boost-pool/vcpkg.json index c477485f6..396494d84 100644 --- a/external_imported/vcpkg/ports/boost-pool/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-pool/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-pool", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-predef/portfile.cmake b/external_imported/vcpkg/ports/boost-predef/portfile.cmake index 74a5a6c02..beaf0d8d5 100644 --- a/external_imported/vcpkg/ports/boost-predef/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.78.0 - SHA512 96755a174f94565485976663d92cbb9bc61e9ec669c678161144f9f2010d98ab9df8eb1bc1afa4a72aa2b39cf876a65a17afd41e221d08709cab2053756c42bf + REF boost-1.80.0 + SHA512 1435c629f69bcd36ba4a73da2854a11f5faaacf09bd715d0d4e2f87625e53761d4e047092a6d3b26ae3cf7d9e2dfffedaa427f9b92cc10f63bbecf9e6cd8e180 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-predef/vcpkg.json b/external_imported/vcpkg/ports/boost-predef/vcpkg.json index c18772814..20ba0b252 100644 --- a/external_imported/vcpkg/ports/boost-predef/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-predef/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-predef", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake b/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake index a9c84034c..58be5c261 100644 --- a/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.78.0 - SHA512 55bbc91f7745a66e1ac02e8cf151cd8e10c143f47fca3d8b65f2fb6caed232a6ed939b7344cffdc1d8ea49caa404d1043bde85efe9e0c17ee2c7cff055a9d657 + REF boost-1.80.0 + SHA512 01c1d2b77b1655364b34a224ef532ee4a8691f586e5ee99d34f9a2cda8624830573002ec812264a474eb174af3f19e9524cdabdd3de112ce8d1f3497e5596a52 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json b/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json index a3a1f0d7c..e449c7608 100644 --- a/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-preprocessor/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-preprocessor", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-process/fix_include.patch b/external_imported/vcpkg/ports/boost-process/fix_include.patch deleted file mode 100644 index 49d306918..000000000 --- a/external_imported/vcpkg/ports/boost-process/fix_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/boost/process/detail/traits/wchar_t.hpp b/include/boost/process/detail/traits/wchar_t.hpp -index 812a92c..98026d3 100644 ---- a/include/boost/process/detail/traits/wchar_t.hpp -+++ b/include/boost/process/detail/traits/wchar_t.hpp -@@ -12,6 +12,8 @@ - #include - #include - -+#include -+ - namespace boost { namespace process { namespace detail { - - //template diff --git a/external_imported/vcpkg/ports/boost-process/portfile.cmake b/external_imported/vcpkg/ports/boost-process/portfile.cmake index b8d41e445..45b979af3 100644 --- a/external_imported/vcpkg/ports/boost-process/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-process/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.78.0 - SHA512 c7fadf8771f73ae620176eb6404b06233485cf827eacdb7220d18d50950e5649b3e30ad6060ad2abe1b92913ec0e775cb00955237e4393597eefd18ab538f94b + REF boost-1.80.0 + SHA512 f4f394fbc9e10f6cb0cc87d60c607d045eec6603a9676f416cffe19835613acc824b2aaddd25e80f8f12f11de519620cfb07ace68b2a811e4e0a00f959f352e9 HEAD_REF master - PATCHES fix_include.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-process/vcpkg.json b/external_imported/vcpkg/ports/boost-process/vcpkg.json index 44253f3b5..e420f24f9 100644 --- a/external_imported/vcpkg/ports/boost-process/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-process/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-process", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", + "license": "BSL-1.0", "supports": "!emscripten", "dependencies": [ "boost-algorithm", @@ -14,12 +15,15 @@ "platform": "!uwp" }, "boost-fusion", + "boost-io", "boost-iterator", "boost-move", "boost-optional", "boost-system", + "boost-throw-exception", "boost-tokenizer", "boost-type-index", + "boost-utility", "boost-vcpkg-helpers", "boost-winapi" ] diff --git a/external_imported/vcpkg/ports/boost-program-options/portfile.cmake b/external_imported/vcpkg/ports/boost-program-options/portfile.cmake index 3402cb520..35413ec7f 100644 --- a/external_imported/vcpkg/ports/boost-program-options/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-program-options/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.78.0 - SHA512 485d09ab4281b6e13e500bb72d8e278a8bc68d70f90c008cf8970595828d2c3e8f5ae43a81440aca3aa6879a51491b2e1c10321eeea7aa689d71373c114e602e + REF boost-1.80.0 + SHA512 0f95b1d017793d5cb6ac05b0d28afad05fd2e1e64875a7c9f1f5082e9634106af0d6e82312590e24ef709f2584924e49759f11b91b6014e1e20d17d317266a33 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-program-options requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-program-options/vcpkg.json b/external_imported/vcpkg/ports/boost-program-options/vcpkg.json index 6c025d5a2..0b92e231b 100644 --- a/external_imported/vcpkg/ports/boost-program-options/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-program-options/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-program-options", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake b/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake index 7ba20d5e8..dde291335 100644 --- a/external_imported/vcpkg/ports/boost-property-map-parallel/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 f6c734ca16b19d249a6b6ee66348f9671ee1f3bbb3a33ac8872e236781ecd2139df4c8c77b7bca89c51df973ee84de254ae01c892770a5caa365571ab5e8e852 + REF boost-1.80.0 + SHA512 02427c033a1325e77106d5b3613af4e3c6ff6d0f2322e688bf3dd0390367c7a727d4ebd85cf811ec3f0034d89b69e20aba57c96bd73ddbe626d20eae78e2e367 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json b/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json index 7e0f7b641..688a607dd 100644 --- a/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-property-map-parallel/vcpkg.json @@ -1,11 +1,11 @@ { "name": "boost-property-map-parallel", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", + "license": "BSL-1.0", "dependencies": [ "boost-assert", - "boost-bind", "boost-concept-check", "boost-config", "boost-function", diff --git a/external_imported/vcpkg/ports/boost-property-map/portfile.cmake b/external_imported/vcpkg/ports/boost-property-map/portfile.cmake index e27f6ce53..72f49cc0d 100644 --- a/external_imported/vcpkg/ports/boost-property-map/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 0e381bc06ec61e9f6ac30341048c7183b97eb18fed4676a836c4f048cfa19b2e3e2331251bb4a5a66715f28426f8f9feefd85fbb1573b4109aadc0b6f8719be4 + REF boost-1.80.0 + SHA512 831a8f0973523d7bcaf45a7ad85c9c42a8df48a6d23b44d9282bd3fb980d7f88f73b51d63da535a6cd8c189c1f955ace2b8e337f7f669ee2cffe367503265265 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-property-map/vcpkg.json b/external_imported/vcpkg/ports/boost-property-map/vcpkg.json index 0283cd3c2..09ab5908d 100644 --- a/external_imported/vcpkg/ports/boost-property-map/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-property-map/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-property-map", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", @@ -16,6 +17,7 @@ "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", + "boost-type-index", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake b/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake index f7788aab3..1b99bd07d 100644 --- a/external_imported/vcpkg/ports/boost-property-tree/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 4020376435cb0f7c3be8cf8e8d1745c91717dbbeb4f0b70b4fd391362bd41b167c9feda719283d451b0001f2fb24a06da0bfd08c55d9e188d6614408b7d5dc59 + REF boost-1.80.0 + SHA512 8b26fcf02a32dddcf3115a3bb4189a1d472e1f1596f42918002fce43bd9554be288a873e23177160c607bdf36b91f4f3ff70625294ee0c536b2d9b1912e6f118 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json b/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json index 833c4fef3..b45335f45 100644 --- a/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-property-tree/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-property-tree", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-proto/portfile.cmake b/external_imported/vcpkg/ports/boost-proto/portfile.cmake index 8c8b38b4e..1894c508c 100644 --- a/external_imported/vcpkg/ports/boost-proto/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.78.0 - SHA512 ff1ef7077f27f9527bbe03106ec2c2717b321702823078f49f3988e065294feb80b3f998d32a090c8920a082f3c937e7c6b83b79485ca8ffac4c4a5fb5954148 + REF boost-1.80.0 + SHA512 996e7d1670d7b6b1389b88bb78946e8afbb37de87f1e819093df35d3237eff5c6d84aaf66ab010a32ff897b73d8a631b1fd1afc958c95cf85295be57c7cf1e1f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-proto/vcpkg.json b/external_imported/vcpkg/ports/boost-proto/vcpkg.json index e50f5eebe..44e686114 100644 --- a/external_imported/vcpkg/ports/boost-proto/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-proto/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-proto", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake b/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake index e523d8a3d..a130abbfc 100644 --- a/external_imported/vcpkg/ports/boost-ptr-container/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 fa22af9abf596cac89216a67deaf56927cff50c79383fc8ba327ddfc8d00093d05f736ed270dc5f458c0c4c6d94590276f823f5b61d6ec7f6671f930e862d5c4 + REF boost-1.80.0 + SHA512 ff8293ff63bb4bc02d9dd7237154c28a186bf968fd1f03866976ab5a245636db2b074922671a3ad1687858fb8d7ef86c251f9d39be0d5763df1c45ecb56e4c40 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json b/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json index 8abc4b4f0..34adb83fd 100644 --- a/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-ptr-container/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ptr-container", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-python/portfile.cmake b/external_imported/vcpkg/ports/boost-python/portfile.cmake index 417dd5f71..80f7b1f4d 100644 --- a/external_imported/vcpkg/ports/boost-python/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-python/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.78.0 - SHA512 781dedc6d5d2026232aa85a0083552b44b579b04d305e0e76ccda22fee1a336f862e49a544cddc1d394bcaeac67cf82472ae4ca5d3746cb53adc77aed1782e31 + REF boost-1.80.0 + SHA512 0bcb87196b7d9c621bb4ee1fc70ef08b9faad5d0eceb0fa03a5c61316e71ae51f1efc4568c2259c498b60dd6fe609b4ba1d92b9a5ca10f61d78cf106f7a611be HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-python requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-python/vcpkg.json b/external_imported/vcpkg/ports/boost-python/vcpkg.json index f6079ffb2..b82f65852 100644 --- a/external_imported/vcpkg/ports/boost-python/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-python/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-python", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", + "license": "BSL-1.0", "supports": "!uwp & !emscripten & !ios & !android", "dependencies": [ "boost-align", diff --git a/external_imported/vcpkg/ports/boost-qvm/portfile.cmake b/external_imported/vcpkg/ports/boost-qvm/portfile.cmake index ab2f253ea..cb4360c4b 100644 --- a/external_imported/vcpkg/ports/boost-qvm/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.78.0 - SHA512 904a640ca479b94ae5da1d57bd40f6845e281f5a47b26a884c51b9fa3fff7d385fe89104a53cf2e4a59b0190fea83d89a895293609b41481dc38df26d8bee9c4 + REF boost-1.80.0 + SHA512 1375e31e49b9b63624dca221067e0e85482db9fea5e9c77b58d17b49076b35bf25a2c781d1a7ac0cabe1e82834bd0eb58a428be18a613cc7ae286ede8931900f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-qvm/vcpkg.json b/external_imported/vcpkg/ports/boost-qvm/vcpkg.json index 720a36f9c..ff8ff35cd 100644 --- a/external_imported/vcpkg/ports/boost-qvm/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-qvm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-qvm", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", + "license": "BSL-1.0", "dependencies": [ "boost-vcpkg-helpers" ] diff --git a/external_imported/vcpkg/ports/boost-random/portfile.cmake b/external_imported/vcpkg/ports/boost-random/portfile.cmake index 60b92053e..7d013057c 100644 --- a/external_imported/vcpkg/ports/boost-random/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-random/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.78.0 - SHA512 64657eaf3c7d91730bc9f4fdac16095709a3b9425661bbb6501efe97f1e39e4f4586b81693b12ceda3cccb704969b468c8b1f27bbfbe668709252e172d554e5f + REF boost-1.80.0 + SHA512 8989ca6ecd45066b710d1fb655f0a9b67481f4a08a41738126b6a5ccc15152d4bddc9c41f4afd893bbca5025c8c93dd6fbaacde29a5065bb6523d24681fb63d7 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-random requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-random/vcpkg.json b/external_imported/vcpkg/ports/boost-random/vcpkg.json index 2167dcc10..ead097919 100644 --- a/external_imported/vcpkg/ports/boost-random/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-random/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-random", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-range/portfile.cmake b/external_imported/vcpkg/ports/boost-range/portfile.cmake index 5161fc148..a0ee849ef 100644 --- a/external_imported/vcpkg/ports/boost-range/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.78.0 - SHA512 d4614a4a6900cbda998574a43d48a8a0604b4fb2e4eb31a2a0ea33cafa9d018c6901af204b665f66abf3fbc0adb1bdab1ffb7d4ee8a125551ea5f66f6fb6bb24 + REF boost-1.80.0 + SHA512 8c41ed678c346be3b608abe0dcb9b95a4872c8244d1869be50abf6d121ea4e62b59a77f0639bd13c810ecf86a205f80ab8b4a5f92b433cdd5be209f7d8346504 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-range/vcpkg.json b/external_imported/vcpkg/ports/boost-range/vcpkg.json index 6258f6a86..ba1203a82 100644 --- a/external_imported/vcpkg/ports/boost-range/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-range/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-range", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-ratio/portfile.cmake b/external_imported/vcpkg/ports/boost-ratio/portfile.cmake index 4c46d6cb7..d72f157fb 100644 --- a/external_imported/vcpkg/ports/boost-ratio/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.78.0 - SHA512 2a17342379066361ef0187fc0e69734231afdc14463a26d20ed851e679989e9ee55619f1cd3694791d00dbe1c55da69d220db18c69df7493bcf7b47de563afc6 + REF boost-1.80.0 + SHA512 97a88d841635cb85b39d394721bbb3065d4c6d60e2911c27a4f51b01f80872b6cd814ea19711cf9628b4dadf78a704ce68c43c8d31a4eca1f5120b8441375631 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-ratio/vcpkg.json b/external_imported/vcpkg/ports/boost-ratio/vcpkg.json index afa3e8b7f..9dbff0a65 100644 --- a/external_imported/vcpkg/ports/boost-ratio/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-ratio/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ratio", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-rational/portfile.cmake b/external_imported/vcpkg/ports/boost-rational/portfile.cmake index 944497a98..6db5ffd02 100644 --- a/external_imported/vcpkg/ports/boost-rational/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.78.0 - SHA512 faf1ced934d98a7acbb78fe66d4b10f57f6f225a00f4b71eed7d46fa8f4b7995a37855a68390001a8374d4cbbe1ead4c2d64318a749b1c3392701c31aafb1f89 + REF boost-1.80.0 + SHA512 58a424b1fc4eafa604362b4efbff706bf04792f163fbdf6cc8d9a1c93fa15fbfe1bebea401a7f533af2a57d8fa3a98bba92a75204bca46050ba4cb84c6ac3093 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-rational/vcpkg.json b/external_imported/vcpkg/ports/boost-rational/vcpkg.json index 3472141fb..090b61b8e 100644 --- a/external_imported/vcpkg/ports/boost-rational/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-rational/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-rational", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-regex/b2-options.cmake b/external_imported/vcpkg/ports/boost-regex/b2-options.cmake index ecbbcf974..70597a0da 100644 --- a/external_imported/vcpkg/ports/boost-regex/b2-options.cmake +++ b/external_imported/vcpkg/ports/boost-regex/b2-options.cmake @@ -3,4 +3,6 @@ if("icu" IN_LIST FEATURES) if(APPLE) list(APPEND B2_OPTIONS cxxstd=11) endif() +else() + list(APPEND B2_OPTIONS --disable-icu) endif() diff --git a/external_imported/vcpkg/ports/boost-regex/portfile.cmake b/external_imported/vcpkg/ports/boost-regex/portfile.cmake index 6a7c56faf..63a3713a0 100644 --- a/external_imported/vcpkg/ports/boost-regex/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-regex/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.78.0 - SHA512 2ffb36c9652fd497c22852e332397c5fff7752c2919d1566833da9d2a64462292c03aceb2601515d590a939ffa4967e590bc5fa8cbaccd6d73555b47e703a74c + REF boost-1.80.0 + SHA512 266811207ed3eb91b436b42d99a3d0d6bfd7018d379a6116e908471449e5f4686bc940c268d48fe9b07be7ef68d9e01907eeda8c16de79eccaa6e17220468320 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-regex requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-regex/vcpkg.json b/external_imported/vcpkg/ports/boost-regex/vcpkg.json index c0d9678ab..c20cb37d3 100644 --- a/external_imported/vcpkg/ports/boost-regex/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-regex/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-regex", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake b/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake index d582dfe6f..68d572a52 100644 --- a/external_imported/vcpkg/ports/boost-safe-numerics/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 750b3e6abbc13b23d08bc2ce3397809ca7fd769aad7e366b50df6d9a4f40e78d7f852f7a79cec8d31872b83d6f3d9c0c30196b8b426f116714e178f3b8f76aeb + REF boost-1.80.0 + SHA512 ee70b13590bfdedeb756f42d566a414fc05d5b079876f514daba4bddfa9420420f720f7bdba5006327766e3d7840c82f74a2cab0b35971f98c571f4aaf06dc11 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json b/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json index 41759e88a..030bc0475 100644 --- a/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-safe-numerics/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-safe-numerics", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", + "license": "BSL-1.0", "dependencies": [ "boost-concept-check", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake b/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake index 87f9cbd7b..fc436f554 100644 --- a/external_imported/vcpkg/ports/boost-scope-exit/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 53e3f418727d80895e35cb483bcf2358e82c2ff221a0138e292dcd0648cf1b7065cd3dcbbb69d33b04ae0671b0d23038bedf6ad20e81bf4a8af4ab8b2e28e918 + REF boost-1.80.0 + SHA512 1cac78c81fee8ada8eac3780955b4930dbf38f8066859aaca6db5d0eec9d285b2ee4bf87c2d412725c9558331a3d13f66c315338cc0ec6ad1c0c43086dc2a4a4 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json b/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json index e79b470aa..7cc7d2517 100644 --- a/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-scope-exit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-scope-exit", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-function", diff --git a/external_imported/vcpkg/ports/boost-serialization/portfile.cmake b/external_imported/vcpkg/ports/boost-serialization/portfile.cmake index 5ca1c9995..f0e9775eb 100644 --- a/external_imported/vcpkg/ports/boost-serialization/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-serialization/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.78.0 - SHA512 12ae48c01fea6102267cc642727fc091ddb30224ecfb302911089dd2904fb7e52a03d5154059bb15d903753fd3863de8185612b1848418775f23e2a50378ed82 + REF boost-1.80.0 + SHA512 89140a1385a5bece0b01b8c366fd007163fbf4cde21db98e3f485602983af180a41b5d2906e9d504e87ac7739c97a7d99f9a52c40d3fa0c67386c2e06f380ac1 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-serialization requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-serialization/vcpkg.json b/external_imported/vcpkg/ports/boost-serialization/vcpkg.json index 099c8937d..dde45cf1f 100644 --- a/external_imported/vcpkg/ports/boost-serialization/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-serialization/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-serialization", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-signals2/portfile.cmake b/external_imported/vcpkg/ports/boost-signals2/portfile.cmake index db0feaadb..bf05debea 100644 --- a/external_imported/vcpkg/ports/boost-signals2/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.78.0 - SHA512 0aa8bcdb9e0c948ab4c372919388110da33f225c8437eb0d25066efe2f60f6c9dca27110bfa5c768738499c78482cf88264e7744e6acec339252df20908ba399 + REF boost-1.80.0 + SHA512 e6231d27e3089df7d06ea74e7d58439bdf5b5c785e11cf82531166b0d7d3f0f5c0d5d60e435cd2b8e28457ed96ff497e3abd236ec96c7c16a965a59962b86726 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-signals2/vcpkg.json b/external_imported/vcpkg/ports/boost-signals2/vcpkg.json index 7e150d684..523cbb4fb 100644 --- a/external_imported/vcpkg/ports/boost-signals2/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-signals2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-signals2", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake b/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake index d0a827ce0..fe89599da 100644 --- a/external_imported/vcpkg/ports/boost-smart-ptr/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 96f5d910dae54441d8d85ffab6a3dc3711ebb69325152a16185822e95be683548575f8074b13b64123da5ec6ca666ca33f26984c931fd642b8c9373ed682181e + REF boost-1.80.0 + SHA512 044c742f000e724f1d74eeaf24bc4cfd61e2d95fba3273f55930d98cc660243de09a16e131a780731de137e68d8698ae5e91b43f12e1b0179d8fc076cd2d660c HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json b/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json index 675d97b36..85aa92d94 100644 --- a/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-smart-ptr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-smart-ptr", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-sort/portfile.cmake b/external_imported/vcpkg/ports/boost-sort/portfile.cmake index 5f985ba61..4a1610585 100644 --- a/external_imported/vcpkg/ports/boost-sort/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.78.0 - SHA512 4bb1626f58bfbd69bb0ae9d7844b5d1e3d5c55cc62e1ba0398d00775151704a3c2a83916ac166f3821ed96f7565f3bfd546af28157ab6a1b8ea64820550cad26 + REF boost-1.80.0 + SHA512 6d7abe931fb4267c83ecf5505cd0f4418b99b2d07de3e9432cb3c2562d0c94b44f6585b3cef5a01a3f0cb197464627e1a902993d712bafee25e833beef6e0413 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-sort/vcpkg.json b/external_imported/vcpkg/ports/boost-sort/vcpkg.json index 93dc9d714..628cf55cf 100644 --- a/external_imported/vcpkg/ports/boost-sort/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-sort/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-sort", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-spirit/portfile.cmake b/external_imported/vcpkg/ports/boost-spirit/portfile.cmake index 145e8d669..92672fbba 100644 --- a/external_imported/vcpkg/ports/boost-spirit/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.78.0 - SHA512 ae813e9abba8aa80b93ee5b089dcb4165be3970355d15f2ecdf4d7a552903b5f42081667a4b03d59018baca39b0f0e090daac1be5b3cc001b65cf800ebe69a24 + REF boost-1.80.0 + SHA512 189d3d4216d37a78a0241f616d365df24a1e00abb6a84031be1fc5189b596f182c4d4002cbe5ffe0a62d7d2f0ef1cfafdab1ad18bcde1767ea560fc9104a848a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-spirit/vcpkg.json b/external_imported/vcpkg/ports/boost-spirit/vcpkg.json index eae68de94..1411bde94 100644 --- a/external_imported/vcpkg/ports/boost-spirit/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-spirit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-spirit", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", + "license": "BSL-1.0", "dependencies": [ "boost-array", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake b/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake index ad4b4ca7b..8de48737f 100644 --- a/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-stacktrace/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.78.0 - SHA512 edf10d4050e168b5eac7d19ff6afe3c54a3f237c65a6de974235446514ea1fae683ad01435649bd41120a51f05ae59644793c317066f5e946c02c471097e05ac + REF boost-1.80.0 + SHA512 e4017745b1d56721321497e343bc7bce448ecaad8b184971a98c1c89d9f3a9766b214cf4887ea242d94521a22c40ed8211e249f0795a114f89c7d55066fc42c3 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-stacktrace requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json b/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json index ee33444a9..cfffa939f 100644 --- a/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-stacktrace/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-stacktrace", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-array", diff --git a/external_imported/vcpkg/ports/boost-statechart/portfile.cmake b/external_imported/vcpkg/ports/boost-statechart/portfile.cmake index c4855d273..9fd6a438d 100644 --- a/external_imported/vcpkg/ports/boost-statechart/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.78.0 - SHA512 81f9148126b2dc09f2e51cc2607247a1bf3f099d87f4c402ca47543a6339c0da0139040e28c4465030e0056aeb7e3e160926b3a7e49b4f91faf8275e63715e27 + REF boost-1.80.0 + SHA512 c6248ba5e5ca325652ee54c0bba021662c3b04d9d1bcda68b37d8d72ec36a7427354e986d036577d72e3fa4eff5d471327a7d8e84ebacbac2fc9ea3b0f7ef04b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-statechart/vcpkg.json b/external_imported/vcpkg/ports/boost-statechart/vcpkg.json index a6abf8df4..debe1efdc 100644 --- a/external_imported/vcpkg/ports/boost-statechart/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-statechart/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-statechart", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake b/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake index 5643c9260..f31c73e41 100644 --- a/external_imported/vcpkg/ports/boost-static-assert/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 213098d7fae87af6ee0919de1e3e5110f96eb6238ff200e9080d18e355ea3403b24b8eab318bde1dab8c32d7ee780ded46e39056e625bf5f6bcca9b48fdfee7d + REF boost-1.80.0 + SHA512 86ae616988f25bbf69b509ca8ec01657642aab9d69210011544c25e3e365d5eeed7161a3bb48b5a99d174c07e51240e7d1d92a9229650b4da327cf2b55a95724 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json b/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json index cc7392a07..9b3812347 100644 --- a/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-static-assert/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-static-assert", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-static-string/portfile.cmake b/external_imported/vcpkg/ports/boost-static-string/portfile.cmake index 09fdc0663..0163ae737 100644 --- a/external_imported/vcpkg/ports/boost-static-string/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 979d079e1b9749701200944f056747253dc0993f217b8dc7e4fb2c94c67d002037c465c0bdd1f939b24be5a51bbd4790f9d0d0e8c8da1d5bfa0349ba402aa953 + REF boost-1.80.0 + SHA512 3f96bec4f4f040564adae7e89c755fb8db764be47152e0d13c13dba5931f4778727ffcd549c5786c44e595d9ea866e831bb4dfb5f6e6c08470dbfa1188e7847f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-static-string/vcpkg.json b/external_imported/vcpkg/ports/boost-static-string/vcpkg.json index c7e19e5cc..4f5ea500a 100644 --- a/external_imported/vcpkg/ports/boost-static-string/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-static-string/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-static-string", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-container-hash", diff --git a/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake b/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake index 46ab4c42d..5e9cfc38c 100644 --- a/external_imported/vcpkg/ports/boost-stl-interfaces/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 78b3afa7d9e781734ee4ea82b6e0f55834983899018b76a295d0b8a999a6aa3257ad8da40b730115abd2fa1ea2afa51e2b9e8e7d6c756521a8db863ebb3aaad0 + REF boost-1.80.0 + SHA512 dddd56f03cedb9a94e7dd9a2937a57798c91a833081fc568778f185808896fc1e6b8553a423ed4f4ae3bb25a40128ffc679a8c18671fedba5dbea35c39099ad2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json b/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json index 1cc10cdcf..0661b06de 100644 --- a/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-stl-interfaces/vcpkg.json @@ -1,11 +1,13 @@ { "name": "boost-stl-interfaces", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/external_imported/vcpkg/ports/boost-system/portfile.cmake b/external_imported/vcpkg/ports/boost-system/portfile.cmake index 222f390ff..ffa838b8c 100644 --- a/external_imported/vcpkg/ports/boost-system/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-system/portfile.cmake @@ -5,14 +5,11 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.78.0 - SHA512 104574dd982281b7888a894feac4e76844b69c39cbe502ed62a6c75f1bb7fa6265f5212e152b3e3f1d739d216e3f02abd1077f07ff5681aa4dc9b24e88f08ab0 + REF boost-1.80.0 + SHA512 9f3365e993d27c6ca46015ee3111ea2a8962d6de0bb2b45652a6bf26e5be025d70f427ec92ebecb3ce1980220e4540d2dca4180a3dcdd1ca4006161cc1bf5402 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-system requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-system/vcpkg.json b/external_imported/vcpkg/ports/boost-system/vcpkg.json index 41f935ca9..ea6d0d28e 100644 --- a/external_imported/vcpkg/ports/boost-system/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-system/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-system", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-test/portfile.cmake b/external_imported/vcpkg/ports/boost-test/portfile.cmake index d48046ce0..7a01e23d6 100644 --- a/external_imported/vcpkg/ports/boost-test/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-test/portfile.cmake @@ -3,18 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.78.0 - SHA512 0a2611fee4d8f361f172375b21c9bc3825c105fdbd8a1b17364bb92654c631df508fb6a5d086c0aa3f8d5004b672ecf496f846b79eecba8e007dd581ebd47956 + REF boost-1.80.0 + SHA512 0848afee0070950a2e3b1f3a4d297992cf3789d85b5cd64ac8894d629eea02d7830eda2a359567c5d2c9d1249accd934c7f9b422f14df2ccfa793f65a410ff02 HEAD_REF master ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-test requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-test/vcpkg.json b/external_imported/vcpkg/ports/boost-test/vcpkg.json index 9506fb481..2d9959527 100644 --- a/external_imported/vcpkg/ports/boost-test/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-test/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-test", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-algorithm", diff --git a/external_imported/vcpkg/ports/boost-thread/portfile.cmake b/external_imported/vcpkg/ports/boost-thread/portfile.cmake index 39db33463..55a38681f 100644 --- a/external_imported/vcpkg/ports/boost-thread/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-thread/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.78.0 - SHA512 567951a14780358d32ee2b9397df8261fc20bf2dfa55473dd163aa79c448c3ecff2a3799473e88742831f929d61813809efa6211c2dc43e808c94789bae6f443 + REF boost-1.80.0 + SHA512 f0ffb8ab6222ca667471452a953fd84149f477c052ec28228b6899354d766fcfd337f3c4202c5e9eefe71a0999196b2e76b025d13499554e1eafeb961d6c993b HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-thread requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/boost-thread/vcpkg.json b/external_imported/vcpkg/ports/boost-thread/vcpkg.json index e710c4430..39b54759b 100644 --- a/external_imported/vcpkg/ports/boost-thread/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-thread/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-thread", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", + "license": "BSL-1.0", "dependencies": [ "boost-algorithm", "boost-assert", diff --git a/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake b/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake index bf6b0bc81..e6e939c28 100644 --- a/external_imported/vcpkg/ports/boost-throw-exception/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 055170a0434cd4b0059e052c6904030ef1e298a619fab65709f88c258df00d93af406f9f27923be8a73356d91f3f91331c08d77a48ea0f368e1ea26d23c5a1ca + REF boost-1.80.0 + SHA512 f3661a8f6783105dd931df6bed9349a50bce035e26c701bb3bf6d78db04c6ac1e3e476297b2465be27f0987de57341e9e57e3c18f279aa4289dddc4496ebd9ac HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json b/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json index 8b66324f4..fed036a4c 100644 --- a/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-throw-exception/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-throw-exception", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-timer/portfile.cmake b/external_imported/vcpkg/ports/boost-timer/portfile.cmake index 762dd996c..8f8fc0fb5 100644 --- a/external_imported/vcpkg/ports/boost-timer/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-timer/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.78.0 - SHA512 92feda5587a5a28f3ebb2902ac442e253d9497c80bef9310ddc452265eefedb03737504e06d7d60b7e5798509af092a15a37d435e357dd06b9d53e5c258c3e62 + REF boost-1.80.0 + SHA512 51fb90cbef6a044a72f6a05550254108db6faeaf67bb8830e764fa3c40f325ba0d3351228c7a88b0c320d112e2d11eb67013c2da025d084ab5846a1b298b350c HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-timer requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-timer/vcpkg.json b/external_imported/vcpkg/ports/boost-timer/vcpkg.json index b29d8c9cf..3923b673e 100644 --- a/external_imported/vcpkg/ports/boost-timer/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-timer/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-timer", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", + "license": "BSL-1.0", "dependencies": [ { "name": "boost-build", diff --git a/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake b/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake index 5ef5083c7..509a497be 100644 --- a/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.78.0 - SHA512 e29fb1eedd967c3a1450fad55054a9b07f866f5202058c900b31923127b78eb7a4b7f433a14b9eb6dc5e9bbde8f4be17e940f08f5df200a2df73e0c2132325d5 + REF boost-1.80.0 + SHA512 3a96bb3f6a91d9f14b0450a6a9eafcc336fd9724db49a0ef84fb8a1a858420959cdfb2e7375a9db2f82d885b257229dab5c586196c61ba6a83f9435fc1cc1f37 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json b/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json index 558c4712e..f529dc622 100644 --- a/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-tokenizer/vcpkg.json @@ -1,14 +1,14 @@ { "name": "boost-tokenizer", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", "boost-core", "boost-iterator", - "boost-mpl", "boost-throw-exception", "boost-type-traits", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-tti/portfile.cmake b/external_imported/vcpkg/ports/boost-tti/portfile.cmake index a9a785037..5d20a4baf 100644 --- a/external_imported/vcpkg/ports/boost-tti/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.78.0 - SHA512 6b2a3c02c7b8d0bb498a72784ef185a344536c8818a012c4fedeba65a8863fcb6559730ab5b398acba4801a6fb5f8c16c10b8e01bd89f814d0748e70fb91dd10 + REF boost-1.80.0 + SHA512 bde1c576d526a9eb51419371b05bc3104de8458b5d4ecf4fdd8fd6d79af4e31f79a6e09fedd6515930098664a254d0f34ae1c506bb8be88dcd038355e7f8c3e4 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-tti/vcpkg.json b/external_imported/vcpkg/ports/boost-tti/vcpkg.json index a3681e5b0..374904ec9 100644 --- a/external_imported/vcpkg/ports/boost-tti/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-tti/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-tti", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-function-types", diff --git a/external_imported/vcpkg/ports/boost-tuple/portfile.cmake b/external_imported/vcpkg/ports/boost-tuple/portfile.cmake index ae3b005a4..effab5138 100644 --- a/external_imported/vcpkg/ports/boost-tuple/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.78.0 - SHA512 354c9406001251793004fb07ae4f57ca61329eb90ec48f5446134425413fd755730981110d09c042cb85666ea629bad319088d6d6a2861e9153fb38a5c0998f9 + REF boost-1.80.0 + SHA512 4c7bf3efa65405d64842201cdd62e0ed0a0e7893ba7b9e6f9162adaa065c481afefecc50fc7c731460b7829ef50e598845029926891519971bec11a896a3c2e3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-tuple/vcpkg.json b/external_imported/vcpkg/ports/boost-tuple/vcpkg.json index b4d57cfa6..2675c3a18 100644 --- a/external_imported/vcpkg/ports/boost-tuple/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-tuple/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-tuple", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-core", diff --git a/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake b/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake index 33cbef353..365425e62 100644 --- a/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-type-erasure/portfile.cmake @@ -3,14 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.78.0 - SHA512 6ef919c93f1bc1c3ff12feeb22371288dd3999b7b31aa4537fda86373bf1ab0e5f2cf5de888fedcbd462483ecb9020053a120040243acb1d71c42c4fdd8af619 + REF boost-1.80.0 + SHA512 7f37e8343e95e84b4d03d68c82960a105ed5c7b08d1ecc9a745cd2a1fa772776c06548a0870754f20d9113cdcf92482b085ca6c8db6616d79aa895edf164c129 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-type-erasure requires a newer version of vcpkg in order to build.") -endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json b/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json index 8c04fc773..46636ccbc 100644 --- a/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-type-erasure/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-erasure", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", + "license": "BSL-1.0", "dependencies": [ "boost-assert", { diff --git a/external_imported/vcpkg/ports/boost-type-index/portfile.cmake b/external_imported/vcpkg/ports/boost-type-index/portfile.cmake index 92bc4df15..fe6fc5390 100644 --- a/external_imported/vcpkg/ports/boost-type-index/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 d57bc583f6d601835c5887e99e46a388144d3a8074fa7bb01cee11bad4c5ec82f88722867448d01c4c6b899601b9675e6d45ab93f7c5c6416d3894e2fa3c2ebc + REF boost-1.80.0 + SHA512 9ad38e8560e327ea3f2f419e9b264bb78864bd7a518d90fe65da159d989720f9125fe5d710ed627a61a523e61762f672a7763b100e474cb9b9c54bc592ad80a3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-type-index/vcpkg.json b/external_imported/vcpkg/ports/boost-type-index/vcpkg.json index 2589f3de3..e032a963b 100644 --- a/external_imported/vcpkg/ports/boost-type-index/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-type-index/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-index", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-container-hash", diff --git a/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake b/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake index b19ed2bbc..e9172b271 100644 --- a/external_imported/vcpkg/ports/boost-type-traits/portfile.cmake +++ b/external_imported/vcpkg/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.78.0 - SHA512 27c10bec741e0ba9fcec3b49b4f62eeee798e41ca67b51aedf37ce8b360520a7640f7f7cf56def61d709dd7c5dbd32bdc2680b8fac5c52522b93f30e319991f4 + REF boost-1.80.0 + SHA512 27430430f709f9d863d83153cf93299cec1c656e5b304d329a5044d39e6e16b3d779874dfe05f4fd6ecb4abaee92c9675739862e443809b59a5a29449785f4b2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json b/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json index 42f3e6980..f9c2aa568 100644 --- a/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-type-traits/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-type-traits", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-static-assert", diff --git a/external_imported/vcpkg/ports/boost-typeof/portfile.cmake b/external_imported/vcpkg/ports/boost-typeof/portfile.cmake index 761cdb6cf..351ba9177 100644 --- a/external_imported/vcpkg/ports/boost-typeof/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.78.0 - SHA512 cf0070cf2ed522138bc44136eee5bf08f0d1b9d1363442d7cae6f38978d536d099dc674708d7307ee4b9d9b934694aa40a11d9d57c1afe8b55f180302ad3cc7c + REF boost-1.80.0 + SHA512 13514536d68ceadd66910a22c54a29f986c176f6854198d466ccef50c78cd5a7132b63779a48893a0e1fdf552789bca30cc356e1f582ccb547edf32d7bbf4298 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-typeof/vcpkg.json b/external_imported/vcpkg/ports/boost-typeof/vcpkg.json index 058de2f0c..c24da3bfe 100644 --- a/external_imported/vcpkg/ports/boost-typeof/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-typeof/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-typeof", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-preprocessor", diff --git a/external_imported/vcpkg/ports/boost-ublas/portfile.cmake b/external_imported/vcpkg/ports/boost-ublas/portfile.cmake index 3086b5abc..5fc6e0bd6 100644 --- a/external_imported/vcpkg/ports/boost-ublas/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.78.0 - SHA512 1c4d94b31ce54a0a215c878654cf3a436f857913ec138a6801589b26527d97dc83dbd1908501328b3522d0d4ee18eaddace12187cb8a4146c6acb12dda1e2204 + REF boost-1.80.0 + SHA512 8f081be2ceaadfba63fbb802bed2b29b814f9de8cb29ac212a0949570d458112000ba7e914c7547486086cc8467c59cebad860ad8aa685f1ac355f38ed543165 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-ublas/vcpkg.json b/external_imported/vcpkg/ports/boost-ublas/vcpkg.json index 866c06f5d..b1040e69e 100644 --- a/external_imported/vcpkg/ports/boost-ublas/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-ublas/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-ublas", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", + "license": "BSL-1.0", "dependencies": [ "boost-compute", "boost-concept-check", diff --git a/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json b/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json index ceb10a10b..e19445688 100644 --- a/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-uninstall/vcpkg.json @@ -1,5 +1,6 @@ { "name": "boost-uninstall", - "version": "1.78.0", - "description": "Internal vcpkg port used to uninstall Boost" + "version": "1.80.0", + "description": "Internal vcpkg port used to uninstall Boost", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/boost-units/portfile.cmake b/external_imported/vcpkg/ports/boost-units/portfile.cmake index 619ee451f..f7eec90f4 100644 --- a/external_imported/vcpkg/ports/boost-units/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.78.0 - SHA512 192142782fbb800d6ae475acc3c639d18090e668efce8fd3c17353f8b6db5fa7da3814e5bb76b65c500963c4cc89d9d79bfed750efeb3a952d3510a601442d07 + REF boost-1.80.0 + SHA512 d9b1f196d6c38f78989912bec953ae0dcc4af1a8b961415bc9e9f2c84652f9422bc6a98ad439c28fe3418e01256728ebe6ca3411706be3fd7e7b2ff57899b1fd HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-units/vcpkg.json b/external_imported/vcpkg/ports/boost-units/vcpkg.json index a7e093ceb..6d849ab0f 100644 --- a/external_imported/vcpkg/ports/boost-units/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-units/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-units", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-unordered/portfile.cmake b/external_imported/vcpkg/ports/boost-unordered/portfile.cmake index 4b51de2b2..da6a6ce6a 100644 --- a/external_imported/vcpkg/ports/boost-unordered/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.78.0 - SHA512 49aa2d33e709919da03d2038eddaedaf6c91e18039e398bbc319ef6a798f425065b4e8e218b7d84c20c5409fd3968c43f6ea116e5bf77878880498f1a96548e6 + REF boost-1.80.0 + SHA512 4d82257d6ec001f327426f6cafd2fe066c091285dc38cbd1754d6195516dbd48fbc6e280614f899c211134fb0cc05fabe6ca37657ebf3e65f401a15d31c0d76d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-unordered/vcpkg.json b/external_imported/vcpkg/ports/boost-unordered/vcpkg.json index 3c89abc0f..02b0598b7 100644 --- a/external_imported/vcpkg/ports/boost-unordered/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-unordered/vcpkg.json @@ -1,19 +1,18 @@ { "name": "boost-unordered", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", - "boost-container", "boost-container-hash", "boost-core", - "boost-detail", "boost-move", + "boost-mp11", "boost-predef", "boost-preprocessor", - "boost-smart-ptr", "boost-throw-exception", "boost-tuple", "boost-type-traits", diff --git a/external_imported/vcpkg/ports/boost-utility/portfile.cmake b/external_imported/vcpkg/ports/boost-utility/portfile.cmake index fb069dccb..91353eabc 100644 --- a/external_imported/vcpkg/ports/boost-utility/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.78.0 - SHA512 6c7a3bc70b3e11a2d5911eaf810e90a694ea87d8338b60218c8cdb8f732e7ee402abb41bd292e252b2c824428dad11cd0e8bfe5791843e172032e945b2a5ad44 + REF boost-1.80.0 + SHA512 f9db306c27e64725c110ff4d918edf9cc954711f5a5bdff5c69e3cf0510cfb49f997aa6019f31d096426d8764833b6e0707b0806bc14412b583461745529e537 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-utility/vcpkg.json b/external_imported/vcpkg/ports/boost-utility/vcpkg.json index d7e947a19..0703658c3 100644 --- a/external_imported/vcpkg/ports/boost-utility/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-utility/vcpkg.json @@ -1,9 +1,11 @@ { "name": "boost-utility", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", + "license": "BSL-1.0", "dependencies": [ + "boost-assert", "boost-config", "boost-core", "boost-io", diff --git a/external_imported/vcpkg/ports/boost-uuid/portfile.cmake b/external_imported/vcpkg/ports/boost-uuid/portfile.cmake index 9e723bd25..8a6f65578 100644 --- a/external_imported/vcpkg/ports/boost-uuid/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.78.0 - SHA512 8f2dd8057d6e54d9540ed905018b167c5211380f3cc0b0a0fb4753ec74007f1ae6cfeea080e4cb7a073aaa0182a088ce7658cd4bcaf3ca8ae64bf711aa1a0a7b + REF boost-1.80.0 + SHA512 839aa4125730ba89ed9293053e0f41283af2185c99a2b00a758414545410493d4a8853659f6b87c3c26c81276f7c84777d8733a2244810517ed2170c130100be HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-uuid/vcpkg.json b/external_imported/vcpkg/ports/boost-uuid/vcpkg.json index dd6259634..5ea5f2eca 100644 --- a/external_imported/vcpkg/ports/boost-uuid/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-uuid/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-uuid", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-variant/portfile.cmake b/external_imported/vcpkg/ports/boost-variant/portfile.cmake index b57faca79..50229d597 100644 --- a/external_imported/vcpkg/ports/boost-variant/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.78.0 - SHA512 456ad20b949a49622cd6ccaf2be896b2ca976b90535f95e1c59efc27e7a02b9c56b6843464586f065c889be149d2afae80368e810a36aa5cd2314e2e64ca1842 + REF boost-1.80.0 + SHA512 b9b6a831d735051c81f0a2b063e071f44fde80bc84833c4f43e0b5eb7edb8c9f0b7e86429db3ddd31ca9639de098a4369a5bcdceff3100621c25ac7f2a4af6e2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-variant/vcpkg.json b/external_imported/vcpkg/ports/boost-variant/vcpkg.json index dc704f13c..70990847a 100644 --- a/external_imported/vcpkg/ports/boost-variant/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-variant/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-variant", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-bind", diff --git a/external_imported/vcpkg/ports/boost-variant2/portfile.cmake b/external_imported/vcpkg/ports/boost-variant2/portfile.cmake index 31cb580cd..ce30c82d9 100644 --- a/external_imported/vcpkg/ports/boost-variant2/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.78.0 - SHA512 bcfd19db60eab579a80b5cfd49bfc70ac325dfcf45b0c4a759abd943b6bed22351cfd1eea5e828dc32d516ca2af2ade5ac2621f01b22596e5c072eade778119a + REF boost-1.80.0 + SHA512 e3e0406679f03417111cf6e7e78d8932740ed0f743e112b0b9e381995078c410def0b072cb8fd68d8acfefbdf5ec28fad2bac276423f7c2f09522d84db42b717 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-variant2/vcpkg.json b/external_imported/vcpkg/ports/boost-variant2/vcpkg.json index 5493d71c7..2f9df670c 100644 --- a/external_imported/vcpkg/ports/boost-variant2/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-variant2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-variant2", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake index 3737f9273..200e07e33 100644 --- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(BOOST_VERSION 1.78.0) +set(BOOST_VERSION 1.80.0) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake diff --git a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json index 8987cc0ba..0c1d3927a 100644 --- a/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,8 +1,8 @@ { "name": "boost-vcpkg-helpers", - "version": "1.78.0", - "port-version": 1, + "version": "1.80.0", "description": "Internal vcpkg port used to modularize Boost", + "license": "MIT", "dependencies": [ "boost-uninstall" ] diff --git a/external_imported/vcpkg/ports/boost-vmd/portfile.cmake b/external_imported/vcpkg/ports/boost-vmd/portfile.cmake index 259a0fc29..3c21862f2 100644 --- a/external_imported/vcpkg/ports/boost-vmd/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.78.0 - SHA512 344353e4a43957df0b1be78e5de8dc51928d98c1ed940e24efd506ef5574895b63b67149f335657dae781e4ea7ee35ae53b4d41aaee89418ce93b4d755e55c3d + REF boost-1.80.0 + SHA512 cf6c9c3684e14225750669413ac2f538ebc207fc6ca7180a10a371b0d03de4e3ac570648d2b30e7f534a8f5c49499e9a03866cbf0613cdf25f1ff7ce4a7e1cac HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-vmd/vcpkg.json b/external_imported/vcpkg/ports/boost-vmd/vcpkg.json index 815a1870f..7beac48cb 100644 --- a/external_imported/vcpkg/ports/boost-vmd/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-vmd/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-vmd", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", + "license": "BSL-1.0", "dependencies": [ "boost-preprocessor", "boost-vcpkg-helpers" diff --git a/external_imported/vcpkg/ports/boost-wave/portfile.cmake b/external_imported/vcpkg/ports/boost-wave/portfile.cmake index afd8329f1..2e625ff8b 100644 --- a/external_imported/vcpkg/ports/boost-wave/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-wave/portfile.cmake @@ -3,14 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.78.0 - SHA512 4de422e47415d4abff3ef8002a9489ddf10578fa51bb681e273b585acea5e3d055a12a084813f37103765d9372d1a0cf9a43fb224fb54cc76116f17d28193719 + REF boost-1.80.0 + SHA512 6c6172d9a49e0810cb8c16eea637ced5a2bc2769134b5e194e9e1749cfe5965f9c753af6ecc92e9ab570290f85c157308a628fdf7b9f126bd66af4eb0566e2e5 HEAD_REF master ) -if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) - message(FATAL_ERROR "boost-wave requires a newer version of vcpkg in order to build.") -endif() +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/external_imported/vcpkg/ports/boost-wave/vcpkg.json b/external_imported/vcpkg/ports/boost-wave/vcpkg.json index ae2613755..9eeb74ec7 100644 --- a/external_imported/vcpkg/ports/boost-wave/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-wave/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-wave", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", + "license": "BSL-1.0", "supports": "!uwp", "dependencies": [ "boost-assert", @@ -17,6 +18,7 @@ "name": "boost-filesystem", "platform": "!uwp" }, + "boost-format", "boost-iterator", "boost-lexical-cast", { diff --git a/external_imported/vcpkg/ports/boost-winapi/portfile.cmake b/external_imported/vcpkg/ports/boost-winapi/portfile.cmake index 8c75df590..637727856 100644 --- a/external_imported/vcpkg/ports/boost-winapi/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.78.0 - SHA512 431d0091574e857f895a9b8659a474e5aaf7ba0e80f0a15da445f2ed3612e192bdd0763e024a62ad94f8a0efbfadbd00c7caf20836409fb46fb0dc1520236dd6 + REF boost-1.80.0 + SHA512 851e1cd8e7d2d20bcf1504c978fb9c1caa4ce00db23adbbfbf9de7f8c665c596af42ee5d7d7c44d36a43ffa28e4e98376a48db2ba0db51ff568f31bd547093a1 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-winapi/vcpkg.json b/external_imported/vcpkg/ports/boost-winapi/vcpkg.json index 9af116ed2..a3acfa64e 100644 --- a/external_imported/vcpkg/ports/boost-winapi/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-winapi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-winapi", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", + "license": "BSL-1.0", "dependencies": [ "boost-config", "boost-predef", diff --git a/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake b/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake index 776242d1a..95e385cc0 100644 --- a/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.78.0 - SHA512 9d9235e29d6ed07ab3ed88aedc8736093c93fad3507360fb506c7ed6cb5e9cdf115d6a2ebf5a1c5022189329b172b79e5dc64d63b6a0edea94c25820d3c138d9 + REF boost-1.80.0 + SHA512 a394e1d332afae2477a1f03f5e353ff544169d9d446ff4c87cf2f7b806243c13f71d10a87394cb23a170416b987d324dbdf8e365eb5c81d20388400777ba3e52 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json b/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json index 11f75889f..388d3a50c 100644 --- a/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-xpressive/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-xpressive", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", + "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", diff --git a/external_imported/vcpkg/ports/boost-yap/portfile.cmake b/external_imported/vcpkg/ports/boost-yap/portfile.cmake index c8bf4bd74..6c0dff7f2 100644 --- a/external_imported/vcpkg/ports/boost-yap/portfile.cmake +++ b/external_imported/vcpkg/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.78.0 - SHA512 7cb6c90ad0d7c1303dfaea14ddc6cafd3343b93d00f41ece57fbc38ae5ee923fc5f0abe51eb28d1b336b6f66a5b7778b063e5583738ef409acffb4253e831a8d + REF boost-1.80.0 + SHA512 0ef945de4b32093d46975fb9366544fcdace51bd8137ff6ad2a2ba0d0a7a0c5e31dc7c3396ebf6de9b4fbdb6b6ee2000dae6c8c44f897ff6c832eae26b6a207a HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/boost-yap/vcpkg.json b/external_imported/vcpkg/ports/boost-yap/vcpkg.json index 734cec34a..e345791e8 100644 --- a/external_imported/vcpkg/ports/boost-yap/vcpkg.json +++ b/external_imported/vcpkg/ports/boost-yap/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-yap", - "version": "1.78.0", + "version": "1.80.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", + "license": "BSL-1.0", "dependencies": [ "boost-hana", "boost-preprocessor", diff --git a/external_imported/vcpkg/ports/boost/vcpkg.json b/external_imported/vcpkg/ports/boost/vcpkg.json index d97ca5c2a..99728ccea 100644 --- a/external_imported/vcpkg/ports/boost/vcpkg.json +++ b/external_imported/vcpkg/ports/boost/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost", - "version": "1.78.0", + "version": "1.80.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", + "license": "BSL-1.0", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/external_imported/vcpkg/ports/boringssl/0002-disable-waring-4065.patch b/external_imported/vcpkg/ports/boringssl/0002-disable-waring-4065.patch deleted file mode 100644 index 88ffffaf0..000000000 --- a/external_imported/vcpkg/ports/boringssl/0002-disable-waring-4065.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt -index ef95a6b..0b52c05 100644 ---- a/decrepit/CMakeLists.txt -+++ b/decrepit/CMakeLists.txt -@@ -40,6 +40,10 @@ add_executable( - - add_dependencies(decrepit_test global_target) - -+if(MSVC) -+ target_compile_options(decrepit PRIVATE /wd4065) -+endif() -+ - target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit - crypto) - if(WIN32) diff --git a/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch b/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch new file mode 100644 index 000000000..c037b273a --- /dev/null +++ b/external_imported/vcpkg/ports/boringssl/0002-remove-WX-Werror.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 83ff477..3008c2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ endif() + if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) + # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration + # primarily on our normal Clang one. +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla") + if(MSVC) + # clang-cl sets different default warnings than clang. It also treats -Wall + # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. +@@ -238,8 +238,8 @@ elseif(MSVC) + ${MSVC_DISABLED_WARNINGS_LIST}) + string(REPLACE "C" " -w4" MSVC_LEVEL4_WARNINGS_STR + ${MSVC_LEVEL4_WARNINGS_LIST}) +- set(CMAKE_C_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") +- set(CMAKE_CXX_FLAGS "-utf-8 -Wall -WX ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") ++ set(CMAKE_CXX_FLAGS "-utf-8 -Wall ${MSVC_DISABLED_WARNINGS_STR} ${MSVC_LEVEL4_WARNINGS_STR}") + endif() + + if(WIN32) diff --git a/external_imported/vcpkg/ports/boringssl/portfile.cmake b/external_imported/vcpkg/ports/boringssl/portfile.cmake index e604c6a34..be9ed1ee8 100644 --- a/external_imported/vcpkg/ports/boringssl/portfile.cmake +++ b/external_imported/vcpkg/ports/boringssl/portfile.cmake @@ -27,12 +27,11 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-vcpkg.patch - 0002-disable-waring-4065.patch + 0002-remove-WX-Werror.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG @@ -40,10 +39,10 @@ vcpkg_configure_cmake( -DINSTALL_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() 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 "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/boringssl/vcpkg.json b/external_imported/vcpkg/ports/boringssl/vcpkg.json index d8d9f7ac2..9d0affcbb 100644 --- a/external_imported/vcpkg/ports/boringssl/vcpkg.json +++ b/external_imported/vcpkg/ports/boringssl/vcpkg.json @@ -1,10 +1,16 @@ { "name": "boringssl", "version-date": "2021-06-23", - "port-version": 1, + "port-version": 2, "description": "BoringSSl is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "tools": { "description": "Build bssl executable" diff --git a/external_imported/vcpkg/ports/botan/arm64-windows.patch b/external_imported/vcpkg/ports/botan/arm64-windows.patch new file mode 100644 index 000000000..54f98b7a9 --- /dev/null +++ b/external_imported/vcpkg/ports/botan/arm64-windows.patch @@ -0,0 +1,23 @@ +diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h +index 8cdaae2..54bb670 100644 +--- a/src/lib/utils/mul128.h ++++ b/src/lib/utils/mul128.h +@@ -39,10 +39,15 @@ namespace Botan { + #elif defined(BOTAN_BUILD_COMPILER_IS_MSVC) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) + + #include +-#pragma intrinsic(_umul128) +- +-#define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ ++#if defined(_M_ARM64) ++ #pragma intrinsic(__umulh) ++ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ ++ do { *lo = a * b; *hi = __umulh(a, b); } while(0) ++#else ++ #pragma intrinsic(_umul128) ++ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ + do { *lo = _umul128(a, b, hi); } while(0) ++#endif + + #elif defined(BOTAN_USE_GCC_INLINE_ASM) + diff --git a/external_imported/vcpkg/ports/botan/portfile.cmake b/external_imported/vcpkg/ports/botan/portfile.cmake index 1852eb55e..ca6b08933 100644 --- a/external_imported/vcpkg/ports/botan/portfile.cmake +++ b/external_imported/vcpkg/ports/botan/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF d4bd416702a65eddcc14ee06b9c1b674631e6ae3 # 2.18.1 - SHA512 6c8a8a772ff926402aa77ea1156e8a6b8fcaa18514107c94e9d2c7c76daaf9a02ef8c5c249d1ddf56655bab0ecd0d91490d907fc2239259689662533089b09ad + REF fe62c1f5ce6c4379a52bd018c2ff68bed3024c4d # 2.19.1 + SHA512 09c5fdb3a05978373fb1512a7a9b5c3d89e6e103d7fe86a0e126c417117950c2a63559dc06e8a9c895c892e9fc3888d7ed97686e15d8c2fd941ddb629af0e5a0 HEAD_REF master PATCHES fix-generate-build-path.patch embed-debug-info.patch + arm64-windows.patch ) if(CMAKE_HOST_WIN32) @@ -70,10 +71,10 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") endif() - make_directory(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) + make_directory("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") set(configure_arguments --cpu=${BOTAN_FLAG_CPU} ${BOTAN_FLAG_SHARED} diff --git a/external_imported/vcpkg/ports/botan/vcpkg.json b/external_imported/vcpkg/ports/botan/vcpkg.json index 1bb8d4cb4..3fd59b318 100644 --- a/external_imported/vcpkg/ports/botan/vcpkg.json +++ b/external_imported/vcpkg/ports/botan/vcpkg.json @@ -1,11 +1,11 @@ { "name": "botan", - "version": "2.18.1", - "port-version": 10, + "version": "2.19.1", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", - "supports": "!(windows & arm)", + "supports": "!(arm & uwp)", "features": { "amalgamation": { "description": "Do an amalgamation build of the library" diff --git a/external_imported/vcpkg/ports/breakpad/fix-unordered_map.patch b/external_imported/vcpkg/ports/breakpad/fix-unordered_map.patch deleted file mode 100644 index 0d131d2b8..000000000 --- a/external_imported/vcpkg/ports/breakpad/fix-unordered_map.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common/unordered.h b/src/common/unordered.h -index c9cbd58..7743eda 100644 ---- a/src/common/unordered.h -+++ b/src/common/unordered.h -@@ -46,7 +46,8 @@ struct unordered_map : public __gnu_cxx::hash_map {}; - template > - struct unordered_set : public __gnu_cxx::hash_set {}; - --#elif defined(_LIBCPP_VERSION) // c++11 -+#elif (__cplusplus >= 201103L) || defined(_LIBCPP_VERSION) || \ -+ (defined(_MSC_VER) && (_MSC_VER >= 1800)) // c++11 - #include - #include - using std::unordered_map; diff --git a/external_imported/vcpkg/ports/breakpad/portfile.cmake b/external_imported/vcpkg/ports/breakpad/portfile.cmake index 9e083c42e..44c989599 100644 --- a/external_imported/vcpkg/ports/breakpad/portfile.cmake +++ b/external_imported/vcpkg/ports/breakpad/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/breakpad - REF 9c4671f2e3a63c0f155d9b2511192d0b5fa7f760 # accessed on 2020-09-14 - SHA512 4c9ed9b675a772f9a6a84692865381130901820cb395b725511e7a9e2cbf4aaa5212a9ef5f87086baf58bb9d729082232b564bd827a205f87b5c1ffc1c53892a + REF v2022.07.12 + SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f HEAD_REF master PATCHES fix-unique_ptr.patch - fix-unordered_map.patch ) if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) diff --git a/external_imported/vcpkg/ports/breakpad/vcpkg.json b/external_imported/vcpkg/ports/breakpad/vcpkg.json index 59d1b8f78..25dff5d4a 100644 --- a/external_imported/vcpkg/ports/breakpad/vcpkg.json +++ b/external_imported/vcpkg/ports/breakpad/vcpkg.json @@ -1,10 +1,10 @@ { "name": "breakpad", - "version-date": "2020-09-14", - "port-version": 5, + "version-date": "2022-07-12", + "port-version": 1, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", - "supports": "!uwp", + "supports": "!uwp & (!windows | !arm) & (!windows | !arm64)", "dependencies": [ "libdisasm", { diff --git a/external_imported/vcpkg/ports/brotli/portfile.cmake b/external_imported/vcpkg/ports/brotli/portfile.cmake index 9c1e3037d..e578bf3e2 100644 --- a/external_imported/vcpkg/ports/brotli/portfile.cmake +++ b/external_imported/vcpkg/ports/brotli/portfile.cmake @@ -11,20 +11,21 @@ vcpkg_from_github( fix-ios.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBROTLI_DISABLE_TESTS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBROTLI_DISABLE_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli") +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli) vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli) -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/unofficial-brotli") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/brotli/vcpkg.json b/external_imported/vcpkg/ports/brotli/vcpkg.json index c5b7fc09d..bfc8a62cc 100644 --- a/external_imported/vcpkg/ports/brotli/vcpkg.json +++ b/external_imported/vcpkg/ports/brotli/vcpkg.json @@ -1,7 +1,18 @@ { "name": "brotli", - "version-string": "1.0.9", - "port-version": 2, + "version": "1.0.9", + "port-version": 3, "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", - "homepage": "https://github.com/google/brotli" + "homepage": "https://github.com/google/brotli", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/brpc/brpc-1783.diff b/external_imported/vcpkg/ports/brpc/brpc-1783.diff new file mode 100644 index 000000000..40db5788a --- /dev/null +++ b/external_imported/vcpkg/ports/brpc/brpc-1783.diff @@ -0,0 +1,592 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 11db84d02..7592a1862 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -56,7 +56,7 @@ config_setting( + + COPTS = [ + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 057695afc..bfc9fe4f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG + if(WITH_MESALINK) + set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DUSE_MESALINK") + endif() +-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DBRPC_REVISION=\\\"${BRPC_REVISION}\\\" -D__STRICT_ANSI__") ++set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__=__unused__ -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DBRPC_REVISION=\\\"${BRPC_REVISION}\\\" -D__STRICT_ANSI__") + set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}") + set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer") + set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer") +diff --git a/Makefile b/Makefile +index e2e1a6b2e..da506f7c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,10 +20,9 @@ include config.mk + + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-# 3. Removed -Werror: Not block compilation for non-vital warnings, especially when the ++# 2. Removed -Werror: Not block compilation for non-vital warnings, especially when the + # code is tested on newer systems. If the code is used in production, add -Werror back +-CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell ./tools/get_brpc_revision.sh .)\" ++CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell ./tools/get_brpc_revision.sh .)\" + CXXFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer -std=c++0x + CFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer + DEBUG_CXXFLAGS = $(filter-out -DNDEBUG,$(CXXFLAGS)) -DUNIT_TEST -DBVAR_NOT_LINK_DEFAULT_VARIABLES +diff --git a/config_brpc.sh b/config_brpc.sh +index 842f100f9..cf04b7260 100755 +--- a/config_brpc.sh ++++ b/config_brpc.sh +@@ -320,6 +320,10 @@ append_to_output "STATIC_LINKINGS=$STATIC_LINKINGS" + append_to_output "DYNAMIC_LINKINGS=$DYNAMIC_LINKINGS" + CPPFLAGS="-DBRPC_WITH_GLOG=$WITH_GLOG -DGFLAGS_NS=$GFLAGS_NS" + ++# Avoid over-optimizations of TLS variables by GCC>=4.8 ++# See: https://github.com/apache/incubator-brpc/issues/1693 ++CPPFLAGS="${CPPFLAGS} -D__const__=__unused__" ++ + if [ ! -z "$DEBUGSYMBOLS" ]; then + CPPFLAGS="${CPPFLAGS} $DEBUGSYMBOLS" + fi +diff --git a/docs/cn/getting_started.md b/docs/cn/getting_started.md +index 2602f5b41..56f80db3b 100644 +--- a/docs/cn/getting_started.md ++++ b/docs/cn/getting_started.md +@@ -290,7 +290,7 @@ GCC7中over-aligned的问题暂时被禁止。 + + 使用其他版本的gcc可能会产生编译警告，请联系我们予以修复。 + +-请在makefile中给cxxflags增加`-D__const__=`选项以避免[gcc4+中的errno问题](thread_local.md). ++请在makefile中给cxxflags增加`-D__const__=__unused__`选项以避免[gcc4+中的errno问题](thread_local.md). + + ## Clang: 3.5-4.0 + +diff --git a/docs/cn/thread_local.md b/docs/cn/thread_local.md +index f8e1a491e..41e024749 100644 +--- a/docs/cn/thread_local.md ++++ b/docs/cn/thread_local.md +@@ -57,9 +57,8 @@ Use *p ... - still the errno of original pthread, undefined b + + 严格地说这个问题不是gcc4导致的，而是glibc给__errno_location的签名不够准确，一个返回thread-local指针的函数依赖于段寄存器（TLS的一般实现方式），这怎么能算const呢？由于我们还未找到覆盖__errno_location的方法，所以这个问题目前实际的解决方法是： + +-**务必在直接或间接使用bthread的项目的gcc编译选项中添加`-D__const__=`，即把`__const__`定义为空，避免gcc4做相关优化。** ++**务必在直接或间接使用bthread的项目的gcc编译选项中添加`-D__const__=__unused__`，即把`__const__`定义为一个无副作用的属性，避免gcc4做相关优化。** + +-把`__const__`定义为空对程序其他部分的影响几乎为0。另外如果你没有**直接**使用errno（即你的项目中没有出现errno），或使用的是gcc +-3.4，即使没有定义`-D__const__=`，程序的正确性也不会受影响，但为了防止未来可能的问题，我们强烈建议加上。 ++把`__const__`定义为`__unused__`对程序其他部分的影响几乎为0。另外如果你没有**直接**使用errno（即你的项目中没有出现errno），或使用的是gcc 3.4，即使没有定义`-D__const__=__unused__`，程序的正确性也不会受影响，但为了防止未来可能的问题，我们强烈建议加上。 + +-需要说明的是，和errno类似，pthread_self也有类似的问题，不过一般pthread_self除了打日志没有其他用途，影响面较小，在`-D__const__=`后pthread_self也会正常。 ++需要说明的是，和errno类似，pthread_self也有类似的问题，不过一般pthread_self除了打日志没有其他用途，影响面较小，在`-D__const__=__unused__`后pthread_self也会正常。 +diff --git a/docs/en/getting_started.md b/docs/en/getting_started.md +index c500f5807..4242f82a0 100644 +--- a/docs/en/getting_started.md ++++ b/docs/en/getting_started.md +@@ -297,7 +297,7 @@ The over-aligned issues in GCC7 is suppressed temporarily now. + + Using other versions of gcc may generate warnings, contact us to fix. + +-Adding `-D__const__=` to cxxflags in your makefiles is a must to avoid [errno issue in gcc4+](thread_local.md). ++Adding `-D__const__=__unused__` to cxxflags in your makefiles is a must to avoid [errno issue in gcc4+](thread_local.md). + + ## Clang: 3.5-4.0 + +diff --git a/example/BUILD b/example/BUILD +index ee2c6ffd0..d688749d8 100644 +--- a/example/BUILD ++++ b/example/BUILD +@@ -16,7 +16,7 @@ + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/example/asynchronous_echo_c++/CMakeLists.txt b/example/asynchronous_echo_c++/CMakeLists.txt +index 18fec20ee..4a118b19a 100644 +--- a/example/asynchronous_echo_c++/CMakeLists.txt ++++ b/example/asynchronous_echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/auto_concurrency_limiter/CMakeLists.txt b/example/auto_concurrency_limiter/CMakeLists.txt +index ef20bf0a7..88b784277 100644 +--- a/example/auto_concurrency_limiter/CMakeLists.txt ++++ b/example/auto_concurrency_limiter/CMakeLists.txt +@@ -70,7 +70,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/backup_request_c++/CMakeLists.txt b/example/backup_request_c++/CMakeLists.txt +index d247bc150..fc39ba3cd 100644 +--- a/example/backup_request_c++/CMakeLists.txt ++++ b/example/backup_request_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/cancel_c++/CMakeLists.txt b/example/cancel_c++/CMakeLists.txt +index 26f2581ba..ea611e03f 100644 +--- a/example/cancel_c++/CMakeLists.txt ++++ b/example/cancel_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/cascade_echo_c++/CMakeLists.txt b/example/cascade_echo_c++/CMakeLists.txt +index 24d9249ae..6ca2e25dc 100644 +--- a/example/cascade_echo_c++/CMakeLists.txt ++++ b/example/cascade_echo_c++/CMakeLists.txt +@@ -80,7 +80,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/dynamic_partition_echo_c++/CMakeLists.txt b/example/dynamic_partition_echo_c++/CMakeLists.txt +index 5a268a6c9..8df3ad62e 100644 +--- a/example/dynamic_partition_echo_c++/CMakeLists.txt ++++ b/example/dynamic_partition_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/echo_c++/CMakeLists.txt b/example/echo_c++/CMakeLists.txt +index 4e6f5231d..d7babd7f7 100644 +--- a/example/echo_c++/CMakeLists.txt ++++ b/example/echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/echo_c++/Makefile b/example/echo_c++/Makefile +index 710cc7eda..fddde8cbc 100644 +--- a/example/echo_c++/Makefile ++++ b/example/echo_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../.. + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/grpc_c++/CMakeLists.txt b/example/grpc_c++/CMakeLists.txt +index 5f9032e1c..49010e963 100644 +--- a/example/grpc_c++/CMakeLists.txt ++++ b/example/grpc_c++/CMakeLists.txt +@@ -75,7 +75,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/http_c++/CMakeLists.txt b/example/http_c++/CMakeLists.txt +index 388b58c2e..34f3050fa 100644 +--- a/example/http_c++/CMakeLists.txt ++++ b/example/http_c++/CMakeLists.txt +@@ -86,7 +86,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/http_c++/Makefile b/example/http_c++/Makefile +index dc9d430f6..515456559 100644 +--- a/example/http_c++/Makefile ++++ b/example/http_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/memcache_c++/CMakeLists.txt b/example/memcache_c++/CMakeLists.txt +index 2554b8295..85b4affcb 100644 +--- a/example/memcache_c++/CMakeLists.txt ++++ b/example/memcache_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/memcache_c++/Makefile b/example/memcache_c++/Makefile +index 2579f68f4..03b3d4cd7 100644 +--- a/example/memcache_c++/Makefile ++++ b/example/memcache_c++/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRS+=$(BRPC_PATH)/output/include + LIBS+=$(BRPC_PATH)/output/lib + HDRPATHS = $(addprefix -I, $(HDRS)) +diff --git a/example/multi_threaded_echo_c++/CMakeLists.txt b/example/multi_threaded_echo_c++/CMakeLists.txt +index c68010dc1..4a7291c47 100644 +--- a/example/multi_threaded_echo_c++/CMakeLists.txt ++++ b/example/multi_threaded_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/multi_threaded_echo_c++/Makefile b/example/multi_threaded_echo_c++/Makefile +index 558b77c36..cd344f98d 100644 +--- a/example/multi_threaded_echo_c++/Makefile ++++ b/example/multi_threaded_echo_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../.. + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/multi_threaded_echo_fns_c++/CMakeLists.txt b/example/multi_threaded_echo_fns_c++/CMakeLists.txt +index 148490a05..8345076eb 100644 +--- a/example/multi_threaded_echo_fns_c++/CMakeLists.txt ++++ b/example/multi_threaded_echo_fns_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/nshead_extension_c++/CMakeLists.txt b/example/nshead_extension_c++/CMakeLists.txt +index 72c9b4183..b0b93a23d 100644 +--- a/example/nshead_extension_c++/CMakeLists.txt ++++ b/example/nshead_extension_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/nshead_pb_extension_c++/CMakeLists.txt b/example/nshead_pb_extension_c++/CMakeLists.txt +index 82c055bab..448c7070f 100644 +--- a/example/nshead_pb_extension_c++/CMakeLists.txt ++++ b/example/nshead_pb_extension_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/parallel_echo_c++/CMakeLists.txt b/example/parallel_echo_c++/CMakeLists.txt +index 65b251530..b24bb41f9 100644 +--- a/example/parallel_echo_c++/CMakeLists.txt ++++ b/example/parallel_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/partition_echo_c++/CMakeLists.txt b/example/partition_echo_c++/CMakeLists.txt +index fecdfa0c3..25d98dbe5 100644 +--- a/example/partition_echo_c++/CMakeLists.txt ++++ b/example/partition_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/redis_c++/CMakeLists.txt b/example/redis_c++/CMakeLists.txt +index f1bafece8..a7b008b5a 100644 +--- a/example/redis_c++/CMakeLists.txt ++++ b/example/redis_c++/CMakeLists.txt +@@ -90,7 +90,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/redis_c++/Makefile b/example/redis_c++/Makefile +index 4ba9505f0..7c94e195d 100644 +--- a/example/redis_c++/Makefile ++++ b/example/redis_c++/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRS+=$(BRPC_PATH)/output/include + LIBS+=$(BRPC_PATH)/output/lib + HDRPATHS = $(addprefix -I, $(HDRS)) +diff --git a/example/selective_echo_c++/CMakeLists.txt b/example/selective_echo_c++/CMakeLists.txt +index 74135282e..7d65c7759 100644 +--- a/example/selective_echo_c++/CMakeLists.txt ++++ b/example/selective_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/session_data_and_thread_local/CMakeLists.txt b/example/session_data_and_thread_local/CMakeLists.txt +index 120f92e22..28ba03565 100644 +--- a/example/session_data_and_thread_local/CMakeLists.txt ++++ b/example/session_data_and_thread_local/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/streaming_echo_c++/CMakeLists.txt b/example/streaming_echo_c++/CMakeLists.txt +index 57fe261e7..34e041d77 100644 +--- a/example/streaming_echo_c++/CMakeLists.txt ++++ b/example/streaming_echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/thrift_extension_c++/Makefile b/example/thrift_extension_c++/Makefile +index 980b2085b..47b381fdb 100644 +--- a/example/thrift_extension_c++/Makefile ++++ b/example/thrift_extension_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -g -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/src/butil/errno.h b/src/butil/errno.h +index 0390a840b..14856eeb6 100644 +--- a/src/butil/errno.h ++++ b/src/butil/errno.h +@@ -22,7 +22,12 @@ + #ifndef BUTIL_BAIDU_ERRNO_H + #define BUTIL_BAIDU_ERRNO_H + +-#define __const__ ++#ifndef __const__ ++// Avoid over-optimizations of TLS variables by GCC>=4.8 ++// See: https://github.com/apache/incubator-brpc/issues/1693 ++#define __const__ __unused__ ++#endif ++ + #include // errno + #include "butil/macros.h" // BAIDU_CONCAT + +diff --git a/test/BUILD.bazel b/test/BUILD.bazel +index c4649ab12..a170eaf8c 100644 +--- a/test/BUILD.bazel ++++ b/test/BUILD.bazel +@@ -24,7 +24,7 @@ config_setting( + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index f3e0c9bb3..980794f5f 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -52,7 +52,7 @@ else() + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES -D__STRICT_ANSI__ -include ${PROJECT_SOURCE_DIR}/test/sstream_workaround.h") ++set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__=__unused__ -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES -D__STRICT_ANSI__ -include ${PROJECT_SOURCE_DIR}/test/sstream_workaround.h") + set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -g -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer") + use_cxx11() + +diff --git a/test/Makefile b/test/Makefile +index 99f7b4f74..5aa90e8be 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -18,7 +18,7 @@ + NEED_GPERFTOOLS=1 + NEED_GTEST=1 + include ../config.mk +-CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES --include sstream_workaround.h ++CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES --include sstream_workaround.h + CXXFLAGS=$(CPPFLAGS) -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer -std=c++0x + + #required by butil/crc32.cc to boost performance for 10x +diff --git a/tools/BUILD b/tools/BUILD +index 99f472fda..04b3abbf9 100644 +--- a/tools/BUILD ++++ b/tools/BUILD +@@ -16,7 +16,7 @@ + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/tools/parallel_http/Makefile b/tools/parallel_http/Makefile +index 5b8664708..a57c5d5f5 100644 +--- a/tools/parallel_http/Makefile ++++ b/tools/parallel_http/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_press/Makefile b/tools/rpc_press/Makefile +index c1d866d05..8cae3033c 100644 +--- a/tools/rpc_press/Makefile ++++ b/tools/rpc_press/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_replay/Makefile b/tools/rpc_replay/Makefile +index fcd5eb6f9..8f4eadde8 100644 +--- a/tools/rpc_replay/Makefile ++++ b/tools/rpc_replay/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_view/Makefile b/tools/rpc_view/Makefile +index c654cfd5a..13f026cbe 100644 +--- a/tools/rpc_view/Makefile ++++ b/tools/rpc_view/Makefile +@@ -19,8 +19,7 @@ BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/trackme_server/Makefile b/tools/trackme_server/Makefile +index 79e8536d0..5bdd53f86 100644 +--- a/tools/trackme_server/Makefile ++++ b/tools/trackme_server/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a diff --git a/external_imported/vcpkg/ports/brpc/fix_boost_ptr.patch b/external_imported/vcpkg/ports/brpc/fix-boost-ptr.patch similarity index 92% rename from external_imported/vcpkg/ports/brpc/fix_boost_ptr.patch rename to external_imported/vcpkg/ports/brpc/fix-boost-ptr.patch index 4ced79422..bd468ee8a 100644 --- a/external_imported/vcpkg/ports/brpc/fix_boost_ptr.patch +++ b/external_imported/vcpkg/ports/brpc/fix-boost-ptr.patch @@ -1,5 +1,5 @@ diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp -index eae081a0..39c92338 100755 +index 9871c01..269cfe1 100644 --- a/src/brpc/policy/thrift_protocol.cpp +++ b/src/brpc/policy/thrift_protocol.cpp @@ -45,8 +45,7 @@ diff --git a/external_imported/vcpkg/ports/brpc/fix-build.patch b/external_imported/vcpkg/ports/brpc/fix-build.patch new file mode 100644 index 000000000..3b764730d --- /dev/null +++ b/external_imported/vcpkg/ports/brpc/fix-build.patch @@ -0,0 +1,200 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5f46dc0..fe12819 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,7 @@ option(WITH_DEBUG_SYMBOLS "With debug symbols" ON) + option(WITH_THRIFT "With thrift framed protocol supported" OFF) + option(WITH_SNAPPY "With snappy" OFF) + option(BUILD_UNIT_TESTS "Whether to build unit tests" OFF) +-option(BUILD_BRPC_TOOLS "Whether to build brpc tools" ON) ++option(BUILD_BRPC_TOOLS "Whether to build brpc tools" OFF) + option(DOWNLOAD_GTEST "Download and build a fresh copy of googletest. Requires Internet access." ON) + + # Enable MACOSX_RPATH. Run "cmake --help-policy CMP0042" for policy details. +@@ -65,7 +65,8 @@ endif() + + if(WITH_THRIFT) + set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") +- set(THRIFT_LIB "thrift") ++ find_package(Thrift CONFIG REQUIRED) ++ set(THRIFT_LIB "thrift::thrift") + endif() + + include(GNUInstallDirs) +@@ -144,11 +145,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + +-find_package(Protobuf REQUIRED) ++find_package(protobuf CONFIG REQUIRED) ++get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES) ++set(PROTOBUF_LIBRARIES protobuf::libprotobuf) + find_package(Threads REQUIRED) + +-find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h) +-find_library(LEVELDB_LIB NAMES leveldb) ++find_package(leveldb CONFIG REQUIRED) ++set(LEVELDB_INCLUDE_PATH ${PROTOBUF_INCLUDE_DIR}) ++set(LEVELDB_LIB leveldb::leveldb) + if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() +@@ -163,8 +167,9 @@ if(WITH_SNAPPY) + endif() + + if(WITH_GLOG) +- find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h) +- find_library(GLOG_LIB NAMES glog) ++ find_package(glog CONFIG REQUIRED) ++ get_target_property(GLOG_INCLUDE_PATH glog::glog INTERFACE_INCLUDE_DIRECTORIES) ++ set(GLOG_LIB glog::glog) + if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB)) + message(FATAL_ERROR "Fail to find glog") + endif() +@@ -182,7 +187,7 @@ if(WITH_MESALINK) + include_directories(${MESALINK_INCLUDE_PATH}) + endif() + +-find_library(PROTOC_LIB NAMES protoc) ++set(PROTOC_LIB "protobuf::libprotoc") + if(NOT PROTOC_LIB) + message(FATAL_ERROR "Fail to find protoc lib") + endif() +@@ -193,7 +198,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + ) + endif() + +-find_package(OpenSSL) ++find_package(OpenSSL REQUIRED) + + include_directories( + ${GFLAGS_INCLUDE_PATH} +@@ -208,9 +213,9 @@ set(DYNAMIC_LIB + ${LEVELDB_LIB} + ${PROTOC_LIB} + ${CMAKE_THREAD_LIBS_INIT} +- ${THRIFT_LIB} +- ${THRIFTNB_LIB} + ${OPENSSL_CRYPTO_LIBRARY} ++ ${OPENSSL_SSL_LIBRARY} ++ ${THRIFT_LIB} + dl + z) + +diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake +index dfad5fd..83a167f 100644 +--- a/cmake/FindGFLAGS.cmake ++++ b/cmake/FindGFLAGS.cmake +@@ -15,7 +15,8 @@ + + set(_gflags_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + +-find_path(GFLAGS_INCLUDE_PATH gflags/gflags.h) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) + + if (GFLAGS_STATIC) + if (WIN32) +@@ -24,7 +25,7 @@ if (GFLAGS_STATIC) + set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) + endif (WIN32) + endif (GFLAGS_STATIC) +-find_library(GFLAGS_LIBRARY NAMES gflags libgflags) ++set(GFLAGS_LIBRARY gflags::gflags) + if(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) + set(GFLAGS_FOUND TRUE) + endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 209c0e2..b9434ee 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -30,17 +30,22 @@ add_dependencies(SOURCES_LIB PROTO_LIB) + # shared library needs POSITION_INDEPENDENT_CODE + set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) + set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) +- ++if(NOT BUILD_SHARED_LIBS) + add_library(brpc-static STATIC $ + $ + $) + +-if(BRPC_WITH_THRIFT) ++if(WITH_THRIFT) + target_link_libraries(brpc-static thrift) + endif() +- ++target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB}) ++if(BRPC_WITH_GLOG) ++ target_link_libraries(brpc-static ${GLOG_LIB}) ++endif() ++target_include_directories(brpc-static PUBLIC $) + SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) +- ++endif() ++if(0) + # for protoc-gen-mcpack + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) + +@@ -49,35 +54,56 @@ set(protoc_gen_mcpack_SOURCES + ) + + add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) +- ++endif() + if(BUILD_SHARED_LIBS) + add_library(brpc-shared SHARED $ + $ + $) + target_link_libraries(brpc-shared ${DYNAMIC_LIB}) ++ target_include_directories(brpc-shared PUBLIC $) + if(BRPC_WITH_GLOG) + target_link_libraries(brpc-shared ${GLOG_LIB}) + endif() +- if(BRPC_WITH_THRIFT) ++ if(WITH_THRIFT) + target_link_libraries(brpc-shared thrift) + endif() + SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) + + target_link_libraries(protoc-gen-mcpack brpc-shared ${DYNAMIC_LIB} pthread) + +- install(TARGETS brpc-shared ++ install(TARGETS brpc-shared EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + else() +- target_link_libraries(protoc-gen-mcpack brpc-static ${BRPC_PRIVATE_LIBS} pthread) + endif() + + +- +-install(TARGETS brpc-static ++if(NOT BUILD_SHARED_LIBS) ++install(TARGETS brpc-static EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) ++endif() ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(Threads) ++find_dependency(gflags CONFIG) ++find_dependency(protobuf CONFIG) ++find_dependency(leveldb CONFIG) ++find_dependency(Thrift CONFIG) ++find_dependency(glog CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-brpcTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" DESTINATION share/unofficial-brpc) ++ ++install(EXPORT unofficial-brpcTargets ++ NAMESPACE unofficial::brpc:: ++ DESTINATION share/unofficial-brpc ++) diff --git a/external_imported/vcpkg/ports/brpc/fix_thrift.patch b/external_imported/vcpkg/ports/brpc/fix_thrift.patch deleted file mode 100644 index 699f42fb0..000000000 --- a/external_imported/vcpkg/ports/brpc/fix_thrift.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3deb7342..737f6a70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,8 +62,10 @@ if(WITH_DEBUG_SYMBOLS) - endif() - - if(WITH_THRIFT) -+ find_package(Thrift CONFIG REQUIRED) -+ # target_link_libraries(main PRIVATE thrift::thrift thriftz::thriftz thriftnb::thriftnb) - set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") -- set(THRIFT_LIB "thrift") -+ set(THRIFT_LIB "thrift::thrift") - endif() - - include(GNUInstallDirs) -@@ -196,9 +198,10 @@ set(DYNAMIC_LIB - ${LEVELDB_LIB} - ${PROTOC_LIB} - ${CMAKE_THREAD_LIBS_INIT} -+ ${OPENSSL_CRYPTO_LIBRARY} -+ ${OPENSSL_SSL_LIBRARY} - ${THRIFT_LIB} - ${THRIFTNB_LIB} -- ${OPENSSL_CRYPTO_LIBRARY} - dl - z) - diff --git a/external_imported/vcpkg/ports/brpc/portfile.cmake b/external_imported/vcpkg/ports/brpc/portfile.cmake index ed0ff3acf..a2353e2a3 100644 --- a/external_imported/vcpkg/ports/brpc/portfile.cmake +++ b/external_imported/vcpkg/ports/brpc/portfile.cmake @@ -1,33 +1,29 @@ -vcpkg_download_distfile(patch1679 - URLS "https://patch-diff.githubusercontent.com/raw/apache/incubator-brpc/pull/1679.diff" - FILENAME "apache-incubator-brpc-1679.diff" - SHA512 4b1e5717b44aa6a741ddd49b1408e3e556f6d845d5e8a5cfccf2f2d7ebe39aed19c3dad703db7a9ebd0446ac1f225e7dbdd2ff1f23f34fd60c3ef59aaa07b789 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/incubator-brpc - REF 1d6510aa50075cade5ed539ee09a11a1b8d7f990 # 0.9.7 - SHA512 9c9dbe2a202e58586010c56634bd371f6a9e3ff0d8c5341abbabd1f1dd204a3aec5e89061fa326b4fc8ae7202f9fc33f93a5acd845d18dab3915a3e2b81cbaf3 + REF 29491107cbf405a494aaf80ee32344ba34e1d7e4 #1.2.0 + SHA512 bd4c67967796592030903041ddb9205e24c9f196e63ebc153e08fbce723d93d27cd4f30f3c2cf904a93cda66ffa9db7d465d6e5fdac27a045ae84afad3dd1dc3 HEAD_REF master PATCHES - fix_boost_ptr.patch - fix_thrift.patch - ${patch1679} + fix-build.patch + fix-boost-ptr.patch + brpc-1783.diff #https://github.com/apache/incubator-brpc/pull/1783 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DWITH_THRIFT=ON -DWITH_MESALINK=OFF -DWITH_GLOG=ON + -DDOWNLOAD_GTEST=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-brpc CONFIG_PATH share/unofficial-brpc) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash") vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/brpc/vcpkg.json b/external_imported/vcpkg/ports/brpc/vcpkg.json index 67c0e3119..eb3fca14c 100644 --- a/external_imported/vcpkg/ports/brpc/vcpkg.json +++ b/external_imported/vcpkg/ports/brpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brpc", - "version": "0.9.7", - "port-version": 7, + "version": "1.2.0", + "port-version": 1, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", @@ -24,6 +24,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/brunocodutra-metal/portfile.cmake b/external_imported/vcpkg/ports/brunocodutra-metal/portfile.cmake index 8e43dca25..7dc6ce530 100644 --- a/external_imported/vcpkg/ports/brunocodutra-metal/portfile.cmake +++ b/external_imported/vcpkg/ports/brunocodutra-metal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brunocodutra/metal - REF 2.1.3 - SHA512 7a71f8bdbdb8a19084d0cabd4c78a4f2990514f2da56312aec8dfac02f6781c95f28bc33815ecbb3d9e3e8d2b47cc5dbcd4917751195a8318bea7c08fca29b23 + REF 9db9b403e58e0be0bbd295ff64f01e700965f25d + SHA512 b611d88d310893329f48111716c849571cb1459da1e71851bf3ec7393f18f8eb94077ce12410a9bcb1953e6b4ea0e8f2d2db5ce7f555a72ab2b7dae434b52d62 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/brunocodutra-metal/vcpkg.json b/external_imported/vcpkg/ports/brunocodutra-metal/vcpkg.json index b2d73955d..400950a7c 100644 --- a/external_imported/vcpkg/ports/brunocodutra-metal/vcpkg.json +++ b/external_imported/vcpkg/ports/brunocodutra-metal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brunocodutra-metal", - "version": "2.1.3", + "version": "2.1.4", "description": "A single header C++11 library designed to make you love template metaprogramming", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/brynet/portfile.cmake b/external_imported/vcpkg/ports/brynet/portfile.cmake index fc3865a37..b8c48d531 100644 --- a/external_imported/vcpkg/ports/brynet/portfile.cmake +++ b/external_imported/vcpkg/ports/brynet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IronsDu/brynet - REF 4d162460372b2385cea121da0403f55582b4e39b # v1.11.2 - SHA512 656e8e0bdf44e2fb9f17c622d517cafc5ff965402ccab4b96e6f4663e715396a962df0ebb2baaec871336e27c0129ceb47b80352bfcd28cdff731d46aad08d8a + REF 4739b5409ce1c9df055ae77f76fb055ca58b34da # v1.12.1 + SHA512 66f06cd6de9e516df7cadeb3b525ca74a8a9747840149686250e54dd4d8c044f6031fcefe9ca392f939f68fda821f6bcebd3a797ca1da11d34405d0a87ebae88 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/brynet/vcpkg.json b/external_imported/vcpkg/ports/brynet/vcpkg.json index 026f2d895..a6d8ef450 100644 --- a/external_imported/vcpkg/ports/brynet/vcpkg.json +++ b/external_imported/vcpkg/ports/brynet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brynet", - "version": "1.11.2", + "version": "1.12.1", "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", "homepage": "https://github.com/IronsDu/brynet" } diff --git a/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake b/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake index b95869349..b0ebdd28f 100644 --- a/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake +++ b/external_imported/vcpkg/ports/bshoshany-thread-pool/portfile.cmake @@ -1,19 +1,13 @@ -#header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v2.0.0 - SHA512 eac1674ea999d25d8d0b8f1b24714830330ba4d345e3f730e49359bae89d9259e429d48357a45f7b4355cbbe1a63f04e7fe2c4e0be08b3bbea51018c62721fcc + REF v3.3.0 + SHA512 980c8dfe90e04cbc622ee4ae2ce67444069311619f0dc5d7ac3b3a3ea59ead42d4c867e669e8ce9c71cdc2a4bae431402a8f5032ab29fdfc1ca507b0e7102d8f HEAD_REF master ) -# Install headers (header-only): file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") -file(INSTALL - "${HEADER_FILES}" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" -) +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json b/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json index 86058533b..f13c66749 100644 --- a/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json +++ b/external_imported/vcpkg/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,9 @@ { "name": "bshoshany-thread-pool", - "version": "2.0.0", - "description": "A C++17 Thread Pool for High-Performance Scientific Computing", - "homepage": "https://github.com/bshoshany/thread-pool" + "version": "3.3.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", + "documentation": "https://github.com/bshoshany/thread-pool/blob/master/README.md", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake b/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake index 2b7f7c7fd..fbae2b34a 100644 --- a/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake +++ b/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux-mariadb-client - REF bb078afd7e7287f9c3220b889e8206d5a841b185 # v1.0.1 - SHA512 96cc0a40809f13d4a49e849306eed96dc2bc00998612344801df7d664f8a0a9cfa646b70927747d1decbca48cf5ff9502796b7738b106e9b68a4564abd981ce9 + REF aa7a543ed98081f357f1f27e2d77b66b81d727d6 # v1.0.3 + SHA512 35877ec1f17f43c4215c2662613ec00fc4e8a851087809aadcf4770ef1691b645a6804bfd12124af39db9338e28e9c1ed87fe03bf38e1675651a9c325df23b24 HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json b/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json index 1f70c38e1..4c20b9246 100644 --- a/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json +++ b/external_imported/vcpkg/ports/buck-yeh-bux-mariadb-client/vcpkg.json @@ -1,10 +1,11 @@ { "name": "buck-yeh-bux-mariadb-client", - "version": "1.0.1", + "version": "1.0.3", "port-version": 1, "description": "Loose-coupled throw-on-error C++20 wrapper classes and utilities over mysql/mariadb Connector/C API", "homepage": "https://github.com/buck-yeh/bux-mariadb-client", - "supports": "!(arm | uwp | osx)", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", "dependencies": [ "buck-yeh-bux", "fmt", diff --git a/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake b/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake new file mode 100644 index 000000000..6846f4601 --- /dev/null +++ b/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO buck-yeh/bux-sqlite + REF e8ab90da9586f61024b59aa1a4900efb94f1d3f4 # v1.0.1 + SHA512 27acefdb32dd00dbbef91479b5e682cf6a9281e13a596128d5050fe44ed4b8669d5e7279b4db30efbd4d016d268c6f2ce893f91bbdddff17f2a227ba3a292d01 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json b/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json new file mode 100644 index 000000000..17dae253f --- /dev/null +++ b/external_imported/vcpkg/ports/buck-yeh-bux-sqlite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "buck-yeh-bux-sqlite", + "version": "1.0.1", + "description": "Modern C++ wrapper classes and utilities of the original sqlite3 API", + "homepage": "https://github.com/buck-yeh/bux-sqlite", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", + "dependencies": [ + "buck-yeh-bux", + "fmt", + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/buck-yeh-bux/fix-clang-cl.patch b/external_imported/vcpkg/ports/buck-yeh-bux/fix-clang-cl.patch new file mode 100644 index 000000000..a9ec8a8ab --- /dev/null +++ b/external_imported/vcpkg/ports/buck-yeh-bux/fix-clang-cl.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 306074e50..a032ab09e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,13 +5,13 @@ project(bux) + set(GNU_LIKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wconversion -Wno-parentheses -g3 -Og -std=c++20") + #string(APPEND CMAKE_CXX_FLAGS " -g3") + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MSVC) + message("Clang") + string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS} -Wno-potentially-evaluated-expression") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + message("GNU") + string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS}") +-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++elseif(MSVC) + message("MSVC") + string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /std:c++latest /MP") + else() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 093a1da8d..8de40efa4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,7 +8,7 @@ add_library(bux STATIC + XConsole.cpp XException.cpp + ) + target_include_directories(bux PRIVATE ../include/bux) +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + target_link_libraries(bux PRIVATE fmt::fmt) + endif() + diff --git a/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch b/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch deleted file mode 100644 index 1f9ff4768..000000000 --- a/external_imported/vcpkg/ports/buck-yeh-bux/fix-errorC7595.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/XException.cpp b/src/XException.cpp -index 6a66347..53a0087 100644 ---- a/src/XException.cpp -+++ b/src/XException.cpp -@@ -49,8 +49,8 @@ LONG WINAPI usrSEH(_EXCEPTION_POINTERS *pInfo) - RUNTIME_ERROR("code 0x{:x}, flags 0x{:x}, extra 0x{:x}, ip 0x{:x}, arg#{:x}", - er->ExceptionCode, - er->ExceptionFlags, -- static_cast(er->ExceptionRecord), -- static_cast(er->ExceptionAddress), -+ (size_t)static_cast(er->ExceptionRecord), -+ (size_t)static_cast(er->ExceptionAddress), - er->NumberParameters); - } - return EXCEPTION_CONTINUE_SEARCH; diff --git a/external_imported/vcpkg/ports/buck-yeh-bux/portfile.cmake b/external_imported/vcpkg/ports/buck-yeh-bux/portfile.cmake index 78dc069d3..b6a7d3047 100644 --- a/external_imported/vcpkg/ports/buck-yeh-bux/portfile.cmake +++ b/external_imported/vcpkg/ports/buck-yeh-bux/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux - REF 8788509f0281e9a2af34c0399a45a5c9e66a4664 # v1.6.3 - SHA512 a7045a93d91e497ca2b60965bb2f098eae714d00feef0d252747178739cdd981f44cb8983278c679761f61e037da05889f22fa161d26fca05af511fc56c1ac8f + REF b046518dcffcdef9b8dbccd0accc2636df301766 # v1.6.6 + SHA512 af1ca5c37623a09c64e1a84a630a26911be8c87eb007b112665b7c6080dfac67bd89eb36367202c5d29af97f4e549d6f27e41410220a57bd7756bdb1ecf8ddf0 HEAD_REF main - PATCHES fix-errorC7595.patch + PATCHES fix-clang-cl.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json b/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json index 2275629c2..0eb486772 100644 --- a/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json +++ b/external_imported/vcpkg/ports/buck-yeh-bux/vcpkg.json @@ -1,10 +1,11 @@ { "name": "buck-yeh-bux", - "version": "1.6.3", + "version": "1.6.6", "port-version": 1, "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", - "supports": "!(arm | uwp | osx)", + "license": "MIT", + "supports": "!(arm | uwp | osx | linux)", "dependencies": [ "fmt", { diff --git a/external_imported/vcpkg/ports/bullet3/portfile.cmake b/external_imported/vcpkg/ports/bullet3/portfile.cmake index 4c70019d3..685d44da1 100644 --- a/external_imported/vcpkg/ports/bullet3/portfile.cmake +++ b/external_imported/vcpkg/ports/bullet3/portfile.cmake @@ -13,6 +13,9 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES multithreading BULLET2_MULTITHREADING + double-precision USE_DOUBLE_PRECISION + INVERTED_FEATURES + rtti USE_MSVC_DISABLE_RTTI ) vcpkg_cmake_configure( @@ -21,9 +24,13 @@ vcpkg_cmake_configure( -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON -DBUILD_CPU_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF + -DBUILD_OPENGL3_DEMOS=OFF -DBUILD_BULLET3=OFF - -DBUILD_EXTRAS=OFF - -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXTRAS=ON + -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF + -DBUILD_BULLET_ROBOTICS_EXTRA=OFF + -DBUILD_GIMPACTUTILS_EXTRA=OFF + -DBUILD_UNIT_TESTS=OFF -DINSTALL_LIBS=ON ${FEATURE_OPTIONS} ) diff --git a/external_imported/vcpkg/ports/bullet3/vcpkg.json b/external_imported/vcpkg/ports/bullet3/vcpkg.json index 50853901d..d9a5b050f 100644 --- a/external_imported/vcpkg/ports/bullet3/vcpkg.json +++ b/external_imported/vcpkg/ports/bullet3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bullet3", "version": "3.22", + "port-version": 1, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", "license": "Zlib", @@ -15,8 +16,14 @@ } ], "features": { + "double-precision": { + "description": "Use float64 doubles for bullet3" + }, "multithreading": { "description": "Multithreading functionality for bullet3" + }, + "rtti": { + "description": "Enable RTTI on windows" } } } diff --git a/external_imported/vcpkg/ports/bustache/LICENSE b/external_imported/vcpkg/ports/bustache/LICENSE deleted file mode 100644 index 6d2e4af1f..000000000 --- a/external_imported/vcpkg/ports/bustache/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2014-2018 Jamboree - -Distributed under the Boost Software License, Version 1.0. (See accompanying -file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/external_imported/vcpkg/ports/bustache/portfile.cmake b/external_imported/vcpkg/ports/bustache/portfile.cmake index 24c885770..b720f0249 100644 --- a/external_imported/vcpkg/ports/bustache/portfile.cmake +++ b/external_imported/vcpkg/ports/bustache/portfile.cmake @@ -6,16 +6,16 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/bustache/cmake") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/bustache/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# No license file --> use Readme +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/bustache/vcpkg.json b/external_imported/vcpkg/ports/bustache/vcpkg.json index 92e115408..fd4f73ddc 100644 --- a/external_imported/vcpkg/ports/bustache/vcpkg.json +++ b/external_imported/vcpkg/ports/bustache/vcpkg.json @@ -1,11 +1,20 @@ { "name": "bustache", - "version-string": "1.1.0", - "port-version": 1, + "version": "1.1.0", + "port-version": 2, "description": "C++11 implementation of {{ mustache }}", "homepage": "https://github.com/jamboree/bustache", + "license": "BSL-1.0", "dependencies": [ "boost-unordered", - "boost-utility" + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/c-ares/guard-imported-lib.patch b/external_imported/vcpkg/ports/c-ares/guard-imported-lib.patch new file mode 100644 index 000000000..8cb0de4dd --- /dev/null +++ b/external_imported/vcpkg/ports/c-ares/guard-imported-lib.patch @@ -0,0 +1,21 @@ +diff --git a/c-ares-config.cmake.in b/c-ares-config.cmake.in +index 464837b..b3c2bc4 100644 +--- a/c-ares-config.cmake.in ++++ b/c-ares-config.cmake.in +@@ -8,12 +8,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake") + set(c-ares_LIBRARY c-ares::cares) + + if(@CARES_SHARED@) ++ if(NOT TARGET c-ares::cares_shared) + add_library(c-ares::cares_shared INTERFACE IMPORTED) + set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + elseif(@CARES_STATIC@) ++ if(NOT TARGET c-ares::cares_static) + add_library(c-ares::cares_static INTERFACE IMPORTED) + set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") ++ endif() + endif() + + if(@CARES_STATIC@) diff --git a/external_imported/vcpkg/ports/c-ares/portfile.cmake b/external_imported/vcpkg/ports/c-ares/portfile.cmake index f21cd6c58..9e8f9d852 100644 --- a/external_imported/vcpkg/ports/c-ares/portfile.cmake +++ b/external_imported/vcpkg/ports/c-ares/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF main PATCHES avoid-docs.patch + guard-imported-lib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -28,17 +29,17 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/ares.h" "#ifdef CARES_STATICLIB" "#if 1" ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/c-ares/usage b/external_imported/vcpkg/ports/c-ares/usage new file mode 100644 index 000000000..f560e8d64 --- /dev/null +++ b/external_imported/vcpkg/ports/c-ares/usage @@ -0,0 +1,4 @@ +The package c-ares provides CMake targets: + + find_package(c-ares CONFIG REQUIRED) + target_link_libraries(main PRIVATE c-ares::cares) diff --git a/external_imported/vcpkg/ports/c-ares/vcpkg.json b/external_imported/vcpkg/ports/c-ares/vcpkg.json index b8f9a8746..488c5645a 100644 --- a/external_imported/vcpkg/ports/c-ares/vcpkg.json +++ b/external_imported/vcpkg/ports/c-ares/vcpkg.json @@ -1,9 +1,10 @@ { "name": "c-ares", "version-semver": "1.18.1", + "port-version": 1, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", - "license": "MIT", + "license": "MIT-CMU", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/c4core/portfile.cmake b/external_imported/vcpkg/ports/c4core/portfile.cmake index a21081923..fbfd0a0e3 100644 --- a/external_imported/vcpkg/ports/c4core/portfile.cmake +++ b/external_imported/vcpkg/ports/c4core/portfile.cmake @@ -4,76 +4,78 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/c4core - REF 636f507c33f0c79dce491aec066455ff384d49dc - SHA512 3282876be5883b047e8d25ee392f62d2e9ae79af8fdd65c11b1e36d2fdb0648230fe6c7fb57472a4cbced166979351f12494215aa664977a113b74c26bb6f19b + REF 8d1af00e2318e9d583c10fd3d89b8b1b1f923ea7 + SHA512 a9b4e418d31f00682f4a5224c685ebc3c1ef96a5334f1a42bfeea773dbdc7f4d67191ca0e91dca45130e4c385708c9530696b9b038bbdb03d7a331c87793185d HEAD_REF master ) set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) # Get cmake scripts for c4core -vcpkg_download_distfile(CMAKE_ARCHIVE +vcpkg_download_distfile( + CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" FILENAME "cmake-${CM_COMMIT_HASH}.zip" SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_CMAKE +vcpkg_extract_source_archive( + SOURCE_PATH_CMAKE ARCHIVE ${CMAKE_ARCHIVE} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" ) file(REMOVE_RECURSE "${SOURCE_PATH}/cmake") -file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/cmake") +file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/cmake") set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f) -vcpkg_download_distfile(DEBUGBREAK_ARCHIVE +vcpkg_download_distfile( + DEBUGBREAK_ARCHIVE URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip" FILENAME "debugbreak-${DB_COMMIT_HASH}.zip" SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_DEBUGBREAK +vcpkg_extract_source_archive( + SOURCE_PATH_DEBUGBREAK ARCHIVE ${DEBUGBREAK_ARCHIVE} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" ) file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak") -file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak") +file(RENAME "${SOURCE_PATH_DEBUGBREAK}" "${SOURCE_PATH}/src/c4/ext/debugbreak") set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209) -vcpkg_download_distfile(FAST_FLOAT_ARCHIVE +vcpkg_download_distfile( + FAST_FLOAT_ARCHIVE URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip" FILENAME "fast_float-${FF_COMMIT_HASH}.zip" SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_FAST_FLOAT +vcpkg_extract_source_archive( + SOURCE_PATH_FAST_FLOAT ARCHIVE ${FAST_FLOAT_ARCHIVE} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" ) file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float") -file(RENAME ${SOURCE_PATH_FAST_FLOAT} "${SOURCE_PATH}/src/c4/ext/fast_float") +file(RENAME "${SOURCE_PATH_FAST_FLOAT}" "${SOURCE_PATH}/src/c4/ext/fast_float") -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() if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/c4core) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c4core) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c4core) endif() # Fix paths in config file diff --git a/external_imported/vcpkg/ports/c4core/vcpkg.json b/external_imported/vcpkg/ports/c4core/vcpkg.json index e59d53476..cc75970c5 100644 --- a/external_imported/vcpkg/ports/c4core/vcpkg.json +++ b/external_imported/vcpkg/ports/c4core/vcpkg.json @@ -1,7 +1,18 @@ { "name": "c4core", - "version-date": "2021-07-18", - "port-version": 1, + "version": "0.1.9", "description": "Library of low-level C++ utilities", - "homepage": "https://github.com/biojppm/c4core" + "homepage": "https://github.com/biojppm/c4core", + "license": "MIT", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/c89stringutils/no_flags.patch b/external_imported/vcpkg/ports/c89stringutils/no_flags.patch new file mode 100644 index 000000000..b2842c86f --- /dev/null +++ b/external_imported/vcpkg/ports/c89stringutils/no_flags.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ce714554..f9f28b890 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,15 +18,7 @@ target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAK + set(gcc_like "$") + set(msvc "$") + # -g -fsanitize=address -fno-omit-frame-pointer +-target_compile_options( +- "${PROJECT_NAME}_compiler_flags" +- INTERFACE +- "$<${gcc_like}:$>" +- "$<${msvc}:$>" +-) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") +- set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + endif (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + + # configure a header file to pass the version number only diff --git a/external_imported/vcpkg/ports/c89stringutils/portfile.cmake b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake index ae15441cb..06740ebcb 100644 --- a/external_imported/vcpkg/ports/c89stringutils/portfile.cmake +++ b/external_imported/vcpkg/ports/c89stringutils/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 375c87aaf50a945b17a76727f3314eb217897caf SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 HEAD_REF master + PATCHES + no_flags.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/c89stringutils/vcpkg.json b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json index 7a14d2046..4c2d06670 100644 --- a/external_imported/vcpkg/ports/c89stringutils/vcpkg.json +++ b/external_imported/vcpkg/ports/c89stringutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "c89stringutils", "version": "0.0.1", + "port-version": 1, "description": "string functions from newer standards / common non-standards for C89", "license": "Apache-2.0 OR MIT", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/c9y/portfile.cmake b/external_imported/vcpkg/ports/c9y/portfile.cmake new file mode 100644 index 000000000..0b44fd3a4 --- /dev/null +++ b/external_imported/vcpkg/ports/c9y/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/c9y + REF v0.4.0 + SHA512 496466a639fa1f4111583363ce13ce4f2c1d6a56763fd12f45acc2cb791f379a6d81545536186e8f0f72f19a9b5689d16fd0561345411ca1cb98a16447141114 + ) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +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/external_imported/vcpkg/ports/c9y/vcpkg.json b/external_imported/vcpkg/ports/c9y/vcpkg.json new file mode 100644 index 000000000..a0f025b33 --- /dev/null +++ b/external_imported/vcpkg/ports/c9y/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "c9y", + "version-semver": "0.4.0", + "description": "Concurency", + "homepage": "https://github.com/rioki/c9y", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/caf/fix_cxx17.patch b/external_imported/vcpkg/ports/caf/fix_cxx17.patch new file mode 100644 index 000000000..18094c07b --- /dev/null +++ b/external_imported/vcpkg/ports/caf/fix_cxx17.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ a/CMakeLists.txt +@@ -115,3 +115,4 @@ ++target_compile_features(caf_internal INTERFACE cxx_std_17) + # TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6 +-if(NOT CMAKE_CROSSCOMPILING) ++if(0) + try_compile(caf_has_cxx_17 diff --git a/external_imported/vcpkg/ports/caf/portfile.cmake b/external_imported/vcpkg/ports/caf/portfile.cmake index 128eb5bee..c186a2272 100644 --- a/external_imported/vcpkg/ports/caf/portfile.cmake +++ b/external_imported/vcpkg/ports/caf/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5 - SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039 + REF bfa0f83dd5c9151c263c304300c79161ae8cb595 # 0.18.6 + SHA512 58ebd40623edc0245dd38b3a2bbbda7af7d9b030155746949dfe7c4c30bdc07ee2ee84d195dc2e914d69f58c6c46bc9ad496bbc34e7cafe0530200458a4c5a76 HEAD_REF master PATCHES fix_dependency.patch + fix_cxx17.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/caf/vcpkg.json b/external_imported/vcpkg/ports/caf/vcpkg.json index 71bb38468..5d89216c3 100644 --- a/external_imported/vcpkg/ports/caf/vcpkg.json +++ b/external_imported/vcpkg/ports/caf/vcpkg.json @@ -1,8 +1,10 @@ { "name": "caf", - "version": "0.18.5", + "version": "0.18.6", + "port-version": 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", "dependencies": [ "openssl", { diff --git a/external_imported/vcpkg/ports/caffe2/fix-isgloginitialized.patch b/external_imported/vcpkg/ports/caffe2/fix-isgloginitialized.patch new file mode 100644 index 000000000..2167fc2d4 --- /dev/null +++ b/external_imported/vcpkg/ports/caffe2/fix-isgloginitialized.patch @@ -0,0 +1,31 @@ +diff --git a/caffe2/core/logging.cc b/caffe2/core/logging.cc +index 1379f3a..d1289db 100644 +--- a/caffe2/core/logging.cc ++++ b/caffe2/core/logging.cc +@@ -120,17 +120,6 @@ using fLB::FLAGS_logtostderr; + CAFFE2_DEFINE_int(caffe2_log_level, google::GLOG_ERROR, + "The minimum log level that caffe2 will output."); + +-// Google glog's api does not have an external function that allows one to check +-// if glog is initialized or not. It does have an internal function - so we are +-// declaring it here. This is a hack but has been used by a bunch of others too +-// (e.g. Torch). +-namespace google { +-namespace glog_internal_namespace_ { +-bool IsGoogleLoggingInitialized(); +-} // namespace glog_internal_namespace_ +-} // namespace google +- +- + namespace caffe2 { + bool InitCaffeLogging(int* argc, char** argv) { + if (*argc == 0) return true; +@@ -138,7 +127,7 @@ bool InitCaffeLogging(int* argc, char** argv) { + // IsGoogleLoggingInitialized is not exported from the glog DLL + // so we can't call it. If our program calls InitGoogleLogging twice glog will + // abort it. +- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) ++ if (!::google::IsGoogleLoggingInitialized()) + #endif + { + ::google::InitGoogleLogging(argv[0]); diff --git a/external_imported/vcpkg/ports/caffe2/portfile.cmake b/external_imported/vcpkg/ports/caffe2/portfile.cmake index b430b09c4..ce430d8e9 100644 --- a/external_imported/vcpkg/ports/caffe2/portfile.cmake +++ b/external_imported/vcpkg/ports/caffe2/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-space.patch fix-protobuf-deprecated.patch no-inout-macros.patch + fix-isgloginitialized.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) diff --git a/external_imported/vcpkg/ports/caffe2/vcpkg.json b/external_imported/vcpkg/ports/caffe2/vcpkg.json index 8f4f65632..dbdd8f172 100644 --- a/external_imported/vcpkg/ports/caffe2/vcpkg.json +++ b/external_imported/vcpkg/ports/caffe2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "caffe2", "version": "0.8.1", - "port-version": 6, + "port-version": 7, "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", "homepage": "https://github.com/caffe2/caffe2", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/cairo/fix_clang-cl_build.patch b/external_imported/vcpkg/ports/cairo/fix_clang-cl_build.patch new file mode 100644 index 000000000..133afb7eb --- /dev/null +++ b/external_imported/vcpkg/ports/cairo/fix_clang-cl_build.patch @@ -0,0 +1,37 @@ +diff --git a/util/cairo-script/cairo-script-objects.c b/util/cairo-script/cairo-script-objects.c +index 2d7937be3..4d55ca848 100644 +--- a/util/cairo-script/cairo-script-objects.c ++++ b/util/cairo-script/cairo-script-objects.c +@@ -127,7 +127,7 @@ csi_array_append (csi_t *ctx, + return _csi_stack_push (ctx, &array->stack, csi_object_reference (obj)); + } + +-inline csi_status_t ++csi_status_t + _csi_array_execute (csi_t *ctx, csi_array_t *array) + { + csi_integer_t i; +diff --git a/meson.build b/meson.build +index 7b20c0c48..9cb4a82ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,7 @@ cc = meson.get_compiler('c') + + # Compiler flags + cflags = [] +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + cflags += [ + '-Wmissing-declarations', + '-Werror-implicit-function-declaration', +@@ -159,8 +159,7 @@ check_headers = [ + + check_types = [ + ['uint64_t', {'headers': ['stdint.h']}], +- ['uint128_t', {'headers': ['stdint.h']}], +- ['__uint128_t'] ++ ['uint128_t', {'headers': ['stdint.h']}] + ] + + check_funcs = [ + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/cairo/mingw-dllexport.patch b/external_imported/vcpkg/ports/cairo/mingw-dllexport.patch new file mode 100644 index 000000000..8a9bbd786 --- /dev/null +++ b/external_imported/vcpkg/ports/cairo/mingw-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/src/cairoint.h b/src/cairoint.h +index cfa77dd..fbc0776 100644 +--- a/src/cairoint.h ++++ b/src/cairoint.h +@@ -48,7 +48,7 @@ + + #include "config.h" + +-#ifdef _MSC_VER ++#ifdef _WIN32 + #define cairo_public __declspec(dllexport) + #endif + diff --git a/external_imported/vcpkg/ports/cairo/portfile.cmake b/external_imported/vcpkg/ports/cairo/portfile.cmake index 6eff7ba43..737f310cf 100644 --- a/external_imported/vcpkg/ports/cairo/portfile.cmake +++ b/external_imported/vcpkg/ports/cairo/portfile.cmake @@ -1,4 +1,7 @@ -set(CAIRO_VERSION 1.17.4) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES fix_clang-cl_build.patch) +endif() vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -10,6 +13,8 @@ vcpkg_from_gitlab( PATCHES cairo_static_fix.patch disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 + mingw-dllexport.patch + ${PATCHES} ) if("fontconfig" IN_LIST FEATURES) @@ -25,10 +30,7 @@ else() endif() if ("x11" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature x11 only support UNIX.") - endif() - message(WARNING "You will need to install Xorg dependencies to use feature x11:\napt install libx11-dev libxft-dev\n") + message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") list(APPEND OPTIONS -Dxlib=enabled) else() list(APPEND OPTIONS -Dxlib=disabled) @@ -37,9 +39,6 @@ list(APPEND OPTIONS -Dxcb=disabled) list(APPEND OPTIONS -Dxlib-xcb=disabled) if("gobject" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature gobject currently only supports dynamic build.") - endif() list(APPEND OPTIONS -Dglib=enabled) else() list(APPEND OPTIONS -Dglib=disabled) diff --git a/external_imported/vcpkg/ports/cairo/vcpkg.json b/external_imported/vcpkg/ports/cairo/vcpkg.json index 1f65b37aa..e5e135c2c 100644 --- a/external_imported/vcpkg/ports/cairo/vcpkg.json +++ b/external_imported/vcpkg/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.6", - "port-version": 1, + "port-version": 4, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", @@ -42,7 +42,8 @@ ] }, "x11": { - "description": "build with x11 support" + "description": "build with x11 support", + "supports": "!windows" } } } diff --git a/external_imported/vcpkg/ports/camport3/portfile.cmake b/external_imported/vcpkg/ports/camport3/portfile.cmake index 8a2333469..3c5e4aea8 100644 --- a/external_imported/vcpkg/ports/camport3/portfile.cmake +++ b/external_imported/vcpkg/ports/camport3/portfile.cmake @@ -1,40 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO percipioxyz/camport3 - REF v1.5.3 - SHA512 efa41e75b4ed7147f94270765138aa226a92ec51c99157776e916ec178ad2a9fe55aa6e6e746be46e2f2178852f4c4f9323b515f5a1b151ac70c21f8f923d901 + REF v1.6.2 + SHA512 e3b1fadb13b826e86aa174215430f5e4175aafd9a967f2401beb3768dcc489a8ce5a74c151d615bd3e34b837c81e201db55b290ef258612381141b0b94212fd1 HEAD_REF master ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") file(COPY - ${SOURCE_PATH}/include/TYApi.h - ${SOURCE_PATH}/include/TYCoordinateMapper.h - ${SOURCE_PATH}/include/TYImageProc.h - ${SOURCE_PATH}/include/TyIsp.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include) + "${SOURCE_PATH}/include/TYApi.h" + "${SOURCE_PATH}/include/TYCoordinateMapper.h" + "${SOURCE_PATH}/include/TYImageProc.h" + "${SOURCE_PATH}/include/TyIsp.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") if(VCPKG_TARGET_IS_WINDOWS) if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) file(COPY - ${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() @@ -50,24 +50,24 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(COPY - ${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(COPY - ${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) endif() endif() file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/external_imported/vcpkg/ports/camport3/vcpkg.json b/external_imported/vcpkg/ports/camport3/vcpkg.json index d301a8711..863706150 100644 --- a/external_imported/vcpkg/ports/camport3/vcpkg.json +++ b/external_imported/vcpkg/ports/camport3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "camport3", - "version-string": "1.5.3", - "port-version": 2, + "version": "1.6.2", "description": "percipio.xyz cameras SDK", "homepage": "https://github.com/percipioxyz/camport3", "supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32" diff --git a/external_imported/vcpkg/ports/capnproto/portfile.cmake b/external_imported/vcpkg/ports/capnproto/portfile.cmake index a425280b3..cb185dcf8 100644 --- a/external_imported/vcpkg/ports/capnproto/portfile.cmake +++ b/external_imported/vcpkg/ports/capnproto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO capnproto/capnproto - REF v0.9.1 - SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD + REF v0.10.2 + SHA512 079AB715EA19AC207F72BB4874AB6362C11DFB9128342EC937E3F4D27E4100530CF9E6A0275EACA1E45A1BB706B65179A526EA8CFCEBA93BB36CD6C4F1C0CF5B HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/capnproto/vcpkg.json b/external_imported/vcpkg/ports/capnproto/vcpkg.json index 2a2c4f482..85c7d452c 100644 --- a/external_imported/vcpkg/ports/capnproto/vcpkg.json +++ b/external_imported/vcpkg/ports/capnproto/vcpkg.json @@ -1,9 +1,9 @@ { "name": "capnproto", - "version": "0.9.1", - "port-version": 2, + "version": "0.10.2", "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", + "license": "MIT", "supports": "!windows | (!uwp & !arm)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/capstone/portfile.cmake b/external_imported/vcpkg/ports/capstone/portfile.cmake index 544e59c2d..86681b824 100644 --- a/external_imported/vcpkg/ports/capstone/portfile.cmake +++ b/external_imported/vcpkg/ports/capstone/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REF d5141c04785678535c7792eddc21f146186e639f # 5.0.0-rc2 REPO "capstone-engine/capstone" - SHA512 de9cf7da9fc3e502165b28b998b472791c8d5366e1a1a1fabd6bb8856a6fae80bf7d1fc4d268572d69c3526161bb0509a598ad4d94207e25a62aff6a5f9e9404 + REF 000561b4f74dc15bda9af9544fe714efda7a6e13 # 5.0.0-rc2 + SHA512 66b09a7d2fda297836bbedaeece71dcfe39bdbd633d9b6ecb68ee2e5aa094b697226136ab172cdc4550e8b2ef1448d001c8ee4e0d456c6d277afe0b3d1aab5a1 HEAD_REF next PATCHES 001-silence-windows-crt-secure-warnings.patch diff --git a/external_imported/vcpkg/ports/capstone/vcpkg.json b/external_imported/vcpkg/ports/capstone/vcpkg.json index 3b0362641..06ffbd968 100644 --- a/external_imported/vcpkg/ports/capstone/vcpkg.json +++ b/external_imported/vcpkg/ports/capstone/vcpkg.json @@ -1,6 +1,7 @@ { "name": "capstone", "version": "5.0.0-rc2", + "port-version": 1, "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ diff --git a/external_imported/vcpkg/ports/catch2/fix-install-path.patch b/external_imported/vcpkg/ports/catch2/fix-install-path.patch index c60e74b93..5813ffe81 100644 --- a/external_imported/vcpkg/ports/catch2/fix-install-path.patch +++ b/external_imported/vcpkg/ports/catch2/fix-install-path.patch @@ -1,17 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0370ea3..7cef01a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -146,7 +146,7 @@ if (NOT_SUBPROJECT) - EXPORT - Catch2Targets - DESTINATION -- ${CMAKE_INSTALL_LIBDIR} -+ ${CMAKE_INSTALL_LIBDIR}/manual-link - ) - - -@@ -226,7 +226,7 @@ if (NOT_SUBPROJECT) +@@ -170,7 +170,7 @@ ## Provide some pkg-config integration set(PKGCONFIG_INSTALL_DIR @@ -20,3 +10,37 @@ index 0370ea3..7cef01a 100644 CACHE PATH "Path where catch2.pc is installed" ) configure_file( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -356,12 +356,28 @@ + install( + TARGETS + Catch2 +- Catch2WithMain + EXPORT + Catch2Targets +- DESTINATION ++ LIBRARY DESTINATION + ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ++ ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ++ ${CMAKE_INSTALL_BINDIR} + ) ++ ++ install( ++ TARGETS ++ Catch2WithMain ++ EXPORT ++ Catch2Targets ++ LIBRARY DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/manual-link ++ ARCHIVE DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/manual-link ++ RUNTIME DESTINATION ++ ${CMAKE_INSTALL_BINDIR} ++ ) + + + install( diff --git a/external_imported/vcpkg/ports/catch2/fix-uwp-build.patch b/external_imported/vcpkg/ports/catch2/fix-uwp-build.patch new file mode 100644 index 000000000..feee34cfb --- /dev/null +++ b/external_imported/vcpkg/ports/catch2/fix-uwp-build.patch @@ -0,0 +1,34 @@ +diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp +index 4465831d..7555a21f 100644 +--- a/src/catch2/catch_config.cpp ++++ b/src/catch2/catch_config.cpp +@@ -26,7 +26,12 @@ namespace { + # pragma warning( disable : 4996 ) + # endif + ++# if defined( WINAPI_FAMILY ) ++ // UWP doesn't support environment variables. ++ return false; ++# else + return std::getenv( "BAZEL_TEST" ) != nullptr; ++# endif + + # if defined( _MSC_VER ) + # pragma warning( pop ) +@@ -81,6 +86,8 @@ namespace Catch { + } ); + } + ++#if !defined( WINAPI_FAMILY ) ++ // UWP doesn't support environment variables. + if(provideBazelReporterOutput()){ + // Register a JUnit reporter for Bazel. Bazel sets an environment + // variable with the path to XML output. If this file is written to +@@ -102,6 +109,7 @@ namespace Catch { + { "junit", std::string( bazelOutputFilePtr ), {}, {} } ); + } + } ++#endif + + + // We now fixup the reporter specs to handle default output spec, diff --git a/external_imported/vcpkg/ports/catch2/portfile.cmake b/external_imported/vcpkg/ports/catch2/portfile.cmake index 231b18160..3cccd9e2d 100644 --- a/external_imported/vcpkg/ports/catch2/portfile.cmake +++ b/external_imported/vcpkg/ports/catch2/portfile.cmake @@ -1,43 +1,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.13.8 - SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e + REF v3.1.0 + SHA512 49e5339263190a6ef15284ef2dcc9e727ce0659cb750d4078024ccf6c6f339740a3a662273718ea73adfbc5928c3ef7268175ebda5ee9ec97ca58fed98747b44 HEAD_REF devel - PATCHES + PATCHES fix-install-path.patch + fix-uwp-build.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTING=OFF - -DCATCH_BUILD_EXAMPLES=OFF -DCATCH_INSTALL_DOCS=OFF - -DCATCH_BUILD_STATIC_LIBRARY=${BUILD_STATIC} + -DCMAKE_CXX_STANDARD=17 ) vcpkg_cmake_install() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") - file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") -endif() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") -endif() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/catch2/catch.hpp") - message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") -endif() +# We remove these folders because they are empty and cause warnings on the library installation +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/benchmark/internal") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/catch2/generators/internal") -file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/catch.hpp" "#include ") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/catch2/vcpkg.json b/external_imported/vcpkg/ports/catch2/vcpkg.json index a2ea784f6..d714616b2 100644 --- a/external_imported/vcpkg/ports/catch2/vcpkg.json +++ b/external_imported/vcpkg/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "2.13.8", - "port-version": 1, + "version-semver": "3.1.0", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/ccd/portfile.cmake b/external_imported/vcpkg/ports/ccd/portfile.cmake index c2c294d56..d5055a0aa 100644 --- a/external_imported/vcpkg/ports/ccd/portfile.cmake +++ b/external_imported/vcpkg/ports/ccd/portfile.cmake @@ -14,22 +14,27 @@ vcpkg_from_github( ${STATIC_PATCH} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + double-precision ENABLE_DOUBLE_PRECISION +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/ccd) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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}/share/doc") -file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/BSD-LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/ccd/vcpkg.json b/external_imported/vcpkg/ports/ccd/vcpkg.json index 15978fb00..5716257df 100644 --- a/external_imported/vcpkg/ports/ccd/vcpkg.json +++ b/external_imported/vcpkg/ports/ccd/vcpkg.json @@ -1,7 +1,23 @@ { "name": "ccd", - "version-string": "2.1-4", - "port-version": 3, + "version": "2.1", + "port-version": 4, "description": "Library for collision detection between two convex shapes", - "homepage": "https://github.com/danfis/libccd" + "homepage": "https://github.com/danfis/libccd", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "double-precision": { + "description": "Use float64 doubles for ccd" + } + } } diff --git a/external_imported/vcpkg/ports/ccfits/dll_exports.patch b/external_imported/vcpkg/ports/ccfits/dll_exports.patch index 6321cbb4e..0f34c26e5 100644 --- a/external_imported/vcpkg/ports/ccfits/dll_exports.patch +++ b/external_imported/vcpkg/ports/ccfits/dll_exports.patch @@ -311,45 +311,26 @@ new file mode 100644 index 0000000..a2540a6 100644 --- /dev/null +++ b/ccfits_export.h -@@ -0,0 +1,41 @@ +@@ -0,0 +1,22 @@ +#ifndef CCFITS_EXPORT_H +#define CCFITS_EXPORT_H + +#ifdef CCFITS_STATIC_DEFINE +# define CCFITS_EXPORT -+# define CCFITS_NO_EXPORT +#else +# ifndef CCFITS_EXPORT -+# ifdef CCfits_EXPORTS -+ /* We are building this library */ -+# define CCFITS_EXPORT __declspec(dllexport) ++# ifdef _MSC_VER ++# ifdef CCfits_EXPORTS ++ /* We are building this library */ ++# define CCFITS_EXPORT __declspec(dllexport) ++# else ++ /* We are using this library */ ++# define CCFITS_EXPORT __declspec(dllimport) ++# endif +# else -+ /* We are using this library */ -+# define CCFITS_EXPORT __declspec(dllimport) ++# define CCFITS_EXPORT __attribute__((visibility("default"))) +# endif +# endif -+ -+# ifndef CCFITS_NO_EXPORT -+# define CCFITS_NO_EXPORT -+# endif -+#endif -+ -+#ifndef CCFITS_DEPRECATED -+# define CCFITS_DEPRECATED __declspec(deprecated) -+#endif -+ -+#ifndef CCFITS_DEPRECATED_EXPORT -+# define CCFITS_DEPRECATED_EXPORT CCFITS_EXPORT CCFITS_DEPRECATED -+#endif -+ -+#ifndef CCFITS_DEPRECATED_NO_EXPORT -+# define CCFITS_DEPRECATED_NO_EXPORT CCFITS_NO_EXPORT CCFITS_DEPRECATED -+#endif -+ -+#if 0 /* DEFINE_NO_DEPRECATED */ -+# ifndef CCFITS_NO_DEPRECATED -+# define CCFITS_NO_DEPRECATED -+# endif +#endif + +#endif diff --git a/external_imported/vcpkg/ports/ccfits/vcpkg.json b/external_imported/vcpkg/ports/ccfits/vcpkg.json index 7124381b9..f66a2ef5a 100644 --- a/external_imported/vcpkg/ports/ccfits/vcpkg.json +++ b/external_imported/vcpkg/ports/ccfits/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ccfits", "version": "2.5", - "port-version": 8, + "port-version": 9, "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", "dependencies": [ "cfitsio", { diff --git a/external_imported/vcpkg/ports/cctag/0001-fix-osx.patch b/external_imported/vcpkg/ports/cctag/0001-fix-osx.patch new file mode 100644 index 000000000..759fd6190 --- /dev/null +++ b/external_imported/vcpkg/ports/cctag/0001-fix-osx.patch @@ -0,0 +1,12 @@ +diff --git a/src/cctag/utils/Exceptions.hpp b/src/cctag/utils/Exceptions.hpp +index 094d278..8647f76 100644 +--- a/src/cctag/utils/Exceptions.hpp ++++ b/src/cctag/utils/Exceptions.hpp +@@ -8,6 +8,7 @@ + #ifndef _CCTAG_EXCEPTIONS_HPP_ + #define _CCTAG_EXCEPTIONS_HPP_ + ++#define _GNU_SOURCE + #include + #include + #include diff --git a/external_imported/vcpkg/ports/cctag/0002-find-tbb.patch b/external_imported/vcpkg/ports/cctag/0002-find-tbb.patch new file mode 100644 index 000000000..7badc072f --- /dev/null +++ b/external_imported/vcpkg/ports/cctag/0002-find-tbb.patch @@ -0,0 +1,173 @@ +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index c5a82c0..3ce4719 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -42,6 +42,7 @@ + include(CMakeFindDependencyMacro) + + set(OpenCV_DIR @OpenCV_DIR@) ++find_dependency(TBB) + find_dependency(OpenCV) + find_dependency(Eigen3 @CCTAG_EIGEN_REQUIRED_VERSION@) + find_dependency(Boost 1.66 REQUIRED COMPONENTS @BOOST_REQUIRED_COMPONENTS@) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7b64b83..5398ed4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -176,7 +176,8 @@ if(CCTAG_WITH_CUDA) + ${OpenCV_LIBS} + Boost::date_time Boost::chrono Boost::thread Boost::serialization Boost::system Boost::filesystem Boost::atomic Boost::program_options Boost::timer Boost::math_c99 + Eigen3::Eigen +- ${TBB_LIBRARIES} ${CUDA_CUDADEVRT_LIBRARY}) ++ TBB::tbb ++ ${CUDA_CUDADEVRT_LIBRARY}) + + if(NOT MSVC) + target_link_libraries(CCTag pthread dl) +@@ -184,7 +185,7 @@ if(CCTAG_WITH_CUDA) + + target_compile_definitions(CCTag + PUBLIC -DCCTAG_WITH_CUDA +- PRIVATE ${TBB_DEFINITIONS}) ++) + + if(CCTAG_HAVE_SHFL_DOWN_SYNC) + target_compile_definitions(CCTag PRIVATE "-DCCTAG_HAVE_SHFL_DOWN_SYNC") +@@ -220,16 +221,13 @@ else() # without CUDA + # get_target_property(testprop CCTag INTERFACE_INCLUDE_DIRECTORIES ) + # message(STATUS "testprop: ${testprop}") + +- target_compile_definitions(CCTag +- PRIVATE ${TBB_DEFINITIONS}) + + target_link_libraries(CCTag + PUBLIC + ${OpenCV_LIBS} + Eigen3::Eigen + Boost::atomic Boost::chrono Boost::date_time Boost::filesystem Boost::serialization Boost::system Boost::thread Boost::timer Boost::math_c99 +- PRIVATE +- ${TBB_LIBRARIES}) ++ TBB::tbb) + + if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + target_link_libraries(CCTag PRIVATE pthread dl) +diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt +index 506d19b..c7154fc 100644 +--- a/src/applications/CMakeLists.txt ++++ b/src/applications/CMakeLists.txt +@@ -86,7 +86,7 @@ target_include_directories(detection PUBLIC + ) + target_link_libraries(detection PUBLIC + CCTag::CCTag +- ${TBB_LIBRARIES} ++ TBB::tbb + ${OpenCV_LIBS} + Boost::filesystem Boost::program_options Boost::timer + ) +diff --git a/src/cctag/Detection.cpp b/src/cctag/Detection.cpp +index 21c47bf..a800fbc 100644 +--- a/src/cctag/Detection.cpp ++++ b/src/cctag/Detection.cpp +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + #ifdef CCTAG_WITH_CUDA + #include // only for debugging + #endif // CCTAG_WITH_CUDA +@@ -71,7 +72,7 @@ static void constructFlowComponentFromSeed( + std::vector & vCandidateLoopOne, + const Parameters & params) + { +- static tbb::mutex G_SortMutex; ++ static std::mutex G_SortMutex; + + assert( seed ); + // Check if the seed has already been processed, i.e. belongs to an already +@@ -102,7 +103,7 @@ static void constructFlowComponentFromSeed( + } + + { +- tbb::mutex::scoped_lock lock(G_SortMutex); ++ std::lock_guard lock(G_SortMutex); + candidate->_averageReceivedVote = (float) (nReceivedVote*nReceivedVote) / (float) nVotedPoints; + auto it = std::lower_bound(vCandidateLoopOne.begin(), vCandidateLoopOne.end(), candidate, + [](const CandidatePtr& c1, const CandidatePtr& c2) { return c1->_averageReceivedVote > c2->_averageReceivedVote; }); +@@ -119,8 +120,8 @@ static void completeFlowComponent( + std::size_t runId, + const Parameters & params) + { +- static tbb::spin_mutex G_UpdateMutex; +- static tbb::mutex G_InsertMutex; ++ static std::mutex G_UpdateMutex; ++ static std::mutex G_InsertMutex; + + try + { +@@ -171,7 +172,7 @@ static void completeFlowComponent( + if (nSegmentCommon == -1) + { + { +- tbb::spin_mutex::scoped_lock lock(G_UpdateMutex); ++ std::lock_guard lock(G_UpdateMutex); + nLabel = nSegmentOut; + ++nSegmentOut; + } +@@ -239,7 +240,7 @@ static void completeFlowComponent( + } + + { +- tbb::mutex::scoped_lock lock(G_InsertMutex); ++ std::lock_guard lock(G_InsertMutex); + vCandidateLoopTwo.push_back(candidate); + } + +@@ -384,7 +385,7 @@ static void cctagDetectionFromEdgesLoopTwoIteration( + float scale, + const Parameters& params) + { +- static tbb::mutex G_InsertMutex; ++ static std::mutex G_InsertMutex; + + const Candidate& candidate = vCandidateLoopTwo[iCandidate]; + +@@ -543,7 +544,7 @@ static void cctagDetectionFromEdgesLoopTwoIteration( + #endif + + { +- tbb::mutex::scoped_lock lock(G_InsertMutex); ++ std::lock_guard lock(G_InsertMutex); + markers.push_back( tag ); // markers takes responsibility for delete + } + #ifdef CCTAG_SERIALIZE +diff --git a/src/cctag/Identification.cpp b/src/cctag/Identification.cpp +index 15c9d9b..99b616a 100644 +--- a/src/cctag/Identification.cpp ++++ b/src/cctag/Identification.cpp +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + #include + +@@ -71,7 +72,7 @@ bool orazioDistanceRobust( + #endif // GRIFF_DEBUG + + const size_t cut_count = cuts.size(); +- static tbb::mutex vscore_mutex; ++ static std::mutex vscore_mutex; + + tbb::parallel_for(size_t(0), cut_count, [&](size_t i) { + const cctag::ImageCut& cut = cuts[i]; +@@ -183,7 +184,7 @@ bool orazioDistanceRobust( + #endif // GRIFF_DEBUG + + { +- tbb::mutex::scoped_lock lock(vscore_mutex); ++ std::lock_guard lock(vscore_mutex); + vScore[idSet.front().first].push_back(idSet.front().second); + } + } diff --git a/external_imported/vcpkg/ports/cctag/portfile.cmake b/external_imported/vcpkg/ports/cctag/portfile.cmake index a217d98f7..a57d142c0 100644 --- a/external_imported/vcpkg/ports/cctag/portfile.cmake +++ b/external_imported/vcpkg/ports/cctag/portfile.cmake @@ -1,11 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alicevision/cctag - REF v1.0.1 - SHA512 94992141094162d44cf45ad85324517638bf794d693c6a059d6ba5d5ccbedea4f98664a0cc49ebca78f85d2860b637dfcb9d5315114493643a6c7f8fabab3073 + REF v1.0.2 + SHA512 ccd62f6b1ca55035a08660052f38e73866260d5295490864fa9c86af779a42ce2ec727d6c88f0ea38f205903cf8f4107069b690849e432219c74d3b9666e3ae2 HEAD_REF develop + PATCHES + 0001-fix-osx.patch + 0002-find-tbb.patch # Includes changes similar to https://github.com/alicevision/CCTag/pull/178/ ) +file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake" "${SOURCE_PATH}/src/applications/cmake/FindTBB.cmake") + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cuda CCTAG_WITH_CUDA @@ -13,9 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if("cuda" IN_LIST FEATURES) - include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) + include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) - message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") endif() @@ -30,7 +34,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CCTag) vcpkg_copy_pdbs() -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") # remove test files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/geometry/test" "${CURRENT_PACKAGES_DIR}/include/cctag/test") @@ -45,4 +49,4 @@ if ("apps" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ${CCTAG_TOOLS} AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctag RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cctag/vcpkg.json b/external_imported/vcpkg/ports/cctag/vcpkg.json index 37d3e6460..989c99b7d 100644 --- a/external_imported/vcpkg/ports/cctag/vcpkg.json +++ b/external_imported/vcpkg/ports/cctag/vcpkg.json @@ -1,10 +1,12 @@ { "name": "cctag", - "version-semver": "1.0.1", + "version-semver": "1.0.2", + "port-version": 2, "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", "documentation": "https://cctag.readthedocs.io/", + "license": "MPL-2.0", "supports": "!(uwp | arm | arm64 | android | x86)", "dependencies": [ "boost-accumulators", @@ -31,7 +33,7 @@ "boost-type-traits", "boost-unordered", "eigen3", - "opencv3", + "opencv", "tbb", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/celero/fix-bin-install-path.patch b/external_imported/vcpkg/ports/celero/fix-bin-install-path.patch new file mode 100644 index 000000000..3a73c3600 --- /dev/null +++ b/external_imported/vcpkg/ports/celero/fix-bin-install-path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0158c4f..5be0fbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,9 +220,11 @@ install( + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + install( + TARGETS celero +- DESTINATION ${CMAKE_INSTALL_LIBDIR} + EXPORT celero-targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + install( + EXPORT celero-targets diff --git a/external_imported/vcpkg/ports/celero/portfile.cmake b/external_imported/vcpkg/ports/celero/portfile.cmake index e39bac92d..94524f521 100644 --- a/external_imported/vcpkg/ports/celero/portfile.cmake +++ b/external_imported/vcpkg/ports/celero/portfile.cmake @@ -1,33 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 6208b63dcd4baeea6817d3e84f79fb04ad99c720 #2.8.2 - SHA512 13a486dafba394cc3e072292008d00e8a3e1b12b4fe7c82cf2ce43b3d24629d08b5762494c19da0a12b186a70114cba101553ed1b4cea90d090514307b06dec8 + REF v2.8.3 + SHA512 f6774f6076bae5d37d4f5bd12153bc99b97893f43fe9253fe805b5b0c2475ffe878e32f3fc7391544ea24020e59d5ae48e44e5b3a302f7280ad15b6a6820f70b HEAD_REF master + PATCHES + fix-bin-install-path.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CELERO_COMPILE_DYNAMIC_LIBRARIES) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCELERO_ENABLE_EXPERIMENTS=OFF -DCELERO_ENABLE_TESTS=OFF - -DCELERO_RUN_EXAMPLE_ON_BUILD=OFF -DCELERO_COMPILE_DYNAMIC_LIBRARIES=${CELERO_COMPILE_DYNAMIC_LIBRARIES} -DCELERO_TREAT_WARNINGS_AS_ERRORS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/celero/Export.h "ifdef CELERO_STATIC" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/celero/Export.h" "#ifdef CELERO_STATIC" "#define CELERO_STATIC\n#ifdef CELERO_STATIC") endif() -file(RENAME ${CURRENT_PACKAGES_DIR}/share/celero/celero-target.cmake ${CURRENT_PACKAGES_DIR}/share/celero/celero-config.cmake) - -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/external_imported/vcpkg/ports/celero/vcpkg.json b/external_imported/vcpkg/ports/celero/vcpkg.json index 5296cfa17..fbf37ae55 100644 --- a/external_imported/vcpkg/ports/celero/vcpkg.json +++ b/external_imported/vcpkg/ports/celero/vcpkg.json @@ -1,7 +1,17 @@ { "name": "celero", - "version-string": "2.8.2", - "port-version": 1, + "version": "2.8.3", "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.", - "homepage": "https://github.com/DigitalInBlue/Celero" + "homepage": "https://github.com/DigitalInBlue/Celero", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/cereal/portfile.cmake b/external_imported/vcpkg/ports/cereal/portfile.cmake index 9c44ab271..cf667b6f3 100644 --- a/external_imported/vcpkg/ports/cereal/portfile.cmake +++ b/external_imported/vcpkg/ports/cereal/portfile.cmake @@ -3,25 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO USCiLab/cereal - REF v1.3.1 - SHA512 5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9 + REF v1.3.2 + SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJUST_INSTALL_CEREAL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cereal) # Clean -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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/cereal) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/cereal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cereal/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cereal/vcpkg.json b/external_imported/vcpkg/ports/cereal/vcpkg.json index 9582616ed..aface78b9 100644 --- a/external_imported/vcpkg/ports/cereal/vcpkg.json +++ b/external_imported/vcpkg/ports/cereal/vcpkg.json @@ -1,7 +1,18 @@ { "name": "cereal", - "version": "1.3.1", + "version": "1.3.2", + "port-version": 1, "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", "homepage": "https://github.com/USCiLab/cereal", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ceres/0002_use_glog_target.patch b/external_imported/vcpkg/ports/ceres/0002_use_glog_target.patch index 5405ea53d..01ac27d4a 100644 --- a/external_imported/vcpkg/ports/ceres/0002_use_glog_target.patch +++ b/external_imported/vcpkg/ports/ceres/0002_use_glog_target.patch @@ -1,11 +1,11 @@ diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt -index 3711222..8646bd0 100644 +index 0e33263..299b373 100644 --- a/internal/ceres/CMakeLists.txt +++ b/internal/ceres/CMakeLists.txt -@@ -174,17 +174,9 @@ endif (SCHUR_SPECIALIZATIONS) +@@ -101,17 +101,9 @@ endif() find_package(Threads QUIET) list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES Threads::Threads) - + -if (NOT MINIGLOG AND GLOG_FOUND) - list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES}) - if (gflags_FOUND) @@ -21,5 +21,5 @@ index 3711222..8646bd0 100644 + list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES glog::glog) +endif (NOT MINIGLOG) - if (SUITESPARSE AND SUITESPARSE_FOUND) + if (SUITESPARSE AND SuiteSparse_FOUND) # Define version information for use in Solver::FullReport. diff --git a/external_imported/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch b/external_imported/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch index 332ef5952..9505707da 100644 --- a/external_imported/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch +++ b/external_imported/vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch @@ -1,9 +1,9 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in -index e5e2976..be1083a 100644 +index 4745483..b55462d 100644 --- a/cmake/CeresConfig.cmake.in +++ b/cmake/CeresConfig.cmake.in -@@ -213,55 +213,13 @@ else (EIGEN3_FOUND) - endif (EIGEN3_FOUND) +@@ -217,55 +217,14 @@ else (Eigen3_FOUND) + endif (Eigen3_FOUND) # glog (and maybe gflags). -# @@ -35,15 +35,15 @@ index e5e2976..be1083a 100644 - # Search quietly s/t we control the timing of the error message if not found. - find_package(Glog QUIET) - endif() -+include (CMakeFindDependencyMacro) -+find_dependency (glog NO_MODULE) - if (GLOG_FOUND) - ceres_message(STATUS "Found required Ceres dependency: glog") - else() - ceres_report_not_found("Missing required Ceres dependency: glog.") - endif() -- ++include (CMakeFindDependencyMacro) ++find_dependency (glog NO_MODULE) + - # gflags is only a public dependency of Ceres via glog, thus is not required - # if Ceres was built with MINIGLOG. - if (CERES_USES_GFLAGS) @@ -59,7 +59,7 @@ index e5e2976..be1083a 100644 -endif(CERES_USES_MINIGLOG) +# SuiteSparse +if (@SUITESPARSE@) -+ find_dependency(suitesparse CONFIG) ++ find_dependency(SuiteSparse CONFIG) +endif() # Import exported Ceres targets, if they have not already been imported. diff --git a/external_imported/vcpkg/ports/ceres/0004_fix_lib_path_linux.patch b/external_imported/vcpkg/ports/ceres/0004_fix_lib_path_linux.patch deleted file mode 100644 index e2c9c56b4..000000000 --- a/external_imported/vcpkg/ports/ceres/0004_fix_lib_path_linux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f24ce30..8e5759b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -192,7 +192,7 @@ endif() - # install native libraries to lib64 rather than lib. Most distros seem to - # follow this convention with a couple notable exceptions (Debian-based and - # Arch-based distros) which we try to detect here. --if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND -+if (0 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND - NOT DEFINED LIB_SUFFIX AND - NOT CMAKE_CROSSCOMPILING AND - CMAKE_SIZEOF_VOID_P EQUAL "8" AND diff --git a/external_imported/vcpkg/ports/ceres/find-package-required.patch b/external_imported/vcpkg/ports/ceres/find-package-required.patch index aae9cccdd..07785dd13 100644 --- a/external_imported/vcpkg/ports/ceres/find-package-required.patch +++ b/external_imported/vcpkg/ports/ceres/find-package-required.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6a3d05..a78c027 100644 +index 2d241fe..b79454d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -245,7 +245,7 @@ if (EIGEN3_FOUND) - endif (EIGEN3_FOUND) +@@ -244,7 +244,7 @@ else (CUDA) + endif (CUDA) if (LAPACK) - find_package(LAPACK QUIET) @@ -11,48 +11,102 @@ index b6a3d05..a78c027 100644 if (LAPACK_FOUND) message("-- Found LAPACK library: ${LAPACK_LIBRARIES}") else (LAPACK_FOUND) -@@ -263,7 +263,7 @@ if (SUITESPARSE) +@@ -266,7 +266,8 @@ if (SUITESPARSE) # built with SuiteSparse support. # Check for SuiteSparse and dependencies. -- find_package(SuiteSparse) -+ find_package(SuiteSparse REQUIRED) - if (SUITESPARSE_FOUND) - # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least - # Ubuntu 13.10 cannot be used to link shared libraries. -@@ -300,7 +300,7 @@ endif (SUITESPARSE) +- find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR) ++ find_package(suitesparse CONFIG REQUIRED) ++ set(SuiteSparse_FOUND 1) + if (SuiteSparse_FOUND) + set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})") + # By default, if all of SuiteSparse's dependencies are found, Ceres is +@@ -274,11 +275,11 @@ if (SUITESPARSE) + message("-- Found SuiteSparse ${SuiteSparse_VERSION}, " + "building with SuiteSparse.") + +- if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake + ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ endif () + else (SuiteSparse_FOUND) + # Disable use of SuiteSparse if it cannot be found and continue. + message("-- Did not find all SuiteSparse dependencies, disabling " +@@ -294,7 +295,7 @@ endif (SUITESPARSE) # CXSparse. if (CXSPARSE) # Don't search with REQUIRED as we can continue without CXSparse. - find_package(CXSparse) + find_package(CXSparse REQUIRED) - if (CXSPARSE_FOUND) + if (CXSparse_FOUND) + set(CXSparse_DEPENDENCY "find_dependency(CXSparse ${CXSparse_VERSION})") # By default, if CXSparse and all dependencies are found, Ceres is - # built with CXSparse support. -@@ -336,7 +336,7 @@ endif(NOT SUITESPARSE AND NOT CXSPARSE AND NOT EIGENSPARSE) +@@ -302,10 +303,10 @@ if (CXSPARSE) + message("-- Found CXSparse version: ${CXSparse_VERSION}, " + "building with CXSparse.") + +- if (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindCXSparse.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ endif () + else (CXSparse_FOUND) + # Disable use of CXSparse if it cannot be found and continue. + message("-- Did not find CXSparse, Building without CXSparse.") +@@ -367,9 +368,10 @@ endif() # GFlags. if (GFLAGS) # Don't search with REQUIRED as we can continue without gflags. - find_package(gflags 2.2.0) -+ find_package(gflags REQUIRED) ++ find_package(gflags CONFIG REQUIRED) if (gflags_FOUND) - if (TARGET gflags) +- if (TARGET gflags) ++ if (TARGET gflags::gflags) ++ add_library(gflags ALIAS gflags::gflags) message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}") -@@ -537,7 +537,7 @@ else (NOT OPENMP AND NOT TBB AND NOT CXX11_THREADS) - set_ceres_threading_model("${CERES_THREADING_MODEL}") + else() + message("-- Detected version of gflags: ${gflags_VERSION} does not define " +@@ -420,7 +422,7 @@ set_ceres_threading_model("${CERES_THREADING_MODEL}") if (BUILD_BENCHMARKS) -- find_package(benchmark QUIET) -+ find_package(benchmark REQUIRED) + # Version 1.3 was first to provide import targets +- find_package(benchmark 1.3 QUIET) ++ find_package(benchmark CONFIG REQUIRED) if (benchmark_FOUND) message("-- Found Google benchmark library. Building Ceres benchmarks.") else() -@@ -782,7 +782,7 @@ if (BUILD_DOCUMENTATION) - set(CERES_DOCS_INSTALL_DIR "share/doc/ceres" CACHE STRING - "Ceres docs install path relative to CMAKE_INSTALL_PREFIX") +@@ -611,7 +613,7 @@ create_ceres_config("${CERES_COMPILE_OPTIONS}" + add_subdirectory(internal/ceres) -- find_package(Sphinx QUIET) + if (BUILD_DOCUMENTATION) +- find_package(Sphinx) + find_package(Sphinx REQUIRED) if (NOT SPHINX_FOUND) - message("-- Failed to find Sphinx, disabling build of documentation.") + message("-- Failed to find Sphinx and/or its dependencies, disabling build of documentation.") update_cache_variable(BUILD_DOCUMENTATION OFF) +diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt +index 299b373..33d41d8 100644 +--- a/internal/ceres/CMakeLists.txt ++++ b/internal/ceres/CMakeLists.txt +@@ -108,14 +108,14 @@ endif (NOT MINIGLOG) + if (SUITESPARSE AND SuiteSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD +- SuiteSparse::SPQR) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod ++ SuiteSparse::spqr) + endif (SUITESPARSE AND SuiteSparse_FOUND) + + if (CXSPARSE AND CXSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES}) + endif (CXSPARSE AND CXSparse_FOUND) + + if (ACCELERATESPARSE AND AccelerateSparse_FOUND) diff --git a/external_imported/vcpkg/ports/ceres/portfile.cmake b/external_imported/vcpkg/ports/ceres/portfile.cmake index 498774cd5..8cb181273 100644 --- a/external_imported/vcpkg/ports/ceres/portfile.cmake +++ b/external_imported/vcpkg/ports/ceres/portfile.cmake @@ -9,14 +9,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ceres-solver/ceres-solver - REF 2.0.0 - SHA512 6379666ef57af4ea85026644fa21365ce18fbaa12d50bd452bcdae0743a7b013effdd42c961e90c31815991bf315bd6904553dcc1a382ff5ed8c7abe9edf9a6c + REF f68321e7de8929fbcdb95dd42877531e64f72f66 #2.1.0 + SHA512 67bbd8a9385a40fe69d118fbc84da0fcc9aa1fbe14dd52f5403ed09686504213a1d931e95a1a0148d293b27ab5ce7c1d618fbf2e8fed95f2bbafab851a1ef449 HEAD_REF master PATCHES 0001_cmakelists_fixes.patch 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch - 0004_fix_lib_path_linux.patch find-package-required.patch ) @@ -25,6 +24,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindGflags.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindEigen.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindMETIS.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,7 +33,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "lapack" LAPACK "eigensparse" EIGENSPARSE "tools" GFLAGS + "cuda" CUDA ) +if(VCPKG_TARGET_IS_UWP) + list(APPEND FEATURE_OPTIONS -DMINIGLOG=ON) +endif() + +foreach (FEATURE ${FEATURE_OPTIONS}) + message(STATUS "${FEATURE}") +endforeach() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -51,11 +59,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH CMake) -else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/ceres/vcpkg.json b/external_imported/vcpkg/ports/ceres/vcpkg.json index 4194d3ecd..a37a30760 100644 --- a/external_imported/vcpkg/ports/ceres/vcpkg.json +++ b/external_imported/vcpkg/ports/ceres/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ceres", - "version-semver": "2.0.0", - "port-version": 6, + "version": "2.1.0", + "port-version": 2, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", + "license": "Apache-2.0", "dependencies": [ "eigen3", - "glog", + { + "name": "glog", + "platform": "!(arm & uwp)" + }, { "name": "vcpkg-cmake", "host": true @@ -17,6 +21,13 @@ } ], "features": { + "cuda": { + "description": "Support for CUDA based dense solvers", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", + "dependencies": [ + "cuda" + ] + }, "cxsparse": { "description": "CXSparse support for Ceres", "dependencies": [ diff --git a/external_imported/vcpkg/ports/cgal/portfile.cmake b/external_imported/vcpkg/ports/cgal/portfile.cmake index c58abc40d..b210c6f66 100644 --- a/external_imported/vcpkg/ports/cgal/portfile.cmake +++ b/external_imported/vcpkg/ports/cgal/portfile.cmake @@ -1,10 +1,11 @@ +# Header only vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.4 - SHA512 c9cdacc74844a6eca94980d0350ae6defb99462ef70ddc3e15e825f06b171a21571efd9246a4abac16a6efc350aa9fa79330d2e89dcec24fc6ecff51905efdeb + REF v5.5 + SHA512 d689b0d4e04ff0a4297939dc0d4c001de88e811583b73fe6173f46b38d51f31f336a09a66c47cf79a1511942a4f5cf4df5d57871deec926bec71183c63b3d2f1 HEAD_REF master ) @@ -18,7 +19,14 @@ vcpkg_cmake_configure( OPTIONS -DCGAL_HEADER_ONLY=ON -DCGAL_INSTALL_CMAKE_DIR=share/cgal + -DBUILD_TESTING=OFF + -DBUILD_DOC=OFF + -DCGAL_BUILD_THREE_DOC=OFF ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CGAL_BUILD_THREE_DOC + CGAL_HEADER_ONLY + WITH_CGAL_Qt5 ) vcpkg_cmake_install() @@ -28,28 +36,29 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") else() - foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin) + foreach(ROOT "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE - ${ROOT}/cgal_create_CMakeLists - ${ROOT}/cgal_create_cmake_script - ${ROOT}/cgal_make_macosx_app + "${ROOT}/cgal_create_CMakeLists" + "${ROOT}/cgal_create_cmake_script" + "${ROOT}/cgal_make_macosx_app" ) endforeach() endif() -file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/man") -file( - COPY - ${SOURCE_PATH}/Installation/LICENSE.BSL - ${SOURCE_PATH}/Installation/LICENSE.RFL - ${SOURCE_PATH}/Installation/LICENSE.GPL - ${SOURCE_PATH}/Installation/LICENSE.LGPL - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +set(LICENSES + "${SOURCE_PATH}/Installation/LICENSE" + "${SOURCE_PATH}/Installation/LICENSE.BSL" + "${SOURCE_PATH}/Installation/LICENSE.RFL" + "${SOURCE_PATH}/Installation/LICENSE.GPL" + "${SOURCE_PATH}/Installation/LICENSE.LGPL" ) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_install_copyright(FILE_LIST ${LICENSES}) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/cgal/vcpkg.json b/external_imported/vcpkg/ports/cgal/vcpkg.json index 83dae13a9..c1bf8fca9 100644 --- a/external_imported/vcpkg/ports/cgal/vcpkg.json +++ b/external_imported/vcpkg/ports/cgal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgal", - "version": "5.4", + "version": "5.5", + "port-version": 1, "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", @@ -26,6 +27,7 @@ "boost-logic", "boost-math", "boost-mpl", + "boost-multi-array", "boost-multi-index", "boost-multiprecision", "boost-numeric-conversion", diff --git a/external_imported/vcpkg/ports/cgltf/portfile.cmake b/external_imported/vcpkg/ports/cgltf/portfile.cmake index 181e95d98..edd9d2236 100644 --- a/external_imported/vcpkg/ports/cgltf/portfile.cmake +++ b/external_imported/vcpkg/ports/cgltf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/cgltf - REF v1.11 - SHA512 b3350d34670dac6756ea010bd030c4709f3a6c86d43b5099d10b505437422951e5db7f8e521ec9590a7aada535146614936ff990533d07084b1e50c216572943 + REF v1.13 + SHA512 b46d1f9db11b75a60eb0272e89834444cd5652fa1fa35c80ce8a78437ef1b3d9f871419cc39da2d0e021d594ffc3e3832362ec759df0a7857aa74e4639698435 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cgltf/vcpkg.json b/external_imported/vcpkg/ports/cgltf/vcpkg.json index e787feea1..c61d0e0d7 100644 --- a/external_imported/vcpkg/ports/cgltf/vcpkg.json +++ b/external_imported/vcpkg/ports/cgltf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgltf", - "version": "1.11", + "version": "1.13", "description": "Single-file glTF 2.0 loader and writer written in C99", - "homepage": "https://github.com/jkuhlmann/cgltf" + "homepage": "https://github.com/jkuhlmann/cgltf", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/cgns/hdf5.patch b/external_imported/vcpkg/ports/cgns/hdf5.patch index 67d08fa2d..82316913d 100644 --- a/external_imported/vcpkg/ports/cgns/hdf5.patch +++ b/external_imported/vcpkg/ports/cgns/hdf5.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d871a9dc8..d2c631023 100644 +index 60f9de4..e980ef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -232,46 +232,12 @@ if (CGNS_ENABLE_HDF5) +@@ -261,51 +261,12 @@ if (CGNS_ENABLE_HDF5) cmake_policy(SET CMP0074 NEW) endif() @@ -10,79 +10,52 @@ index d871a9dc8..d2c631023 100644 - message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") - if (HDF5_FOUND) - if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -- set (FIND_HDF_COMPONENTS C) +- if (CG_HDF5_LINK_TYPE STREQUAL "shared") +- set(CG_HDF5_LINK_TYPE "static") +- set(CG_HDF5_LINK_TYPE_UPPER "STATIC") +- else() +- set(CG_HDF5_LINK_TYPE "shared") +- set(CG_HDF5_LINK_TYPE_UPPER "SHARED") +- endif() - -- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) -- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_FOUND}") -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) -- if (HDF5_BUILD_SHARED_LIBS) -- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) -- else (HDF5_BUILD_SHARED_LIBS) -- add_definitions (-DH5_BUILT_AS_STATIC_LIB) -- endif (HDF5_BUILD_SHARED_LIBS) -- else (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -- if (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) -- else (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) -- endif (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) -- endif (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) +- set (FIND_HDF_COMPONENTS C ${CG_HDF5_LINK_TYPE}) - -- else (HDF5_FOUND) +- find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS} REQUIRED) +- message (STATUS "HDF5 libs:${HDF5_FOUND} C:${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}") +- endif() +- +- set(LINK_LIBS ${HDF5_C_${CG_HDF5_LINK_TYPE_UPPER}_LIBRARY}) +- else () - find_package (HDF5) # Legacy find - - #Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here - set(HDF5_TOOLS_DIR ${HDF5_LIBRARY}/../bin) - - #Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here -- if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set(GUESS_SHARED "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- foreach (ITEM ${HDF5_LIBRARIES}) +- if (ITEM MATCHES "(.*)hdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- set(GUESS_SHARED "${ITEM}") +- break() +- endif() +- endforeach() +- if (CGNS_BUILD_SHARED AND EXISTS "${GUESS_SHARED}") - set (HDF5_BUILD_SHARED_LIBS 1) -- add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) +- set (CG_HDF5_LINK_TYPE "shared") +- set (CG_HDF5_LINK_TYPE_UPPER "SHARED") - else () - set (HDF5_BUILD_SHARED_LIBS 0) -- add_definitions (-DH5_BUILT_AS_STATIC_LIB) +- set (CG_HDF5_LINK_TYPE "static") +- set (CG_HDF5_LINK_TYPE_UPPER "STATIC") - endif () -- set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) -- -- endif (HDF5_FOUND) -- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) +- set (LINK_LIBS ${HDF5_LIBRARIES}) + find_package (HDF5 CONFIG REQUIRED) + if (TARGET hdf5::hdf5-shared) + set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) + else () + set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) -+ endif () + endif () +- set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) if (HDF5_FOUND) if (NOT DEFINED HDF5_INCLUDE_DIRS) -@@ -289,20 +255,10 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_FOUND) - - set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") -- if(HDF5_NEED_ZLIB) -- find_library(ZLIB_LIBRARY z) -- mark_as_advanced(CLEAR ZLIB_LIBRARY) -- else (HDF5_NEED_ZLIB) -- mark_as_advanced(FORCE ZLIB_LIBRARY) -- endif(HDF5_NEED_ZLIB) -+ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) - - set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to szip?") -- if (HDF5_NEED_SZIP) -- find_library(SZIP_LIBRARY szip) -- mark_as_advanced(CLEAR SZIP_LIBRARY) -- else (HDF5_NEED_SZIP) -- mark_as_advanced(FORCE SZIP_LIBRARY) -- endif (HDF5_NEED_SZIP) -+ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) - - # Check if HDF5 version is 1.8 or greater - if (HDF5_VERSION VERSION_LESS "1.8.0") -@@ -310,6 +266,7 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_VERSION VERSION_LESS "1.8.0") - - set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") -+ set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) - set(MPI_INC) - set(MPI_LIBS) - if (HDF5_NEED_MPI) diff --git a/external_imported/vcpkg/ports/cgns/linux_lfs.patch b/external_imported/vcpkg/ports/cgns/linux_lfs.patch index 3ccda64e2..af3d411cf 100644 --- a/external_imported/vcpkg/ports/cgns/linux_lfs.patch +++ b/external_imported/vcpkg/ports/cgns/linux_lfs.patch @@ -2,11 +2,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 46446da8a..a3d8cd98f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -82,6 +82,7 @@ if (CGNS_ENABLE_LFS) - else (WIN32) +@@ -116,6 +116,7 @@ if (CGNS_ENABLE_LFS) + else () check_symbol_exists(open64 "sys/types.h;sys/stat.h;unistd.h" HAVE_OPEN64) check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) + add_definitions(-D_FILE_OFFSET_BITS=64 -D__LARGEFILE64_SOURCE -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) - endif (WIN32) + endif () if (HAVE_OPEN64) - add_definitions(-DHAVE_OPEN64) + add_compile_definitions(HAVE_OPEN64) diff --git a/external_imported/vcpkg/ports/cgns/portfile.cmake b/external_imported/vcpkg/ports/cgns/portfile.cmake index bb75a9485..e5d160980 100644 --- a/external_imported/vcpkg/ports/cgns/portfile.cmake +++ b/external_imported/vcpkg/ports/cgns/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGNS/CGNS - REF 86b686bce292eef7782cfb56b6acdb5123c96f49 # v4.2.0 - SHA512 88df741acc1b650724bcbeb82ab0f7e593bf01e0a30c04b14b9915f4ea4331725cc24b87715dd08d93d5a3708660ca7f7874bc0a9c5505b76471802cf033e35d + REF ec538ac11dbaff510464a831ef094b0d6bf7216c # v4.3.0 + SHA512 3c04829ff99c0f4f1cd705f0807fda0a65f970c7eecd23ec624cf09fb6fa2a566c63fc94d46c1d0754910bbff8f98c3723e4f32ef66c3e7e41930313454fa10b HEAD_REF develop PATCHES hdf5.patch @@ -12,13 +12,14 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - fortran CGNS_ENABLE_FORTRAN - tests CGNS_ENABLE_TESTS - hdf5 CGNS_ENABLE_HDF5 - lfs CGNS_ENABLE_LFS - legacy CGNS_ENABLE_LEGACY + "fortran" CGNS_ENABLE_FORTRAN + "tests" CGNS_ENABLE_TESTS + "hdf5" CGNS_ENABLE_HDF5 + "lfs" CGNS_ENABLE_LFS + "legacy" CGNS_ENABLE_LEGACY ) +set(CGNS_BUILD_OPTS "") if(VCPKG_TARGET_ARCHITECTURE MATCHES "64") list(APPEND CGNS_BUILD_OPTS "-DCGNS_ENABLE_64BIT=ON") endif() @@ -29,54 +30,54 @@ else() list(APPEND CGNS_BUILD_OPTS "-DCGNS_BUILD_SHARED=OFF;-DCGNS_USE_SHARED=OFF") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS +# By default, when possible, vcpkg_cmake_configure uses ninja-build as its build system +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ${CGNS_BUILD_OPTS} ) -vcpkg_install_cmake() - -file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) - -file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # the include is all that is needed +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Moves all *.cmake files from /debug/lib/cmake/cgns/ to /share/cgns/ +# See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cgns") + +vcpkg_copy_tools( + TOOL_NAMES + cgnscheck + cgnscompress + cgnsconvert + cgnsdiff + cgnslist + cgnsnames + AUTO_CLEAN +) -set(TOOLS cgnscheck cgnscompress cgnsconvert cgnsdiff cgnslist cgnsnames) +if(VCPKG_TARGET_IS_WINDOWS) + set(TOOLS "adf2hdf.bat" "hdf2adf.bat" "cgnsupdate.bat") +elseif(VCPKG_TARGET_IS_LINUX) + set(TOOLS "adf2hdf" "hdf2adf" "cgnsupdate") +endif() -foreach(tool ${TOOLS}) - set(suffix ${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - endif() +foreach(TOOL ${TOOLS}) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") endforeach() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) -file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -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) +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() -# # Moves all .cmake files from /debug/share/cgns/ to /share/cgns/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cgns) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs" "${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h") +file(INSTALL "${CURRENT_PORT_DIR}/cgnsconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # the include is all that is needed -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# Handle copyright +configure_file("${SOURCE_PATH}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/cgns/vcpkg.json b/external_imported/vcpkg/ports/cgns/vcpkg.json index c738b9a3b..ae0bcfc7d 100644 --- a/external_imported/vcpkg/ports/cgns/vcpkg.json +++ b/external_imported/vcpkg/ports/cgns/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgns", - "version-semver": "4.2.0", + "version-semver": "4.3.0", + "port-version": 1, "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "default-features": [ @@ -20,6 +21,14 @@ "features": [ "tools" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] }, @@ -58,7 +67,7 @@ "description": "Build tests" }, "tools": { - "description": "Build tools" + "description": "No effects, preserved for upgrade compatibility" } } } diff --git a/external_imported/vcpkg/ports/chartdir/portfile.cmake b/external_imported/vcpkg/ports/chartdir/portfile.cmake index 7e79c17d6..d22b18e2d 100644 --- a/external_imported/vcpkg/ports/chartdir/portfile.cmake +++ b/external_imported/vcpkg/ports/chartdir/portfile.cmake @@ -1,13 +1,13 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static) - - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +# ChartDirector's DLL interface only contains primitive types, so it is CRT agnostic. +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() -elseif(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_win.zip" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_win_7.0.0.zip" FILENAME "chartdir_cpp_win-7.0.0.zip" SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b ) @@ -34,9 +34,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_OSX) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_mac_7.0.0.tar.gz" FILENAME "chartdir_cpp_mac-7.0.0.tar.gz" - SHA512 3f00a4eb7c6b7fc1ebd4856c287ca9a76ca4ce813b4203350526c7ef10c946baa3768446178b664af8e8222275f10f9ee6f5f87cf1e23f23c4a221f431864744 + SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2 ) vcpkg_extract_source_archive_ex( @@ -55,7 +55,7 @@ elseif(VCPKG_TARGET_IS_LINUX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_64_7.0.0.tar.gz" FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz" SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ) @@ -63,7 +63,7 @@ elseif(VCPKG_TARGET_IS_LINUX) else() vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_linux.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_7.0.0.tar.gz" FILENAME "chartdir_cpp_linux-7.0.0.tar.gz" SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03 ) @@ -88,6 +88,6 @@ endif() file(GLOB HEADERS "${SOURCE_PATH}/include/*.h") file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/chartdir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake" @ONLY) file(COPY "${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) diff --git a/external_imported/vcpkg/ports/chartdir/vcpkg.json b/external_imported/vcpkg/ports/chartdir/vcpkg.json index f99954188..be70f68ae 100644 --- a/external_imported/vcpkg/ports/chartdir/vcpkg.json +++ b/external_imported/vcpkg/ports/chartdir/vcpkg.json @@ -1,7 +1,9 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 3, + "port-version": 5, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", - "homepage": "https://www.advsofteng.com/" + "homepage": "https://www.advsofteng.com/", + "license": null, + "supports": "!arm & !uwp" } diff --git a/external_imported/vcpkg/ports/check/fix-lib-path.patch b/external_imported/vcpkg/ports/check/fix-lib-path.patch index 1951c2bfe..d3086e74f 100644 --- a/external_imported/vcpkg/ports/check/fix-lib-path.patch +++ b/external_imported/vcpkg/ports/check/fix-lib-path.patch @@ -29,17 +29,15 @@ index 38cbc53..d8a4272 100644 # vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4a02dbe..ade4cfd 100644 +index 4a02dbe..3bf2fa6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT) +@@ -191,7 +191,7 @@ if(NOT THIS_IS_SUBPROJECT) install(TARGETS check checkShared EXPORT check-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - endif() diff --git a/external_imported/vcpkg/ports/check/portfile.cmake b/external_imported/vcpkg/ports/check/portfile.cmake index 0553e0981..1d0920ddb 100644 --- a/external_imported/vcpkg/ports/check/portfile.cmake +++ b/external_imported/vcpkg/ports/check/portfile.cmake @@ -1,30 +1,36 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcheck/check - REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 + REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e HEAD_REF master PATCHES fix-lib-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCHECK_ENABLE_TESTS=OFF + -DBUILD_TESTING=OFF + -DCHECK_ENABLE_GCOV=OFF + -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DCHECK_ENABLE_TIMEOUT_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/check) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) vcpkg_copy_pdbs() 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() # cleanup -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/check/vcpkg.json b/external_imported/vcpkg/ports/check/vcpkg.json index eb021bead..94886beda 100644 --- a/external_imported/vcpkg/ports/check/vcpkg.json +++ b/external_imported/vcpkg/ports/check/vcpkg.json @@ -1,7 +1,18 @@ { "name": "check", - "version-string": "0.15.2", - "port-version": 2, + "version": "0.15.2", + "port-version": 4, "description": "A unit testing framework for C", - "homepage": "https://github.com/libcheck/check" + "homepage": "https://github.com/libcheck/check", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/chromium-base/vcpkg.json b/external_imported/vcpkg/ports/chromium-base/vcpkg.json index a96735ba3..d84ea24e0 100644 --- a/external_imported/vcpkg/ports/chromium-base/vcpkg.json +++ b/external_imported/vcpkg/ports/chromium-base/vcpkg.json @@ -1,8 +1,15 @@ { "name": "chromium-base", - "version-string": "86.0.4199.1", - "port-version": 3, + "version": "86.0.4199.1", + "port-version": 4, "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", "homepage": "https://chromium.googlesource.com/chromium/src", - "supports": "x64 & (osx | windows | linux) & !uwp" + "license": "BSD-3-Clause", + "supports": "x64 & (osx | windows | linux) & !uwp", + "dependencies": [ + { + "name": "vcpkg-tool-gn", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/civetweb/disable_warnings.patch b/external_imported/vcpkg/ports/civetweb/disable_warnings.patch new file mode 100644 index 000000000..8b10a435d --- /dev/null +++ b/external_imported/vcpkg/ports/civetweb/disable_warnings.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1eb391f2c..2665fa73e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,6 +360,7 @@ if (CIVETWEB_ENABLE_CXX) + else() + add_cxx_compiler_flag(-std=${CIVETWEB_CXX_STANDARD}) + endif() ++ if(0) + add_cxx_compiler_flag(-Wall) + add_cxx_compiler_flag(-Wextra) + add_cxx_compiler_flag(-Wshadow) +@@ -377,6 +378,7 @@ if (CIVETWEB_ENABLE_CXX) + add_cxx_compiler_flag(-Werror) + add_cxx_compiler_flag(/WX) + endif() ++ endif() + add_cxx_compiler_flag(-pedantic-errors) + add_cxx_compiler_flag(-fvisibility=hidden) + add_cxx_compiler_flag(-fstack-protector-strong RELEASE) +@@ -403,6 +405,7 @@ endif() + + if (NOT ZEPHYR) + #Warnings: enable everything ++ if(0) + add_c_compiler_flag(-Wall) + add_c_compiler_flag(-Wextra) + add_c_compiler_flag(-Wshadow) +@@ -422,7 +425,7 @@ if (NOT ZEPHYR) + add_c_compiler_flag(-Wno-format-nonliteral) # printf(myFormatStringVar, ...) + add_c_compiler_flag(-Wno-cast-qual) # const cast + add_c_compiler_flag(/Wd4820) # padding +- ++ endif() + add_c_compiler_flag(-pedantic-errors) + add_c_compiler_flag(-fvisibility=hidden) + add_c_compiler_flag(-fstack-protector-strong RELEASE) diff --git a/external_imported/vcpkg/ports/civetweb/portfile.cmake b/external_imported/vcpkg/ports/civetweb/portfile.cmake index 1797bf083..e568049d0 100644 --- a/external_imported/vcpkg/ports/civetweb/portfile.cmake +++ b/external_imported/vcpkg/ports/civetweb/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15 SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d HEAD_REF master + PATCHES + disable_warnings.patch # cl will simply ignore the other invalid options. ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -13,9 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ssl CIVETWEB_ENABLE_SSL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA - See https://github.com/civetweb/civetweb/issues/1024 +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF @@ -25,17 +26,18 @@ vcpkg_configure_cmake( -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_WEBSOCKETS=ON + -DCIVETWEB_ALLOW_WARNINGS=ON ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb) -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") # Handle copyright -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) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/civetweb/vcpkg.json b/external_imported/vcpkg/ports/civetweb/vcpkg.json index e804454c3..98ce11d22 100644 --- a/external_imported/vcpkg/ports/civetweb/vcpkg.json +++ b/external_imported/vcpkg/ports/civetweb/vcpkg.json @@ -1,10 +1,20 @@ { "name": "civetweb", "version": "1.15", - "port-version": 1, + "port-version": 2, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "ssl": { "description": "Enable SSL support", diff --git a/external_imported/vcpkg/ports/cjson/portfile.cmake b/external_imported/vcpkg/ports/cjson/portfile.cmake index 340de48e5..db5482154 100644 --- a/external_imported/vcpkg/ports/cjson/portfile.cmake +++ b/external_imported/vcpkg/ports/cjson/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_cmake_configure( -DENABLE_HIDDEN_SYMBOLS=${DENABLE_HIDDEN_SYMBOLS} -DENABLE_TARGET_EXPORT=ON # Export CMake config files -DENABLE_CJSON_TEST=OFF + -DENABLE_CUSTOM_COMPILER_FLAGS=OFF -DENABLE_FUZZING=OFF ${FEATURE_OPTIONS} ) diff --git a/external_imported/vcpkg/ports/cjson/vcpkg.json b/external_imported/vcpkg/ports/cjson/vcpkg.json index cfdfb121e..0a8e10b1d 100644 --- a/external_imported/vcpkg/ports/cjson/vcpkg.json +++ b/external_imported/vcpkg/ports/cjson/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cjson", "version": "1.7.15", - "port-version": 1, + "port-version": 2, "description": "Ultralightweight JSON parser in ANSI C", "homepage": "https://github.com/DaveGamble/cJSON", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/clfft/portfile.cmake b/external_imported/vcpkg/ports/clfft/portfile.cmake index 79e83bf6d..bd52b1230 100644 --- a/external_imported/vcpkg/ports/clfft/portfile.cmake +++ b/external_imported/vcpkg/ports/clfft/portfile.cmake @@ -29,4 +29,4 @@ endif() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/clfft/vcpkg.json b/external_imported/vcpkg/ports/clfft/vcpkg.json index d20cfa8bc..15886ab2f 100644 --- a/external_imported/vcpkg/ports/clfft/vcpkg.json +++ b/external_imported/vcpkg/ports/clfft/vcpkg.json @@ -1,9 +1,10 @@ { "name": "clfft", "version": "2.12.2", - "port-version": 4, + "port-version": 5, "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", "homepage": "https://github.com/clMathLibraries/clFFT", + "license": "Apache-2.0", "dependencies": [ "opencl", { diff --git a/external_imported/vcpkg/ports/cli/portfile.cmake b/external_imported/vcpkg/ports/cli/portfile.cmake index a9dee4d7d..f80c55f82 100644 --- a/external_imported/vcpkg/ports/cli/portfile.cmake +++ b/external_imported/vcpkg/ports/cli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli - REF v2.0.0 - SHA512 8a3e42d02f8bf757628fb876ccfa376771bbe66e7820d7fd5b34119fca262129f5122e67d939e0898b5964a162a8fd4538d5e6ffa96c4935a8c3979e5d5dbd9d + REF v2.0.2 + SHA512 5a9b96ec59c6b51733c906b1e1815e4fb2cc645599b81a15a3cb0220fd9360bbc3f8e5fdab063c0050188c587e1448cac0629d96437181ddf86555165b79f812 HEAD_REF master ) @@ -17,5 +17,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli) 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_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/cli/vcpkg.json b/external_imported/vcpkg/ports/cli/vcpkg.json index 96f9e5555..357e663da 100644 --- a/external_imported/vcpkg/ports/cli/vcpkg.json +++ b/external_imported/vcpkg/ports/cli/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cli", - "version-semver": "2.0.0", - "port-version": 1, + "version": "2.0.2", "description": "A library for interactive command line interfaces in modern C++", "homepage": "https://github.com/daniele77/cli", + "license": "BSL-1.0", "dependencies": [ "boost-asio", { diff --git a/external_imported/vcpkg/ports/cli11/portfile.cmake b/external_imported/vcpkg/ports/cli11/portfile.cmake index 5adfb8631..1e34f3e0c 100644 --- a/external_imported/vcpkg/ports/cli11/portfile.cmake +++ b/external_imported/vcpkg/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v2.1.2 - SHA512 3b21d015e046666d2e3df2b7cf1a6247c2daa26bf583e714dc1f0a94518785bf90993cd8530f88078b4daac02530dc517db0d5ad452d2a91521b3007f270ea55 + REF v2.2.0 + SHA512 ee8994c99dd8119e612be0339252b863d6db9d85a10c15a6e60e56c6f387bbefaf479679bc85aed2cb6539aeb82b3e7543673a5b97eb04b61793b6946582241d HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/cli11/vcpkg.json b/external_imported/vcpkg/ports/cli11/vcpkg.json index cb780687a..339a2931a 100644 --- a/external_imported/vcpkg/ports/cli11/vcpkg.json +++ b/external_imported/vcpkg/ports/cli11/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cli11", - "version": "2.1.2", - "port-version": 1, + "version": "2.2.0", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/clipboardxx/portfile.cmake b/external_imported/vcpkg/ports/clipboardxx/portfile.cmake new file mode 100644 index 000000000..fa06e40cf --- /dev/null +++ b/external_imported/vcpkg/ports/clipboardxx/portfile.cmake @@ -0,0 +1,24 @@ +# Download the code from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Arian8j2/ClipboardXX + REF d404c39ba384f8e16555610b3633cd7b58d84c59 + SHA512 503bc78cd9fd6096fa92524973d19cbc9169fca91450837a2af7f1518eb928dce10c01e446de1ab76ae0dc366b26831df403f021118fe5c3c2eaeb4d752f638f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-clipboardxx-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-clipboardxx/unofficial-clipboardxx-config.cmake" + @ONLY +) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in b/external_imported/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in new file mode 100644 index 000000000..80e258e85 --- /dev/null +++ b/external_imported/vcpkg/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in @@ -0,0 +1,19 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +add_library(unofficial::ClipboardXX INTERFACE IMPORTED) +set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include" +) + +if("@VCPKG_TARGET_IS_LINUX@") + set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_LINK_LIBRARIES "xcb;pthread" + ) +endif() + +unset(_IMPORT_PREFIX) diff --git a/external_imported/vcpkg/ports/clipboardxx/vcpkg.json b/external_imported/vcpkg/ports/clipboardxx/vcpkg.json new file mode 100644 index 000000000..d274c9070 --- /dev/null +++ b/external_imported/vcpkg/ports/clipboardxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "clipboardxx", + "version-date": "2022-02-04", + "description": "Header only, lightweight and cross platform C++ library for copy and paste text from clipboard.", + "homepage": "https://github.com/Arian8j2/ClipboardXX", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/cmakerc/portfile.cmake b/external_imported/vcpkg/ports/cmakerc/portfile.cmake new file mode 100644 index 000000000..1a0d3ba55 --- /dev/null +++ b/external_imported/vcpkg/ports/cmakerc/portfile.cmake @@ -0,0 +1,14 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vector-of-bool/cmrc + REF a64bea50c05594c8e7cf1f08e441bb9507742e2e + SHA512 134c358143bd43d38802c5b00b3f5cd6a0e4c7918659dd4cc6726a15048e11376e915889788d0dd6bbfe4c4057e18c9b5306c4e785ad16cb0f4cd1c5c4634f80 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/CMakeRC.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME cmakerc-config.cmake) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cmakerc/vcpkg.json b/external_imported/vcpkg/ports/cmakerc/vcpkg.json new file mode 100644 index 000000000..39162213e --- /dev/null +++ b/external_imported/vcpkg/ports/cmakerc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cmakerc", + "version-date": "2021-08-27", + "description": "A Resource Compiler in a Single CMake Script", + "homepage": "https://github.com/vector-of-bool/cmrc", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/cnats/portfile.cmake b/external_imported/vcpkg/ports/cnats/portfile.cmake index 22bc7cd6c..299266c23 100644 --- a/external_imported/vcpkg/ports/cnats/portfile.cmake +++ b/external_imported/vcpkg/ports/cnats/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c - REF v3.2.0 - SHA512 570bbd5b6ed25db17755f4cbd2df9449bf1f838450e29aaa1483c11e6131293490d302031e3039d710bbbc3563ce72fb72cd3ad2c98618977a4858a5a3f2abe3 + REF 8c36c16a9d086738512c9e55157481f8ce46be7c #v3.3.0 + SHA512 5540916cadadb1e0e84be111fe69b88b5f953cacea6d05d3030f8f11b67865c18e5ef7739303def67e7c57b1032656ab78675f2c6e2ecacf058900575278b5eb HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cnats/vcpkg.json b/external_imported/vcpkg/ports/cnats/vcpkg.json index 8ea3c8113..5b2566b4a 100644 --- a/external_imported/vcpkg/ports/cnats/vcpkg.json +++ b/external_imported/vcpkg/ports/cnats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cnats", - "version": "3.2.0", + "version": "3.3.0", "description": "A C client for the NATS messaging system", "homepage": "https://github.com/nats-io/nats.c", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake b/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake index 309011b71..54895bcdc 100644 --- a/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake +++ b/external_imported/vcpkg/ports/cocoyaxi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO idealvin/cocoyaxi - REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 - SHA512 15a7fbd934b44ffd981067c18a66bf07423d8ded102d0c15b79c2f451192f17541b9c1a3d4eb913d9f8c7a55e051e4e1968e16a1113fa81038b3ad9534c57874 + REPO idealvin/coost + REF v2.0.3 + SHA512 b6d38181a8da7dd06cc6ee9c0310ebbc87db5fc0e82e1deb9afba7813d0741fed194887770c55a9a1c61ad677b365cac5ba4f0cf3f32ee376d86c6822d9e30c4 HEAD_REF master ) @@ -10,16 +10,18 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - libcurl WITH_LIBCURL - openssl WITH_OPENSSL + libcurl WITH_LIBCURL + openssl WITH_OPENSSL ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DSTATIC_VS_CRT=${STATIC_CRT} - DISABLE_PARALLEL_CONFIGURE + MAYBE_UNUSED_VARIABLES + STATIC_VS_CRT ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json b/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json index 37ecc51c7..44577d782 100644 --- a/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json +++ b/external_imported/vcpkg/ports/cocoyaxi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cocoyaxi", "version-semver": "2.0.3", - "port-version": 2, + "port-version": 3, "description": "A go-style coroutine library in C++11 and more", "homepage": "https://github.com/idealvin/cocoyaxi", + "license": "MIT", "supports": "!uwp & !(arm & windows)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/comms-ublox/copyright b/external_imported/vcpkg/ports/comms-ublox/copyright new file mode 100644 index 000000000..da9779cc8 --- /dev/null +++ b/external_imported/vcpkg/ports/comms-ublox/copyright @@ -0,0 +1,5 @@ +The generated code has no license, the vendor is free to pick any as long as it's compatibile with the license(s) of the relevant CommsChampion Ecosystem project: + +The protocol definition uses the COMMS Library, which is provided under the MPL-2.0 licence. It allows usage in any closed source projects as long as modifications to the COMMS Library itself remain open source. +The CommsChampion Tools use open source Qt5 libraries, hence are licensed under the GPLv3. It means that any relevant plugin code must remain open source and is not really available to be used in the closed source commercial products. +The code of this project (libraries and tools it contains) is licensed under Apache v2.0 license. diff --git a/external_imported/vcpkg/ports/comms-ublox/fix-comms.patch b/external_imported/vcpkg/ports/comms-ublox/fix-comms.patch deleted file mode 100644 index d9620a4aa..000000000 --- a/external_imported/vcpkg/ports/comms-ublox/fix-comms.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2b69fe..aff5917 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,6 +66,7 @@ endif () - ###################################################################### - - # Use external CommsChampion project or compile it in place -+if(FALSE) - set (CC_EXTERNAL_TGT "comms_champion_external") - if (OPT_BUILD_TEST OR OPT_BUILD_PLUGIN) - set (external_cc_needed TRUE) -@@ -107,6 +108,10 @@ elseif (external_cc_needed) - find_package(CommsChampion NO_MODULE) - set (cc_compile_file "${OPT_CC_MAIN_INSTALL_DIR}/lib/LibComms/cmake/CC_Compile.cmake") - endif () -+else() -+ find_package(LibComms CONFIG REQUIRED) -+ set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake") -+endif() - - if (EXISTS ${cc_compile_file}) - # Set compiler flags diff --git a/external_imported/vcpkg/ports/comms-ublox/portfile.cmake b/external_imported/vcpkg/ports/comms-ublox/portfile.cmake index d5fd4bcea..a57793cee 100644 --- a/external_imported/vcpkg/ports/comms-ublox/portfile.cmake +++ b/external_imported/vcpkg/ports/comms-ublox/portfile.cmake @@ -3,28 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/cc.ublox.generated - REF v0.20.2 - SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569 + REF v1.0 + SHA512 0c487d9409c2f2818024f6232832762527250c3563a5eb5c639ad49943931ceb24616db2432bcd752d1a84820ec5349522510dcd202508641d3f29aef41ca1e5 HEAD_REF master - PATCHES - fix-comms.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DOPT_BUILD_TEST=OFF - -DOPT_BUILD_PLUGIN=OFF - -DOPT_NO_COMMS=ON - -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON + -DOPT_REQUIRE_COMMS_LIB=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox) +vcpkg_cmake_config_fixup(PACKAGE_NAME ublox CONFIG_PATH lib/ublox/cmake) # currently this is only a header only library. after moving lib/ublox to share this lib path will be empty file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/comms-ublox/vcpkg.json b/external_imported/vcpkg/ports/comms-ublox/vcpkg.json index 93668cae0..4b6fd80b6 100644 --- a/external_imported/vcpkg/ports/comms-ublox/vcpkg.json +++ b/external_imported/vcpkg/ports/comms-ublox/vcpkg.json @@ -1,10 +1,19 @@ { "name": "comms-ublox", - "version-semver": "0.20.2", + "version-semver": "1.0.0", "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/cc.ublox.generated", + "license": null, "dependencies": [ - "comms" + "comms", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/comms/portfile.cmake b/external_imported/vcpkg/ports/comms/portfile.cmake index 0ea8ef045..4ad341df2 100644 --- a/external_imported/vcpkg/ports/comms/portfile.cmake +++ b/external_imported/vcpkg/ports/comms/portfile.cmake @@ -1,56 +1,24 @@ #header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO commschamp/comms_champion - REF v3.4 - SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1 + REPO commschamp/comms + REF v4.0 + SHA512 ec83bef647dd6c32e6ba98ce51970c48befaa2b0ff9c26f538fb0ce72e46da14cd592a0c652af5f9f10906f7058ff623dcf13ac4b81c96c0aea1fd8a31551bb7 HEAD_REF master ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools CC_BUILD_TOOLS_LIBRARY - tools CC_INSTALL_TOOLS_LIBRARY - tools CC_BUILD_TOOLS - tools CC_INSTALL_TOOLS -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -DCC_INSTALL_COMMS_LIB=ON - -DCC_BUILD_UNIT_TESTS=OFF + -DCC_COMMS_BUILD_UNIT_TESTS=OFF + -DBUILD_TESTING=OFF -DCC_WARN_AS_ERR=OFF - -DCC_BUILD_DEMO_PROTOCOL=OFF - -DCC_INSTALL_DEMO_PROTOCOL=OFF ) vcpkg_cmake_install() -vcpkg_copy_pdbs() - -vcpkg_cmake_config_fixup(PACKAGE_NAME "LibComms" CONFIG_PATH "lib/LibComms/cmake" ) - -if("tools" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES cc_dump cc_view - AUTO_CLEAN - ) - - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin") - vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake") +vcpkg_cmake_config_fixup(PACKAGE_NAME LibComms CONFIG_PATH lib/LibComms/cmake) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibComms") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/CommsChampion") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibComms") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/CommsChampion") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/comms/vcpkg.json b/external_imported/vcpkg/ports/comms/vcpkg.json index fe4c58918..0eea1ad2b 100644 --- a/external_imported/vcpkg/ports/comms/vcpkg.json +++ b/external_imported/vcpkg/ports/comms/vcpkg.json @@ -1,10 +1,10 @@ { "name": "comms", - "version-semver": "3.4.0", - "port-version": 1, + "version-semver": "4.0.0", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", - "documentation": "https://github.com/commschamp/comms_champion", + "documentation": "https://github.com/commschamp/comms", + "license": "MPL-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -14,14 +14,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "tools": { - "description": "Builds CommsChampion tools", - "supports": "!static", - "dependencies": [ - "qt5-base" - ] - } - } + ] } diff --git a/external_imported/vcpkg/ports/commsdsl/portfile.cmake b/external_imported/vcpkg/ports/commsdsl/portfile.cmake index e7131d93a..be924c841 100644 --- a/external_imported/vcpkg/ports/commsdsl/portfile.cmake +++ b/external_imported/vcpkg/ports/commsdsl/portfile.cmake @@ -1,30 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.6.4 - SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055 + REF v4.0 + SHA512 420fd0dd30aa5530692f40e15e3a640d1ef766c642e91edc07ed182e2125043c6ade1d245ef4d549a606c372c8c5f53fea7faa14b230ff485cf24d4f13ecfbee HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DCOMMSDSL_NO_COMMS_CHAMPION=ON -DCOMMSDSL_BUILD_APPS=ON -DCOMMSDSL_INSTALL_APPS=ON - -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF + -DCOMMSDSL_INSTALL_LIBRARY=ON + -DCOMMSDSL_INSTALL_LIBRARY_HEADERS=ON -DCOMMSDSL_BUILD_UNIT_TESTS=OFF -DCOMMSDSL_WARN_AS_ERR=OFF + -DCOMMSDSL_WIN_ALLOW_LIBXML_BUILD=OFF + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools( - TOOL_NAMES commsdsl2comms + TOOL_NAMES commsdsl2comms commsdsl2test commsdsl2tools_qt AUTO_CLEAN ) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl) +vcpkg_cmake_config_fixup(PACKAGE_NAME LibCommsdsl CONFIG_PATH lib/LibCommsdsl/cmake) # after fixing the following dirs are empty file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl") diff --git a/external_imported/vcpkg/ports/commsdsl/vcpkg.json b/external_imported/vcpkg/ports/commsdsl/vcpkg.json index 84ceafc77..e76e62e05 100644 --- a/external_imported/vcpkg/ports/commsdsl/vcpkg.json +++ b/external_imported/vcpkg/ports/commsdsl/vcpkg.json @@ -1,15 +1,20 @@ { "name": "commsdsl", - "version-semver": "3.6.4", - "port-version": 1, + "version-semver": "4.0.0", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", - "supports": "!uwp & !static", + "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ - "boost-algorithm", - "boost-filesystem", - "boost-program-options", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake index 64231d30b..c6097bdf7 100644 --- a/external_imported/vcpkg/ports/concurrencpp/portfile.cmake +++ b/external_imported/vcpkg/ports/concurrencpp/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp @@ -18,4 +20,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.4) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json index 85ab61dc3..741c9b56b 100644 --- a/external_imported/vcpkg/ports/concurrencpp/vcpkg.json +++ b/external_imported/vcpkg/ports/concurrencpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "concurrencpp", "version": "0.1.4", + "port-version": 1, "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", "homepage": "https://github.com/David-Haim/concurrencpp/", "license": "MIT", - "supports": "(windows & static) | linux | osx", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/configcat/portfile.cmake b/external_imported/vcpkg/ports/configcat/portfile.cmake new file mode 100644 index 000000000..549985291 --- /dev/null +++ b/external_imported/vcpkg/ports/configcat/portfile.cmake @@ -0,0 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO configcat/cpp-sdk + REF v0.1.0 + SHA512 56dee6fe7e54020610c273325d74184ddca7271b434d3527f35eabbdf657bf1c2c84913f4018397ad178f275772fe1207245239237efa95e5692c4845e9a6e7b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCONFIGCAT_BUILD_TESTS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/configcat") + +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) diff --git a/external_imported/vcpkg/ports/configcat/vcpkg.json b/external_imported/vcpkg/ports/configcat/vcpkg.json new file mode 100644 index 000000000..39677c585 --- /dev/null +++ b/external_imported/vcpkg/ports/configcat/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "configcat", + "version": "0.1.0", + "description": "ConfigCat SDK for C++ provides easy integration for your application to ConfigCat. ConfigCat is a feature flag and configuration management service that lets you separate feature releases from deployments. Alternative to LaunchDarkly.", + "homepage": "https://configcat.com/", + "license": "MIT", + "dependencies": [ + "cpr", + "hash-library", + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "z4kn4fein-semver" + ] +} diff --git a/external_imported/vcpkg/ports/console-bridge/portfile.cmake b/external_imported/vcpkg/ports/console-bridge/portfile.cmake index cd43cf0df..37b7f84e1 100644 --- a/external_imported/vcpkg/ports/console-bridge/portfile.cmake +++ b/external_imported/vcpkg/ports/console-bridge/portfile.cmake @@ -1,42 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/console_bridge - REF 0a6c16ed68750837c32ed1cedee9fca7d61d4364 # 1.0.1 - SHA512 8b856bf8c0eec7d7f3f87e10c4de2b99369bd35cab5f9dd5ea3813fdd5a3fd4e7cd31b2336746920e093a515ad1175fd5af79f9d2f6a4648b1814b3131a1ef03 + REF 1.0.2 + SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb 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() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/console_bridge) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/console_bridge/cmake TARGET_PATH share/console_bridge) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/console_bridge) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge) + vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH lib/console_bridge/cmake) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/console_bridge") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") vcpkg_fixup_pkgconfig() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(READ ${SOURCE_PATH}/src/console.cpp _contents) -string(SUBSTRING "${_contents}" 0 2000 license) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/console-bridge) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/console-bridge/copyright "${license}") - -file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}") else() string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" "${_contents}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/console-bridge/vcpkg.json b/external_imported/vcpkg/ports/console-bridge/vcpkg.json index d841bb9e8..55788a26e 100644 --- a/external_imported/vcpkg/ports/console-bridge/vcpkg.json +++ b/external_imported/vcpkg/ports/console-bridge/vcpkg.json @@ -1,7 +1,17 @@ { "name": "console-bridge", - "version-string": "1.0.1", - "port-version": 2, - "description": "a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", - "homepage": "https://github.com/ros/console_bridge" + "version-semver": "1.0.2", + "description": "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", + "homepage": "https://github.com/ros/console_bridge", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/constexpr/portfile.cmake b/external_imported/vcpkg/ports/constexpr/portfile.cmake index 65773ccec..493e78d7b 100644 --- a/external_imported/vcpkg/ports/constexpr/portfile.cmake +++ b/external_imported/vcpkg/ports/constexpr/portfile.cmake @@ -7,10 +7,8 @@ vcpkg_from_github( HEAD_REF master ) -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/constexpr/copyright) - # Copy the constexpr header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/constexpr/vcpkg.json b/external_imported/vcpkg/ports/constexpr/vcpkg.json index 85a8a46c9..b7f266515 100644 --- a/external_imported/vcpkg/ports/constexpr/vcpkg.json +++ b/external_imported/vcpkg/ports/constexpr/vcpkg.json @@ -1,7 +1,8 @@ { "name": "constexpr", - "version-string": "1.0", - "port-version": 2, + "version": "1.0", + "port-version": 3, "description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.", - "homepage": "https://github.com/elbeno/constexpr" + "homepage": "https://github.com/elbeno/constexpr", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/convectionkernels/CMakeLists.txt b/external_imported/vcpkg/ports/convectionkernels/CMakeLists.txt new file mode 100644 index 000000000..9b289bdcb --- /dev/null +++ b/external_imported/vcpkg/ports/convectionkernels/CMakeLists.txt @@ -0,0 +1,30 @@ +cmake_minimum_required(VERSION 3.3.0) + +project( convectionkernels ) + +file(GLOB SRC_FILES *.cpp) +file(GLOB HDR_FILES *.h) +add_library( ${PROJECT_NAME} + STATIC + ${HDR_FILES} + ${SRC_FILES} +) +set_property( TARGET ${PROJECT_NAME} + PROPERTY PUBLIC_HEADER ${HDR_FILES} +) +target_include_directories( ${PROJECT_NAME} + PRIVATE ${CMAKE_CURRENT_LIST_DIR} + INTERFACE $ +) +install( TARGETS ${PROJECT_NAME} + EXPORT unofficial-convectionkernels-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + PUBLIC_HEADER DESTINATION include/convectionkernels +) +install( EXPORT unofficial-convectionkernels-config + FILE unofficial-convectionkernels-config.cmake + NAMESPACE unofficial::convectionkernels:: + DESTINATION share/unofficial-convectionkernels +) diff --git a/external_imported/vcpkg/ports/convectionkernels/portfile.cmake b/external_imported/vcpkg/ports/convectionkernels/portfile.cmake new file mode 100644 index 000000000..9ea14cd5b --- /dev/null +++ b/external_imported/vcpkg/ports/convectionkernels/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO elasota/ConvectionKernels + REF dc2dbbe0ae2cf2be06ef56d1021e2222a56c7fe2 + SHA512 2bf3aff1acb7b2365b882b4c1274ea8bcb9aea3015b5009e0ec50279122ecc623074d0f4fa04ddf8cd457e1f6868075a773bf8a2fa5b4fa9e2fd51d0a76d2560 + 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-convectionkernels) + +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/external_imported/vcpkg/ports/convectionkernels/vcpkg.json b/external_imported/vcpkg/ports/convectionkernels/vcpkg.json new file mode 100644 index 000000000..b43e3244c --- /dev/null +++ b/external_imported/vcpkg/ports/convectionkernels/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "convectionkernels", + "version-date": "2022-06-08", + "description": "Fast, high-quality texture compression library for many formats, also known as cvtt", + "homepage": "https://github.com/elasota/ConvectionKernels", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/corrade/build-corrade-rc-always.patch b/external_imported/vcpkg/ports/corrade/build-corrade-rc-always.patch new file mode 100644 index 000000000..0e46a5250 --- /dev/null +++ b/external_imported/vcpkg/ports/corrade/build-corrade-rc-always.patch @@ -0,0 +1,27 @@ +--- a/src/Corrade/Utility/CMakeLists.txt ++++ b/src/Corrade/Utility/CMakeLists.txt +@@ -185,13 +185,12 @@ + # corrade-rc when generating WinRT targets by setting + # set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF) + # Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT). + # However, it seems like this feature never materialized, as doing this will + # result in corrade-rc that's looking for vcruntime140_app.dll in order to be + # run. Last checked: Nov 2019. +-if(NOT CMAKE_CROSSCOMPILING) + # Sources for standalone corrade-rc + set(CorradeUtilityRc_SRCS + Arguments.cpp + Debug.cpp + Directory.cpp + Configuration.cpp +@@ -235,9 +234,10 @@ + if(CORRADE_TARGET_UNIX) + target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS}) + endif() + set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility") + install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR}) + ++if(NOT CMAKE_CROSSCOMPILING) + # Corrade::rc target alias for superprojects + add_executable(Corrade::rc ALIAS corrade-rc) + endif() diff --git a/external_imported/vcpkg/ports/corrade/portfile.cmake b/external_imported/vcpkg/ports/corrade/portfile.cmake index 2d6b4920d..8dd02a9a6 100644 --- a/external_imported/vcpkg/ports/corrade/portfile.cmake +++ b/external_imported/vcpkg/ports/corrade/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v2020.06 SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227 HEAD_REF master - PATCHES fix-vs2019.patch + PATCHES + fix-vs2019.patch + build-corrade-rc-always.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -24,13 +26,23 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) +set(corrade_rc_param "") +if(VCPKG_CROSSCOMPILING) + set(corrade_rc_param + "-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} + "${corrade_rc_param}" -DUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} + MAYBE_UNUSED_VARIABLES + CORRADE_RC_EXECUTABLE ) vcpkg_install_cmake() @@ -39,9 +51,8 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Install tools +# corrade-rc is not built when CMAKE_CROSSCOMPILING if("utility" IN_LIST FEATURES) - # Drop a copy of tools vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN) endif() @@ -67,4 +78,4 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/corrade/vcpkg.json b/external_imported/vcpkg/ports/corrade/vcpkg.json index d727769a1..17c71da34 100644 --- a/external_imported/vcpkg/ports/corrade/vcpkg.json +++ b/external_imported/vcpkg/ports/corrade/vcpkg.json @@ -1,9 +1,19 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 3, + "port-version": 4, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", + "dependencies": [ + { + "name": "corrade", + "host": true, + "default-features": false, + "features": [ + "utility" + ] + } + ], "default-features": [ "interconnect", "pluginmanager", diff --git a/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake b/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake index 349a0d685..fe22c0e76 100644 --- a/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF d73395e1dc652465fa9524266cd26ad57365491f #v0.10.3 - SHA512 cace318611a1e306b774b4bb08e0312ad06fc10acb829b1df6d5cef9c1d6b018c0c5ebb8e3859fa2bee974dbd51fc5df90a43aa81107c97377d55bb36595b67d + REF 9452c0a4b69c5e4e31169ed32e961d330695122c #v0.10.7 + SHA512 23c4ca159ed4ddf29c3911436436502df76420d8bc8b202f290627de96ee6a741b74409a90f943f3fbbb59af1975bd8c36a94bd4c5eff3981f4514feb326e110 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json index ebbccb3f1..9c06a6f65 100644 --- a/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.10.3", + "version": "0.10.7", "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/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake b/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake index d48a25f7d..6dfacba15 100644 --- a/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-ipc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc - REF a5722957b25a2a429e4e893c427ecd278f2eb0fe #v1.0.1 - SHA512 e5eb7dbec8a3932db78f658422dfe32d377edf50ec594810765718896b32f61b4e6c02e29225cb103279e3313650e31e2b4241ac1adb538172af50fc75a6b0bb + REF f2f1af8f8e7877a28deb2eacdc379a22a99e4c82 #v1.2.0 + SHA512 e01fe5e2612141af64a9c44773a49c566b89ecf0a77164c6eb0a6d68bd7ff5830843ce42df5d53a863882b582a8d6a2e9f69026f244d8d1d96e83f0f4c9e8972 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json index 0be585637..62e2bb49f 100644 --- a/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-ipc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpp-ipc", - "version": "1.0.1", - "port-version": 1, + "version": "1.2.0", "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", "homepage": "https://github.com/mutouyun/cpp-ipc", "supports": "!osx", diff --git a/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake b/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake index 75bf34fd9..c365ad781 100644 --- a/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake +++ b/external_imported/vcpkg/ports/cpp-peglib/portfile.cmake @@ -1,16 +1,16 @@ #header-only library vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yhirose/cpp-peglib - REF v0.1.0 - SHA512 7efe9da8fe75d766a50d6508c81369b71981aa1e36c0d9981d57b75822fde81074b8803753bfa599ab4ce2a7047be731c22476d0938728ebb9a9dbf63aaeb9e6 - HEAD_REF master - ) + OUT_SOURCE_PATH SOURCE_PATH + REPO yhirose/cpp-peglib + REF adfd2d6014f6cce9510ac2374b277ac8fb931c49 + SHA512 8a930286a20098efc053988bd5b7e0d3117ce3851a79acf3c9991b75ff85a6340d106522f66ee322f8e7809143f9f74fa1fb051da277db02532dface5cb6f5c3 + HEAD_REF master +) - file(COPY ${SOURCE_PATH}/peglib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(COPY "${SOURCE_PATH}/peglib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cpp-peglib" RENAME copyright) - # Handle copyright - file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-peglib) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/cpp-peglib/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-peglib/copyright) diff --git a/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json b/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json index b7e978496..01021728c 100644 --- a/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json +++ b/external_imported/vcpkg/ports/cpp-peglib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-peglib", - "version-string": "0.1.0", - "port-version": 1, - "description": "C++11 header-only PEG (Parsing Expression Grammars) library." + "version": "1.3.10", + "description": "C++11 header-only PEG (Parsing Expression Grammars) library.", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/cppcms/fix_narrowing_error.patch b/external_imported/vcpkg/ports/cppcms/fix_narrowing_error.patch new file mode 100644 index 000000000..12c7b038d --- /dev/null +++ b/external_imported/vcpkg/ports/cppcms/fix_narrowing_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/session_win32_file_storage.cpp b/src/session_win32_file_storage.cpp +index ce3fba330..a5e54be84 100644 +--- a/src/session_win32_file_storage.cpp ++++ b/src/session_win32_file_storage.cpp +@@ -186,7 +186,7 @@ void session_file_storage::save_to_file(HANDLE h,time_t timeout,std::string cons + int64_t timeout; + uint32_t crc; + uint32_t size; +- } tmp = { timeout, 0, in.size() }; ++ } tmp = { timeout, 0, static_cast(in.size()) }; + impl::crc32_calc crc_calc; + crc_calc.process_bytes(in.data(),in.size()); + tmp.crc=crc_calc.checksum(); diff --git a/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch b/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch new file mode 100644 index 000000000..7d8e67bdf --- /dev/null +++ b/external_imported/vcpkg/ports/cppcms/no-tests-and-examples.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ce0d53..5b432c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED) + endif(NOT DISABLE_SHARED) + + +- ++if(FALSE) + add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp) + target_link_libraries(hello_world ${CPPCMS_LIB}) ++endif() + + if(NOT DISABLE_TCPCACHE) + add_executable(cppcms_scale src/cache_server_main.cpp) +@@ -710,7 +711,7 @@ endif(DISABLE_SHARED) + ######################################### + # Tests + ######################################### +- ++if(FALSE) + set(ALL_TESTS + form_test + proto_test +@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) + if(NOT DISABLE_GZIP) + target_link_libraries(response_test ${ZLIB}) + endif() +- ++endif() + ##################################### + # End of tests + ##################################### + + # These are use export + if(IS_WINDOWS AND NOT DISABLE_SHARED) +- set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES ++ set_target_properties(${ALL_TESTS} cppcms PROPERTIES + COMPILE_DEFINITIONS DLL_EXPORT) + endif() + +@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include + ############# + + +- ++if(FALSE) + set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests") + + add_test(base64_test base64_test) +@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS) + PROPERTIES TIMEOUT 120) + + endif() +- ++endif() + diff --git a/external_imported/vcpkg/ports/cppcms/portfile.cmake b/external_imported/vcpkg/ports/cppcms/portfile.cmake index 54bc57039..b876f77d9 100644 --- a/external_imported/vcpkg/ports/cppcms/portfile.cmake +++ b/external_imported/vcpkg/ports/cppcms/portfile.cmake @@ -5,24 +5,28 @@ vcpkg_from_github( REPO artyom-beilis/cppcms REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df + PATCHES + no-tests-and-examples.patch + fix_narrowing_error.patch ) vcpkg_find_acquire_program(PYTHON2) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYTHON=${PYTHON2} # Switch to python3 on the next update -DUSE_WINDOWS6_API=ON + -DDISABLE_SHARED=${DISABLE_DYNAMIC} ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) -file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -file(REMOVE ${EXE_DEBUG_FILES}) -file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(REMOVE ${EXE_FILES}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cppcms/vcpkg.json b/external_imported/vcpkg/ports/cppcms/vcpkg.json index 601d57550..54dbb33fe 100644 --- a/external_imported/vcpkg/ports/cppcms/vcpkg.json +++ b/external_imported/vcpkg/ports/cppcms/vcpkg.json @@ -1,14 +1,19 @@ { "name": "cppcms", - "version-string": "1.2.1", - "port-version": 4, + "version": "1.2.1", + "port-version": 6, "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", - "supports": "!(linux | osx)", + "license": "MIT", + "supports": "!(linux | osx | (windows & static))", "dependencies": [ "icu", "openssl", "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/cppcodec/0001-Fix-62.patch b/external_imported/vcpkg/ports/cppcodec/0001-Fix-62.patch new file mode 100644 index 000000000..af12439e9 --- /dev/null +++ b/external_imported/vcpkg/ports/cppcodec/0001-Fix-62.patch @@ -0,0 +1,28 @@ +From 9f67d7026d3dee8fc6a0af614d97f9365cee2872 Mon Sep 17 00:00:00 2001 +From: Gabriele_Frau +Date: Wed, 17 Oct 2018 14:35:54 +0200 +Subject: [PATCH] Fix #62 + + includes macro definitions named max and min, wrap the call to max and min with parentheses, which prevent the macro expansion +--- + cppcodec/detail/stream_codec.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cppcodec/detail/stream_codec.hpp b/cppcodec/detail/stream_codec.hpp +index d4204bc..4d8d054 100644 +--- a/cppcodec/detail/stream_codec.hpp ++++ b/cppcodec/detail/stream_codec.hpp +@@ -187,8 +187,8 @@ template + static CPPCODEC_ALWAYS_INLINE constexpr size_t num_possible_values() + { + return static_cast( +- static_cast(std::numeric_limits::max()) +- - static_cast(std::numeric_limits::min()) + 1); ++ static_cast((std::numeric_limits::max)()) ++ - static_cast((std::numeric_limits::min)()) + 1); + } + + template +-- +2.32.0.windows.1 + diff --git a/external_imported/vcpkg/ports/cppcodec/portfile.cmake b/external_imported/vcpkg/ports/cppcodec/portfile.cmake index 792e734f5..cd519b701 100644 --- a/external_imported/vcpkg/ports/cppcodec/portfile.cmake +++ b/external_imported/vcpkg/ports/cppcodec/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.2 SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3 HEAD_REF master + PATCHES 0001-Fix-62.patch ) vcpkg_configure_cmake( diff --git a/external_imported/vcpkg/ports/cppcodec/vcpkg.json b/external_imported/vcpkg/ports/cppcodec/vcpkg.json index 1066a7b85..e685ad5ec 100644 --- a/external_imported/vcpkg/ports/cppcodec/vcpkg.json +++ b/external_imported/vcpkg/ports/cppcodec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppcodec", - "version-string": "0.2", - "port-version": 2, + "version": "0.2", + "port-version": 3, "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." } diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake b/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake index e9fbd0033..1270b2f9e 100644 --- a/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake +++ b/external_imported/vcpkg/ports/cppgraphqlgen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen - REF v4.1.1 - SHA512 20987f03719558cec2fac8aee5a94e59c5e833a318361aef802f39bc369af141fef0c7f2d3bb35324d44d289843564c2f7e890419f871bfd8e5d7d5de53b363e + REF v4.5.0 + SHA512 5a8eb6fc90aee05ae25245fac3e97a00c637d61340a070a28f1e5b7827d0e18ed01d3e6c4dcc138961769f7eef64ac8c6b33f7f16f8536d070a5ddffad0de414 HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json index 6bed1ba31..16e12c038 100644 --- a/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json +++ b/external_imported/vcpkg/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppgraphqlgen", - "version-semver": "4.1.1", + "version": "4.5.0", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/external_imported/vcpkg/ports/cpprestsdk/fix_narrowing.patch b/external_imported/vcpkg/ports/cpprestsdk/fix_narrowing.patch new file mode 100644 index 000000000..975a759ca --- /dev/null +++ b/external_imported/vcpkg/ports/cpprestsdk/fix_narrowing.patch @@ -0,0 +1,50 @@ +diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt +index e15aeb7fc..128f6d6af 100644 +--- a/Release/src/CMakeLists.txt ++++ b/Release/src/CMakeLists.txt +@@ -185,12 +185,12 @@ endif() + + configure_pch(cpprest stdafx.h pch/stdafx.cpp /Zm120) + +-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT MSVC) + if(WERROR) + target_compile_options(cpprest PRIVATE -Werror) + endif() + target_compile_options(cpprest PRIVATE -pedantic ${WARNINGS}) +-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") ++elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC") + if(WERROR) + target_compile_options(cpprest PRIVATE /WX ${WARNINGS}) + endif() +diff --git a/Release/src/streams/fileio_win32.cpp b/Release/src/streams/fileio_win32.cpp +index 057dd9b67..a65439cb7 100644 +--- a/Release/src/streams/fileio_win32.cpp ++++ b/Release/src/streams/fileio_win32.cpp +@@ -616,7 +616,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; +@@ -668,7 +668,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; +@@ -719,7 +719,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; diff --git a/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake b/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake index 468201808..237df1a40 100644 --- a/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake +++ b/external_imported/vcpkg/ports/cpprestsdk/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 122d09549201da5383321d870bed45ecb9e168c5 SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7 HEAD_REF master - PATCHES fix-find-openssl.patch + PATCHES + fix-find-openssl.patch + fix_narrowing.patch ) set(OPTIONS) @@ -23,9 +25,13 @@ vcpkg_check_features( websockets CPPREST_EXCLUDE_WEBSOCKETS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Release - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Release" + ${configure_opts} OPTIONS ${OPTIONS} ${FEATURE_OPTIONS} @@ -38,16 +44,16 @@ vcpkg_configure_cmake( -DCPPREST_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h" "#ifdef _NO_ASYNCRTIMP" "#if 1") endif() -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/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json b/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json index d33e61ed9..eca5412f7 100644 --- a/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json +++ b/external_imported/vcpkg/ports/cpprestsdk/vcpkg.json @@ -1,11 +1,13 @@ { "name": "cpprestsdk", - "version-string": "2.10.18", + "version": "2.10.18", + "port-version": 2, "description": [ "C++11 JSON, REST, and OAuth library", "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." ], "homepage": "https://github.com/Microsoft/cpprestsdk", + "license": "MIT", "dependencies": [ { "name": "boost-asio", @@ -42,6 +44,14 @@ { "name": "openssl", "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/external_imported/vcpkg/ports/cppwinrt/cppwinrt-config.cmake b/external_imported/vcpkg/ports/cppwinrt/cppwinrt-config.cmake new file mode 100644 index 000000000..c3e757525 --- /dev/null +++ b/external_imported/vcpkg/ports/cppwinrt/cppwinrt-config.cmake @@ -0,0 +1,14 @@ +set(CppWinRT_FOUND TRUE) + +if(NOT TARGET Microsoft::CppWinRT) + get_filename_component(cppwinrt_root "${CMAKE_CURRENT_LIST_DIR}" PATH) + get_filename_component(cppwinrt_root "${cppwinrt_root}" PATH) + + add_library(Microsoft::CppWinRT INTERFACE IMPORTED) + set_target_properties(Microsoft::CppWinRT PROPERTIES + INTERFACE_COMPILE_FEATURES cxx_std_17 + INTERFACE_INCLUDE_DIRECTORIES "${cppwinrt_root}/include" + INTERFACE_LINK_LIBRARIES "${cppwinrt_root}/lib/cppwinrt_fast_forwarder.lib" + ) + unset(cppwinrt_root) +endif() diff --git a/external_imported/vcpkg/ports/cppwinrt/portfile.cmake b/external_imported/vcpkg/ports/cppwinrt/portfile.cmake index a875a5a5e..7a3cd021c 100644 --- a/external_imported/vcpkg/ports/cppwinrt/portfile.cmake +++ b/external_imported/vcpkg/ports/cppwinrt/portfile.cmake @@ -1,10 +1,70 @@ -find_path(CPPWINRT_BASE_H - NAMES winrt/base.h - PATHS $ENV{INCLUDE} +set(CPPWINRT_VERSION 2.0.220418.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Windows.CppWinRT/${CPPWINRT_VERSION}" + FILENAME "cppwinrt.${CPPWINRT_VERSION}.zip" + SHA512 67738587f7b1ca98a7c2c2c0733dd09612deb5ef6bcfa788ca0bcccbbfde2c706a675316085a41e79ab2c8796a0dd3bdba87d5c996dc0b6f76b438b5d75d2567 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH src + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CPPWINRT_ARCH win32) +else() + set(CPPWINRT_ARCH ${VCPKG_TARGET_ARCHITECTURE}) +endif() + +set(CPPWINRT_TOOL "${src}/bin/cppwinrt.exe") + +#--- Find Windows SDK Version +if (NOT EXISTS "$ENV{WindowsSDKDir}/Lib/$ENV{WindowsSDKVersion}.") + message(FATAL_ERROR "ERROR: Cannot locate the Windows SDK. Please define %WindowsSDKDir% and %WindowsSDKVersion%. +(Expected file to exist: $ENV{WindowsSDKDir}/Lib/$ENV{WindowsSDKVersion})") +endif() +if (NOT EXISTS "$ENV{WindowsSDKDir}References/$ENV{WindowsSDKVersion}Windows.Foundation.FoundationContract") + message(FATAL_ERROR "ERROR: The Windows SDK is too old (needs 14393 or later, found $ENV{WindowsSDKVersion}).") +endif() + +file(TO_CMAKE_PATH "$ENV{WindowsSDKDir}References/$ENV{WindowsSDKVersion}" winsdk) + +file(GLOB winmds "${winsdk}/*/*/*.winmd") + +#--- Create response file +set(args "") +foreach(winmd IN LISTS winmds) + string(APPEND args "-input \"${winmd}\"\n") +endforeach() + +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") +file(WRITE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" "${args}") + +#--- Generate headers +message(STATUS "Generating headers for Windows SDK $ENV{WindowsSDKVersion}") +vcpkg_execute_required_process( + COMMAND "${CPPWINRT_TOOL}" + "@${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" + -output "${CURRENT_PACKAGES_DIR}/include" + -verbose + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}" + LOGNAME "cppwinrt-generate-${TARGET_TRIPLET}" ) -if(NOT CPPWINRT_BASE_H) - message(FATAL_ERROR "Unable to locate cppwinrt. Please install Windows SDK version 10.0.17134.0 or newer.") +set(CPPWINRT_LIB "${src}/build/native/lib/${CPPWINRT_ARCH}/cppwinrt_fast_forwarder.lib") +file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() +file(COPY + "${CPPWINRT_TOOL}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cppwinrt") +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/cppwinrt-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/cppwinrt") -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file +configure_file("${src}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/cppwinrt/usage b/external_imported/vcpkg/ports/cppwinrt/usage new file mode 100644 index 000000000..a83a44a7e --- /dev/null +++ b/external_imported/vcpkg/ports/cppwinrt/usage @@ -0,0 +1,4 @@ +cppwinrt provides CMake targets: + + find_package(cppwinrt CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::CppWinRT) diff --git a/external_imported/vcpkg/ports/cppwinrt/vcpkg.json b/external_imported/vcpkg/ports/cppwinrt/vcpkg.json index 7ff77b5d7..679191ebe 100644 --- a/external_imported/vcpkg/ports/cppwinrt/vcpkg.json +++ b/external_imported/vcpkg/ports/cppwinrt/vcpkg.json @@ -1,7 +1,9 @@ { "name": "cppwinrt", - "version-string": "windows-sdk", + "version": "2.0.220418.1", "description": "C++/WinRT is a standard C++ language projection for the Windows Runtime.", - "homepage": "https://github.com/Microsoft/cppwinrt", + "homepage": "https://github.com/microsoft/cppwinrt", + "documentation": "https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/", + "license": "MIT", "supports": "windows" } diff --git a/external_imported/vcpkg/ports/cpr/disable_werror.patch b/external_imported/vcpkg/ports/cpr/disable_werror.patch new file mode 100644 index 000000000..48803b8e3 --- /dev/null +++ b/external_imported/vcpkg/ports/cpr/disable_werror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb7c5f042..a5bc0b942 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK) + include(cmake/cppcheck.cmake) + endif() + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") ++if (1) + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror") + endif() diff --git a/external_imported/vcpkg/ports/cpr/portfile.cmake b/external_imported/vcpkg/ports/cpr/portfile.cmake index 24790b9b6..2cfe4218b 100644 --- a/external_imported/vcpkg/ports/cpr/portfile.cmake +++ b/external_imported/vcpkg/ports/cpr/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.8.1 - SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db + REF f88fd7737de3e640c61703eb57a0fa0ce00c60cd #v1.9.2 + SHA512 9c336663c2128f3aa17db2c8fb221ef31b53e9cc4b0e1ed55c9b17e865216372410218499ae76261774997b7ba83812034a70c198a9d59bc6e025a3d8c74b74c HEAD_REF master PATCHES 001-cpr-config.patch + disable_werror.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/cpr/vcpkg.json b/external_imported/vcpkg/ports/cpr/vcpkg.json index be243b70c..f1d5a511f 100644 --- a/external_imported/vcpkg/ports/cpr/vcpkg.json +++ b/external_imported/vcpkg/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.8.1", + "version-semver": "1.9.2", "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/external_imported/vcpkg/ports/cpu-features/portfile.cmake b/external_imported/vcpkg/ports/cpu-features/portfile.cmake index 4b4ca71d2..0e431e353 100644 --- a/external_imported/vcpkg/ports/cpu-features/portfile.cmake +++ b/external_imported/vcpkg/ports/cpu-features/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0 SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b HEAD_REF master - PATCHES make_list_cpu_features_optional.patch + PATCHES + make_list_cpu_features_optional.patch + windows-x86-fix.patch ) # If feature "tools" is not specified, disable building/exporting executable targets. diff --git a/external_imported/vcpkg/ports/cpu-features/vcpkg.json b/external_imported/vcpkg/ports/cpu-features/vcpkg.json index e44c32017..0953cb962 100644 --- a/external_imported/vcpkg/ports/cpu-features/vcpkg.json +++ b/external_imported/vcpkg/ports/cpu-features/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpu-features", "version": "0.6.0", - "port-version": 1, + "port-version": 2, "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime", "homepage": "https://github.com/google/cpu_features", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch b/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch new file mode 100644 index 000000000..4dc7bf767 --- /dev/null +++ b/external_imported/vcpkg/ports/cpu-features/windows-x86-fix.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,13 +60,13 @@ + if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") + set(PROCESSOR_IS_MIPS TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(PROCESSOR_IS_ARM TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(PROCESSOR_IS_AARCH64 TRUE) +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)") + set(PROCESSOR_IS_X86 TRUE) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + set(PROCESSOR_IS_POWER TRUE) + endif() + + macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME) diff --git a/external_imported/vcpkg/ports/cpuid/fix-build.patch b/external_imported/vcpkg/ports/cpuid/fix-build.patch new file mode 100644 index 000000000..c855b07bd --- /dev/null +++ b/external_imported/vcpkg/ports/cpuid/fix-build.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08e78d4..9e84c7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,5 +26,3 @@ endif(UNIX) + + # Include subdirectories + add_subdirectory(libcpuid) +-add_subdirectory(cpuid_tool) +-add_subdirectory(tests) +diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt +index 7031650..9355436 100644 +--- a/libcpuid/CMakeLists.txt ++++ b/libcpuid/CMakeLists.txt +@@ -12,7 +12,7 @@ if("${MSVC_CXX_ARCHITECTURE_ID}" MATCHES "x64") + list(APPEND cpuid_sources masm-x64.asm) + endif() + +-if(UNIX) ++if(0) + add_library(cpuid SHARED ${cpuid_sources}) + else() + add_library(cpuid ${cpuid_sources}) diff --git a/external_imported/vcpkg/ports/cpuid/portfile.cmake b/external_imported/vcpkg/ports/cpuid/portfile.cmake index 6f38ec89b..9428b1185 100644 --- a/external_imported/vcpkg/ports/cpuid/portfile.cmake +++ b/external_imported/vcpkg/ports/cpuid/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,6 +8,8 @@ vcpkg_from_github( REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1 SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b HEAD_REF master + PATCHES + fix-build.patch ) vcpkg_cmake_configure( @@ -17,11 +21,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/cpuid/vcpkg.json b/external_imported/vcpkg/ports/cpuid/vcpkg.json index 1e77b381c..bc12faef4 100644 --- a/external_imported/vcpkg/ports/cpuid/vcpkg.json +++ b/external_imported/vcpkg/ports/cpuid/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cpuid", "version": "0.5.1", - "port-version": 3, + "port-version": 4, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", + "license": "MIT", "supports": "(x86 | x64) & !uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/cpuinfo/portfile.cmake b/external_imported/vcpkg/ports/cpuinfo/portfile.cmake index aa964e6e1..0065691ad 100644 --- a/external_imported/vcpkg/ports/cpuinfo/portfile.cmake +++ b/external_imported/vcpkg/ports/cpuinfo/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/cpuinfo - REF b40bae27785787b6dd70788986fd96434cf90ae2 - SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c + REF 5e63739504f0f8e18e941bd63b2d6d42536c7d90 + SHA512 6a61f4574661a55771c2ec31bb0919a51d0bd8c770477b254a5c14dc5323716af275c7fe3abc5aa96720d7cc929559ca66f614265d3940e076b8db2fa15c8e36 HEAD_REF master ) @@ -16,6 +16,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools CPUINFO_BUILD_TOOLS ) +set(LINK_OPTIONS "") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared) else() @@ -28,29 +29,11 @@ else() list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=static) endif() -# hack to get around that toolchains/windows.cmake doesn't set CMAKE_SYSTEM_ARCHITECTURE -set(CPUINFO_TARGET_PROCESSOR_param "") -if(VCPKG_TARGET_IS_WINDOWS) - # NOTE: arm64-windows is unsupported for now; - # see https://github.com/pytorch/cpuinfo/pull/82 for updates - # NOTE: arm-windows is unsupported - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=x86") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=AMD64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM64") - endif() -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ${LINK_OPTIONS} - ${CPUINFO_TARGET_PROCESSOR_param} -DCPUINFO_BUILD_UNIT_TESTS=OFF -DCPUINFO_BUILD_MOCK_TESTS=OFF -DCPUINFO_BUILD_BENCHMARKS=OFF @@ -64,7 +47,7 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if("tools" IN_LIST FEATURES) vcpkg_copy_tools( diff --git a/external_imported/vcpkg/ports/cpuinfo/vcpkg.json b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json index d718f9393..d2087dfbc 100644 --- a/external_imported/vcpkg/ports/cpuinfo/vcpkg.json +++ b/external_imported/vcpkg/ports/cpuinfo/vcpkg.json @@ -1,10 +1,10 @@ { "name": "cpuinfo", - "version-date": "2022-04-02", + "version-date": "2022-07-19", "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", - "supports": "!(arm & windows)", + "supports": "!(uwp & arm32)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/crashpad/crashpadConfig.cmake.in b/external_imported/vcpkg/ports/crashpad/crashpadConfig.cmake.in index 1c95bf1b7..4bb7434d1 100644 --- a/external_imported/vcpkg/ports/crashpad/crashpadConfig.cmake.in +++ b/external_imported/vcpkg/ports/crashpad/crashpadConfig.cmake.in @@ -15,7 +15,7 @@ if(WIN32) target_compile_definitions(crashpad INTERFACE NOMINMAX) elseif(APPLE) list(APPEND CRASHPAD_LIBRARIES ApplicationServices - CoreFoundation Foundation IOKit Security bsm) + CoreFoundation Foundation IOKit Security bsm mig_output) endif() foreach(LIB_NAME ${CRASHPAD_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/crashpad/portfile.cmake b/external_imported/vcpkg/ports/crashpad/portfile.cmake index 1764fc99a..9df18b7ac 100644 --- a/external_imported/vcpkg/ports/crashpad/portfile.cmake +++ b/external_imported/vcpkg/ports/crashpad/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 9a31d3f8e9815774026a753a1ff6155347cd549f + REF 261679b3d2f3336d8531ed38e110254c3e2d1c10 ) +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -24,7 +27,7 @@ endfunction() checkout_in_path( "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium" "https://chromium.googlesource.com/chromium/mini_chromium" - "c426ff98e1d9e9d59777fe8b883a5c0ceeca9ca3" + "5654edb4225bcad13901155c819febb5748e502b" ) function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES) @@ -63,23 +66,20 @@ set(OPTIONS_REL "") if(CMAKE_HOST_WIN32) # Load toolchains - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - - foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS - CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE) - string(STRIP "${${_VAR}}" ${_VAR}) - endforeach() + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") set(OPTIONS_DBG "${OPTIONS_DBG} \ - extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \ - extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"") + extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_DEBUG}\" \ + extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_DEBUG}\" \ + extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}\" \ + extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}\"") set(OPTIONS_REL "${OPTIONS_REL} \ - extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \ - extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"") + extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_RELEASE}\" \ + extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_RELEASE}\" \ + extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}\" \ + extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}\"") set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\ extra_cflags=\"/GL-\" \ @@ -111,6 +111,13 @@ install_headers("${SOURCE_PATH}/util") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +if(VCPKG_TARGET_IS_OSX) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() + # remove empty directories file(REMOVE_RECURSE "${PACKAGES_INCLUDE_DIR}/util/net/testdata" @@ -119,6 +126,9 @@ file(REMOVE_RECURSE configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build/config") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") + vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/external_imported/vcpkg/ports/crashpad/vcpkg.json b/external_imported/vcpkg/ports/crashpad/vcpkg.json index d244f5987..e57a5f6b5 100644 --- a/external_imported/vcpkg/ports/crashpad/vcpkg.json +++ b/external_imported/vcpkg/ports/crashpad/vcpkg.json @@ -1,14 +1,22 @@ { "name": "crashpad", - "version-date": "2020-03-18", - "port-version": 2, + "version-date": "2022-09-05", "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", - "supports": "x64 & (osx | windows)", + "license": "Apache-2.0", + "supports": "osx | (windows & !uwp)", "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/crashrpt/002-fix-wtl-includepath.patch b/external_imported/vcpkg/ports/crashrpt/002-fix-wtl-includepath.patch new file mode 100644 index 000000000..8c2d37aac --- /dev/null +++ b/external_imported/vcpkg/ports/crashrpt/002-fix-wtl-includepath.patch @@ -0,0 +1,148 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed9e3d3..d842aa7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ if(NOT TINYXML_INCLUDE_DIR) + message(FATAL_ERROR "tinyxml include dir not found") + endif() + +-find_path(WTL_INCLUDE_DIR wtl/atlapp.h) ++find_path(WTL_INCLUDE_DIR atlapp.h) + if(NOT WTL_INCLUDE_DIR) + message(FATAL_ERROR "WTL include dir not found") + endif() +diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc +index e12b8e9..a08f63e 100644 +--- a/processing/crashrptprobe/CrashRptProbe.rc ++++ b/processing/crashrptprobe/CrashRptProbe.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h +index 0b60659..2b027b2 100644 +--- a/processing/crashrptprobe/stdafx.h ++++ b/processing/crashrptprobe/stdafx.h +@@ -70,13 +70,13 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + + #if _MSC_VER<1400 + #define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count) +diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc +index a8c821b..95e7502 100644 +--- a/reporting/crashrpt/CrashRpt.rc ++++ b/reporting/crashrpt/CrashRpt.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h +index 13bbe50..3ed0a55 100644 +--- a/reporting/crashrpt/StdAfx.h ++++ b/reporting/crashrpt/StdAfx.h +@@ -54,12 +54,12 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + #include + #include + #include +diff --git a/reporting/crashsender/CrashSender.rc b/reporting/crashsender/CrashSender.rc +index e10e269..0502962 100644 +--- a/reporting/crashsender/CrashSender.rc ++++ b/reporting/crashsender/CrashSender.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -243,7 +243,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashsender/stdafx.h b/reporting/crashsender/stdafx.h +index 4494d3a..9bbbe3a 100644 +--- a/reporting/crashsender/stdafx.h ++++ b/reporting/crashsender/stdafx.h +@@ -61,19 +61,19 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + + extern CAppModule _Module; + + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define _WTL_USE_CSTRING +-#include ++#include + + #include + #include diff --git a/external_imported/vcpkg/ports/crashrpt/003-add-definition-UNICODE.patch b/external_imported/vcpkg/ports/crashrpt/003-add-definition-UNICODE.patch new file mode 100644 index 000000000..1a8b60ac6 --- /dev/null +++ b/external_imported/vcpkg/ports/crashrpt/003-add-definition-UNICODE.patch @@ -0,0 +1,39 @@ +diff --git a/processing/crashrptprobe/CMakeLists.txt b/processing/crashrptprobe/CMakeLists.txt +index c513c6d..8ac306a 100644 +--- a/processing/crashrptprobe/CMakeLists.txt ++++ b/processing/crashrptprobe/CMakeLists.txt +@@ -13,7 +13,7 @@ list(REMOVE_ITEM srcs_using_precomp ./CrashRptProbe.rc ./CrashRptProbe.def ./st + add_msvc_precompiled_header(stdafx.h ./stdafx.cpp srcs_using_precomp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE) ++add_definitions(-D_UNICODE -DUNICODE) + + fix_default_compiler_settings_() + +diff --git a/reporting/crashrpt/CMakeLists.txt b/reporting/crashrpt/CMakeLists.txt +index c7e4fd6..da9cef1 100644 +--- a/reporting/crashrpt/CMakeLists.txt ++++ b/reporting/crashrpt/CMakeLists.txt +@@ -12,7 +12,7 @@ list(REMOVE_ITEM srcs_using_precomp ./CrashRpt.rc ./StdAfx.cpp ./CrashRpt.def) + add_msvc_precompiled_header(stdafx.h ./StdAfx.cpp srcs_using_precomp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE) ++add_definitions(-D_UNICODE -DUNICODE -D_CRT_SECURE_NO_DEPRECATE) + + # Modify default compiler settings + fix_default_compiler_settings_() +diff --git a/reporting/crashsender/CMakeLists.txt b/reporting/crashsender/CMakeLists.txt +index aa4ab8a..f081254 100644 +--- a/reporting/crashsender/CMakeLists.txt ++++ b/reporting/crashsender/CMakeLists.txt +@@ -15,7 +15,7 @@ list(APPEND source_files + ${CMAKE_SOURCE_DIR}/reporting/CrashRpt/SharedMem.cpp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE ) ++add_definitions(-D_UNICODE -DUNICODE) + + fix_default_compiler_settings_() + diff --git a/external_imported/vcpkg/ports/crashrpt/portfile.cmake b/external_imported/vcpkg/ports/crashrpt/portfile.cmake index a4265e0f8..12212d84c 100644 --- a/external_imported/vcpkg/ports/crashrpt/portfile.cmake +++ b/external_imported/vcpkg/ports/crashrpt/portfile.cmake @@ -12,13 +12,15 @@ vcpkg_from_git( REF 4616504670be5a425a525376648d912a72ce18f2 PATCHES 001-add-install-target-and-find-deps.patch + 002-fix-wtl-includepath.patch + 003-add-definition-UNICODE.patch ) # Remove vendored dependencies to ensure they are not picked up by the build # Vendored minizip is still used since it contains modifications needed for CrashRpt foreach(DEPENDENCY dbghelp jpeg libogg libpng libtheora tinyxml wtl zlib) - if(EXISTS ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) - file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) + if(EXISTS "${SOURCE_PATH}/thirdparty/${DEPENDENCY}") + file(REMOVE_RECURSE "${SOURCE_PATH}/thirdparty/${DEPENDENCY}") endif() endforeach() @@ -32,21 +34,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS demos CRASHRPT_BUILD_DEMOS ) -# PREFER_NINJA is not used below since CrashSender fails to build with errors like this one: -# C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.23.28105\ATLMFC\include\atlconv.h(788): error C2440: 'return': cannot convert from 'LPCTSTR' to 'LPCOLESTR' -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCRASHRPT_BUILD_SHARED_LIBS=${CRASHRPT_BUILD_SHARED_LIBS} -DCRASHRPT_LINK_CRT_AS_DLL=${CRASHRPT_LINK_CRT_AS_DLL} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/external_imported/vcpkg/ports/crashrpt/vcpkg.json b/external_imported/vcpkg/ports/crashrpt/vcpkg.json index 4b36fcda6..774ff5c30 100644 --- a/external_imported/vcpkg/ports/crashrpt/vcpkg.json +++ b/external_imported/vcpkg/ports/crashrpt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "crashrpt", "version": "1.4.3", - "port-version": 2, + "port-version": 3, "description": "A crash reporting system for Windows applications", "homepage": "http://crashrpt.sourceforge.net/", + "license": "BSD-3-Clause", "supports": "!osx & !linux & !uwp & (x86 | x64)", "dependencies": [ "dbghelp", @@ -12,6 +13,10 @@ "libpng", "libtheora", "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, "wtl", "zlib" ], diff --git a/external_imported/vcpkg/ports/crc32c/fix_clang-cl.patch b/external_imported/vcpkg/ports/crc32c/fix_clang-cl.patch new file mode 100644 index 000000000..d12024320 --- /dev/null +++ b/external_imported/vcpkg/ports/crc32c/fix_clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 84907285c..8c446b0c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ if(NOT CMAKE_CXX_STANDARD) + endif(NOT CMAKE_CXX_STANDARD) + + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + # Use the highest warning level for Visual Studio. + set(CMAKE_CXX_WARNING_LEVEL 4) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/external_imported/vcpkg/ports/crc32c/portfile.cmake b/external_imported/vcpkg/ports/crc32c/portfile.cmake index 63a613028..0280002fd 100644 --- a/external_imported/vcpkg/ports/crc32c/portfile.cmake +++ b/external_imported/vcpkg/ports/crc32c/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.1.2 SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 HEAD_REF master + PATCHES + fix_clang-cl.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/crc32c/vcpkg.json b/external_imported/vcpkg/ports/crc32c/vcpkg.json index ac03f93e3..3acb74812 100644 --- a/external_imported/vcpkg/ports/crc32c/vcpkg.json +++ b/external_imported/vcpkg/ports/crc32c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "crc32c", "version": "1.1.2", + "port-version": 1, "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", "homepage": "https://github.com/google/crc32c", "dependencies": [ diff --git a/external_imported/vcpkg/ports/crfsuite/portfile.cmake b/external_imported/vcpkg/ports/crfsuite/portfile.cmake index 14e339216..dac715441 100644 --- a/external_imported/vcpkg/ports/crfsuite/portfile.cmake +++ b/external_imported/vcpkg/ports/crfsuite/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chokkan/crfsuite - REF 5d1bd3b803bb26582ed5cc274d6b5af6cc7f9cae - SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73 + REF a2a1547727985e3aff6a35cffe073f57f0223e9d + SHA512 d80f72fe13288bc516772542438c09439c6abbd4c15b06650f1de1fee7f7f710c1eed924d4300141807b8f86af398ae5d217974c13a65044515ceb163de441a4 HEAD_REF master ) @@ -13,11 +13,10 @@ list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFIX_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/crfsuite/vcpkg.json b/external_imported/vcpkg/ports/crfsuite/vcpkg.json index 5899466d5..b15828231 100644 --- a/external_imported/vcpkg/ports/crfsuite/vcpkg.json +++ b/external_imported/vcpkg/ports/crfsuite/vcpkg.json @@ -1,11 +1,15 @@ { "name": "crfsuite", - "version-date": "2019-07-21", - "port-version": 3, + "version-date": "2020-08-27", "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.", "homepage": "https://www.chokkan.org/software/crfsuite/", + "license": null, "supports": "!uwp", "dependencies": [ - "liblbfgs" + "liblbfgs", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/crow/portfile.cmake b/external_imported/vcpkg/ports/crow/portfile.cmake index 5f792e668..39e199334 100644 --- a/external_imported/vcpkg/ports/crow/portfile.cmake +++ b/external_imported/vcpkg/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF 4d2f26ee8ff2c96c6c93e7e2b7f5162027f2482d # v1.0+1 - SHA512 69a27ae87eaa5523905e80fd1028208f2862cdd76c467e8d12dc1cca388965edb7615ae102bc1af13d824ad681eea17f69a42e790755f88ad57cae11b4268683 + REF edf12f699ec3bf6f751cf73cb97f32919e48ca6e # v1.0+5 + SHA512 615a12d39198f2b3e48d795a65590050e8416a0c36b8b54fadea57e447393c4328f3c3ae04f9a7ce5a769efcf000ab2aa5057d6431569a6ec2ffa5f19055d743 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/crow/vcpkg.json b/external_imported/vcpkg/ports/crow/vcpkg.json index 70e70f380..cf728e59e 100644 --- a/external_imported/vcpkg/ports/crow/vcpkg.json +++ b/external_imported/vcpkg/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "1.0-1", + "version": "1.0-5", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/cryptopp/cmake.patch b/external_imported/vcpkg/ports/cryptopp/cmake.patch index b0839bca7..5fe607c86 100644 --- a/external_imported/vcpkg/ports/cryptopp/cmake.patch +++ b/external_imported/vcpkg/ports/cryptopp/cmake.patch @@ -2,6 +2,43 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index fb43b95..c39e470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -281,26 +281,6 @@ function(CheckCompileOption opt var) + endfunction(CheckCompileOption) + + function(CheckCompileLinkOption opt var prog) +- +- if (MSVC) +- +- # TODO: improve this... +- CHECK_CXX_COMPILER_FLAG(${opt} ${var}) +- +- elseif (APPLE) +- +- message(STATUS "Performing Test ${var}") +- try_compile(COMMAND_SUCCESS ${CMAKE_BINARY_DIR} ${prog} COMPILE_DEFINITIONS ${opt}) +- if (COMMAND_SUCCESS) +- set(${var} 1 PARENT_SCOPE) +- message(STATUS "Performing Test ${var} - Success") +- else () +- set(${var} 0 PARENT_SCOPE) +- message(STATUS "Performing Test ${var} - Failed") +- endif () +- +- else () +- + message(STATUS "Performing Test ${var}") + try_compile(COMMAND_SUCCESS ${CMAKE_BINARY_DIR} ${prog} COMPILE_DEFINITIONS ${opt}) + if (COMMAND_SUCCESS) +@@ -310,9 +290,6 @@ function(CheckCompileLinkOption opt var prog) + set(${var} 0 PARENT_SCOPE) + message(STATUS "Performing Test ${var} - Failed") + endif () +- +- endif () +- + endfunction(CheckCompileLinkOption) + + function(AddCompileOption opt) @@ -451,6 +451,10 @@ if (MSVC) endif() endif () @@ -13,6 +50,17 @@ index fb43b95..c39e470 100644 # Enable PIC for all target machines except 32-bit i386 due to register pressures. if (NOT CRYPTOPP_I386) SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -605,8 +605,8 @@ endif () + # New as of Pull Request 461, http://github.com/weidai11/cryptopp/pull/461. + # Must use CMAKE_CXX_COMPILER here due to XLC 13.1 and LLVM front-end. + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR CMAKE_CXX_COMPILER MATCHES "xlC") +- +- if (CRYPTOPP_AMD64 OR CRYPTOPP_I386) ++ # If CMAKE_CXX_COMPILER_ID is Clang and MSVC is true then we are using clang-cl ++ if (CRYPTOPP_AMD64 OR CRYPTOPP_I386 OR MSVC) + + # For Darwin and a GCC port compiler, we need to check for -Wa,-q first. -Wa,-q + # is a GCC option, and it tells GCC to use the Clang Integrated Assembler. We @@ -1022,10 +1026,10 @@ endif () # add_compile_definitions added in CMake 3.12 if (${CMAKE_VERSION} VERSION_LESS "3.12") diff --git a/external_imported/vcpkg/ports/cryptopp/patch.patch b/external_imported/vcpkg/ports/cryptopp/patch.patch index c202564e9..de8d7cd1b 100644 --- a/external_imported/vcpkg/ports/cryptopp/patch.patch +++ b/external_imported/vcpkg/ports/cryptopp/patch.patch @@ -1,8 +1,30 @@ -diff --git a/config_os.h b/config_os.h -index da27de22..9703f77d 100644 ---- a/config_os.h -+++ b/config_os.h -@@ -126,6 +126,7 @@ +diff --git a/config_cxx.h b/config_cxx.h +index 03153ba..6d9187d 100644 +--- a/config_cxx.h ++++ b/config_cxx.h +@@ -214,7 +214,7 @@ + // Also see https://github.com/weidai11/cryptopp/issues/980. I'm not sure what + // to do when the compiler defines __cpp_lib_uncaught_exceptions but the platform + // does not support std::uncaught_exceptions. What was Apple thinking??? +-#if defined(__clang__) ++#if defined(__clang__) && !defined(CRYPTOPP_MSC_VERSION) + # if __EXCEPTIONS && __has_feature(cxx_exceptions) + # if __cpp_lib_uncaught_exceptions >= 201411L + # define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1 +diff --git a/config_os.h b/config_os.h +index da27de22..9703f77d 100644 +--- a/config_os.h ++++ b/config_os.h +@@ -29,7 +29,7 @@ + // https://www.cryptopp.com/wiki/Release_Process#Self_Tests + // The problems with Clang pretending to be other compilers is + // discussed at http://github.com/weidai11/cryptopp/issues/147. +-#if (defined(_MSC_VER) && defined(__clang__) && \ ++#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__) && \ + !(defined( __clang_analyzer__)) && !defined(__INTEL_LLVM_COMPILER)) + # error: "Unsupported configuration" + #endif +@@ -126,6 +126,7 @@ #endif #ifdef CRYPTOPP_WIN32_AVAILABLE diff --git a/external_imported/vcpkg/ports/cryptopp/vcpkg.json b/external_imported/vcpkg/ports/cryptopp/vcpkg.json index 02ffa51b1..7df521c85 100644 --- a/external_imported/vcpkg/ports/cryptopp/vcpkg.json +++ b/external_imported/vcpkg/ports/cryptopp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cryptopp", "version": "8.6.0", + "port-version": 1, "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", "dependencies": [ diff --git a/external_imported/vcpkg/ports/ctp/vcpkg.json b/external_imported/vcpkg/ports/ctp/vcpkg.json index e568df5f7..4893cae5f 100644 --- a/external_imported/vcpkg/ports/ctp/vcpkg.json +++ b/external_imported/vcpkg/ports/ctp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "ctp", "version-string": "6.6.1_P1_20210406_se", - "port-version": 2, + "port-version": 3, "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", + "supports": "!osx & !uwp & !arm & !(static & staticcrt)", "features": { "datacollect": { "description": "Data collect support of CTP" diff --git a/external_imported/vcpkg/ports/ctre/portfile.cmake b/external_imported/vcpkg/ports/ctre/portfile.cmake index 112ad13d5..b1f209399 100644 --- a/external_imported/vcpkg/ports/ctre/portfile.cmake +++ b/external_imported/vcpkg/ports/ctre/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions - REF v3.4.1 - SHA512 a7b44df9c30fb46373e34d8b98fe3ef3fd0486d33ba4d7bbf58a29eef05b22b8c903bf79ae539008a564f46e0bdee3e7700819d8d072c00537f8d175af59be3e + REF v3.6 + SHA512 ad39da95cafa0198a14362492c083541dfe9beafae9adfdfc5ec5adc9bba7395553abd9799b414493c962c3dd25a79af8c7cc9b7af35392049e2ab9f8b679362 HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/ctre/vcpkg.json b/external_imported/vcpkg/ports/ctre/vcpkg.json index 724d2c9b1..490a91f21 100644 --- a/external_imported/vcpkg/ports/ctre/vcpkg.json +++ b/external_imported/vcpkg/ports/ctre/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ctre", - "version-semver": "3.4.1", + "version-semver": "3.6.0", "description": "A Compile time PCRE (almost) compatible regular expression matcher", "homepage": "https://github.com/hanickadot/compile-time-regular-expressions", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/cubeb/portfile.cmake b/external_imported/vcpkg/ports/cubeb/portfile.cmake new file mode 100644 index 000000000..28133823a --- /dev/null +++ b/external_imported/vcpkg/ports/cubeb/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mozilla/cubeb + REF dc511c6b3597b6384d28949285b9289e009830ea + SHA512 a4ccd3f0a156db4e2e75a8d231e95a08d555390571551cb3e92c71cdee46dc74dc66b5272fda4b5f1f083b92672b360152cefd38be242f238fe802acc1ea17e9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUSE_SANITIZERS=OFF + -DBUILD_TESTS=OFF + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cubeb) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +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/external_imported/vcpkg/ports/cubeb/vcpkg.json b/external_imported/vcpkg/ports/cubeb/vcpkg.json new file mode 100644 index 000000000..dc6e135f0 --- /dev/null +++ b/external_imported/vcpkg/ports/cubeb/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cubeb", + "version-date": "2022-07-22", + "description": "Cross platform audio library", + "homepage": "https://github.com/mozilla/cubeb", + "license": "ISC", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/cuda/vcpkg.json b/external_imported/vcpkg/ports/cuda/vcpkg.json index 61a3ce96c..4a17ad81e 100644 --- a/external_imported/vcpkg/ports/cuda/vcpkg.json +++ b/external_imported/vcpkg/ports/cuda/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cuda", "version": "10.1", - "port-version": 10, + "port-version": 11, "description": "A parallel computing platform and programming model", "homepage": "https://developer.nvidia.com/cuda-toolkit", "license": null, diff --git a/external_imported/vcpkg/ports/cuda/vcpkg_find_cuda.cmake b/external_imported/vcpkg/ports/cuda/vcpkg_find_cuda.cmake index 64b758540..a6265b78b 100644 --- a/external_imported/vcpkg/ports/cuda/vcpkg_find_cuda.cmake +++ b/external_imported/vcpkg/ports/cuda/vcpkg_find_cuda.cmake @@ -42,6 +42,8 @@ function(vcpkg_find_cuda) endif() endforeach() + vcpkg_list(APPEND CUDA_PATHS /usr/bin) + find_program(NVCC NAMES nvcc PATHS diff --git a/external_imported/vcpkg/ports/cudnn/FindCUDNN.cmake b/external_imported/vcpkg/ports/cudnn/FindCUDNN.cmake index 4e013bca7..178cdaf02 100644 --- a/external_imported/vcpkg/ports/cudnn/FindCUDNN.cmake +++ b/external_imported/vcpkg/ports/cudnn/FindCUDNN.cmake @@ -25,10 +25,10 @@ include(FindPackageHandleStandardArgs) find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ PATH_SUFFIXES cuda/include include) find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) diff --git a/external_imported/vcpkg/ports/cudnn/portfile.cmake b/external_imported/vcpkg/ports/cudnn/portfile.cmake index 5fd95634c..f53dc5356 100644 --- a/external_imported/vcpkg/ports/cudnn/portfile.cmake +++ b/external_imported/vcpkg/ports/cudnn/portfile.cmake @@ -1,25 +1,15 @@ -if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "This port is only for Windows Desktop or Linux") -endif() - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "This port is only for x64 architectures") -endif() - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - set(MINIMUM_CUDNN_VERSION "7.6.5") -include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) # Try to find CUDNN if it exists; only download if it doesn't exist find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ PATH_SUFFIXES cuda/include include) message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}") if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") @@ -71,6 +61,6 @@ else() message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.") endif() -file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file +file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/cudnn/vcpkg.json b/external_imported/vcpkg/ports/cudnn/vcpkg.json index 50b47fe7a..36ba88bfc 100644 --- a/external_imported/vcpkg/ports/cudnn/vcpkg.json +++ b/external_imported/vcpkg/ports/cudnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 5, + "port-version": 8, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, diff --git a/external_imported/vcpkg/ports/cunit/CMakeLists.txt b/external_imported/vcpkg/ports/cunit/CMakeLists.txt index b796355aa..cd82e2343 100644 --- a/external_imported/vcpkg/ports/cunit/CMakeLists.txt +++ b/external_imported/vcpkg/ports/cunit/CMakeLists.txt @@ -1,9 +1,8 @@ cmake_minimum_required (VERSION 3.8.0) -project (libcunit C) +project (cunit C) set(HEADERS_DIR "${PROJECT_SOURCE_DIR}/CUnit/Headers") set(SOURCES_DIR "${PROJECT_SOURCE_DIR}/CUnit/Sources") -set(EXAMPLES_DIR "${PROJECT_SOURCE_DIR}/Examples") if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 -D_CRT_SECURE_NO_WARNINGS) @@ -12,6 +11,7 @@ endif() configure_file( "${HEADERS_DIR}/CUnit.h.in" "${PROJECT_BINARY_DIR}/CUnit.h" + @ONLY ) file(READ "${PROJECT_BINARY_DIR}/CUnit.h" CUNIT_H) @@ -25,7 +25,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/CUnit.h" "${CUNIT_H}") include_directories("${PROJECT_BINARY_DIR}") include_directories(${HEADERS_DIR}) -add_library(libcunit +add_library(cunit "${SOURCES_DIR}/Automated/Automated.c" "${SOURCES_DIR}/Basic/Basic.c" "${SOURCES_DIR}/Console/Console.c" @@ -35,27 +35,18 @@ add_library(libcunit "${SOURCES_DIR}/Framework/TestRun.c" "${SOURCES_DIR}/Framework/Util.c" ) -target_compile_definitions(libcunit PRIVATE -DCU_BUILD_DLL) +target_compile_definitions(cunit PRIVATE -DCU_BUILD_DLL) +target_include_directories(cunit INTERFACE $) -if(BUILD_EXAMPLES) - include_directories(${EXAMPLES_DIR}) - add_executable(AutomatedTest ${EXAMPLES_DIR}/AutomatedTest/AutomatedTest.c "${EXAMPLES_DIR}/ExampleTests.c") - add_executable(BasicTest ${EXAMPLES_DIR}/BasicTest/BasicTest.c "${EXAMPLES_DIR}/ExampleTests.c") - add_executable(ConsoleTest ${EXAMPLES_DIR}/ConsoleTest/ConsoleTest.c "${EXAMPLES_DIR}/ExampleTests.c") +install(TARGETS cunit EXPORT unofficial-cunit-config) - target_link_libraries(AutomatedTest libcunit) - target_link_libraries(BasicTest libcunit) - target_link_libraries(ConsoleTest libcunit) -endif() - -install( - TARGETS libcunit - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +install(EXPORT unofficial-cunit-config + NAMESPACE unofficial::cunit:: + DESTINATION share/unofficial-cunit + FILE unofficial-cunit-config.cmake ) if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY "${HEADERS_DIR}/" DESTINATION include/cunit FILES_MATCHING PATTERN "*.h") - install(FILES "${PROJECT_BINARY_DIR}/CUnit.h" DESTINATION include/cunit) + install(DIRECTORY "${HEADERS_DIR}/" DESTINATION include/CUnit FILES_MATCHING PATTERN "*.h") + install(FILES "${PROJECT_BINARY_DIR}/CUnit.h" DESTINATION include/CUnit) endif() diff --git a/external_imported/vcpkg/ports/cunit/portfile.cmake b/external_imported/vcpkg/ports/cunit/portfile.cmake index 88b9be6b5..94893a2c4 100644 --- a/external_imported/vcpkg/ports/cunit/portfile.cmake +++ b/external_imported/vcpkg/ports/cunit/portfile.cmake @@ -1,21 +1,27 @@ +set(VERSION 2.1) +set(RELEASE 3) + vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO cunit/CUnit - REF 2.1-3 - FILENAME "CUnit-2.1-3.tar.bz2" + REF "${VERSION}-${RELEASE}" + FILENAME "CUnit-${VERSION}-${RELEASE}.tar.bz2" SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487 ) -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 - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" + "-DRELEASE=${RELEASE}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cunit) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/cunit/vcpkg.json b/external_imported/vcpkg/ports/cunit/vcpkg.json index c3b2d3032..7857b54f7 100644 --- a/external_imported/vcpkg/ports/cunit/vcpkg.json +++ b/external_imported/vcpkg/ports/cunit/vcpkg.json @@ -1,7 +1,18 @@ { "name": "cunit", - "version-string": "2.1.3", - "port-version": 7, + "version": "2.1.3", + "port-version": 8, "description": "CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces", - "homepage": "https://sourceforge.net/projects/cunit/" + "homepage": "https://sourceforge.net/projects/cunit/", + "license": "LGPL-2.0-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch b/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch index e1d59bf5d..9db27979e 100644 --- a/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch +++ b/external_imported/vcpkg/ports/curl/0012-fix-dependency-idn2.patch @@ -2,13 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f6de81..6702845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,6 +632,9 @@ endif() +@@ -632,6 +632,7 @@ endif() + # Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) - set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) +- check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) + set(HAVE_LIBIDN2 TRUE) + list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) -+elseif(0) - check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) + else() + set(HAVE_LIBIDN2 OFF) endif() - diff --git a/external_imported/vcpkg/ports/curl/portfile.cmake b/external_imported/vcpkg/ports/curl/portfile.cmake index f81d0c491..5a1456268 100644 --- a/external_imported/vcpkg/ports/curl/portfile.cmake +++ b/external_imported/vcpkg/ports/curl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_82_0 - SHA512 5b42e3c520e540059113fb4a5da2bbb82a4eea88e05ba17d661ab04e16e4b1f5f0ac2d16e51e17c9c2c4f5aca07e23015564a11bd0d034e1544c6f603b800c21 + REF curl-7_84_0 + SHA512 2a000c052c14ee9e6bed243e92699517889554bc0dc03e9f28d398ecf14b405c336f1303e6ed15ed30e88d5d00fefecdc189e83def3f0a5431f63e3be1c55c35 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -15,8 +15,6 @@ vcpkg_from_github( export-components.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) - # schannel will enable sspi, but sspi do not support uwp foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") if(feature IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) @@ -24,7 +22,7 @@ foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") endif() endforeach() -if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) +if("sectransp" IN_LIST FEATURES AND NOT (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)) message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") endif() @@ -38,6 +36,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. http2 USE_NGHTTP2 + wolfssl CURL_USE_WOLFSSL openssl CURL_USE_OPENSSL mbedtls CURL_USE_MBEDTLS ssh CURL_USE_LIBSSH2 @@ -56,15 +55,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) set(OPTIONS "") -set(OPTIONS_RELEASE "") -set(OPTIONS_DEBUG "") if("idn2" IN_LIST FEATURES) vcpkg_find_acquire_program(PKGCONFIG) list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() if("sectransp" IN_LIST FEATURES) - list(APPEND OPTIONS -DCURL_CA_PATH=none) + list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none) endif() # UWP targets @@ -76,6 +73,10 @@ if(VCPKG_TARGET_IS_UWP) ) endif() +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DENABLE_UNICODE=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -84,14 +85,10 @@ vcpkg_cmake_configure( ${OPTIONS} -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF - -DCURL_STATICLIB=${CURL_STATICLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON - -DENABLE_DEBUG=ON -DCURL_CA_FALLBACK=ON - OPTIONS_RELEASE - ${OPTIONS_RELEASE} + -DCURL_USE_LIBPSL=OFF OPTIONS_DEBUG - ${OPTIONS_DEBUG} + -DENABLE_DEBUG=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/curl/vcpkg.json b/external_imported/vcpkg/ports/curl/vcpkg.json index fd52ac394..0f446b4aa 100644 --- a/external_imported/vcpkg/ports/curl/vcpkg.json +++ b/external_imported/vcpkg/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", - "version": "7.82.0", + "version": "7.84.0", + "port-version": 2, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, @@ -131,7 +132,7 @@ "features": [ "sectransp" ], - "platform": "osx" + "platform": "osx | ios" }, { "name": "curl", @@ -147,7 +148,7 @@ "features": [ "openssl" ], - "platform": "(uwp | !windows) & !osx & !mingw" + "platform": "(uwp | !windows) & !(osx | ios) & !mingw" } ] }, @@ -183,6 +184,12 @@ ] } ] + }, + "wolfssl": { + "description": "SSL support (wolfSSL)", + "dependencies": [ + "wolfssl" + ] } } } diff --git a/external_imported/vcpkg/ports/czmq/portfile.cmake b/external_imported/vcpkg/ports/czmq/portfile.cmake index a24d0be9a..5ed28189d 100644 --- a/external_imported/vcpkg/ports/czmq/portfile.cmake +++ b/external_imported/vcpkg/ports/czmq/portfile.cmake @@ -70,6 +70,12 @@ vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +# Remove headers with "common" names that conflict with other packages which aren't intended to be installed +# See https://github.com/zeromq/czmq/issues/2197 +foreach(FILE readme.txt sha1.h sha1.inc_c slre.h slre.inc_c zgossip_engine.inc zgossip_msg.h zhash_primes.inc zsock_option.inc) + file(REMOVE "${CURRENT_PACKAGES_DIR}/include/${FILE}") +endforeach() + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/czmq_library.h "if defined CZMQ_STATIC" diff --git a/external_imported/vcpkg/ports/czmq/vcpkg.json b/external_imported/vcpkg/ports/czmq/vcpkg.json index 326c881d6..09b2d59d7 100644 --- a/external_imported/vcpkg/ports/czmq/vcpkg.json +++ b/external_imported/vcpkg/ports/czmq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "czmq", "version-semver": "4.2.1", + "port-version": 1, "description": "High-level C binding for ZeroMQ", "homepage": "https://github.com/zeromq/czmq", "license": "MPL-2.0", diff --git a/external_imported/vcpkg/ports/darknet/portfile.cmake b/external_imported/vcpkg/ports/darknet/portfile.cmake index 5274e101b..f4438996c 100644 --- a/external_imported/vcpkg/ports/darknet/portfile.cmake +++ b/external_imported/vcpkg/ports/darknet/portfile.cmake @@ -27,9 +27,7 @@ endif() #make sure we don't use any integrated pre-built library nor any unnecessary CMake module file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty") -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake") -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindCUDNN.cmake") -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindStb.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/external_imported/vcpkg/ports/darknet/vcpkg.json b/external_imported/vcpkg/ports/darknet/vcpkg.json index 0f4c99a52..bd6f05a4d 100644 --- a/external_imported/vcpkg/ports/darknet/vcpkg.json +++ b/external_imported/vcpkg/ports/darknet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "darknet", "version-date": "2022-03-06", + "port-version": 1, "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/external_imported/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/external_imported/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch index e20d8de07..5836b2843 100644 --- a/external_imported/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch +++ b/external_imported/vcpkg/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch @@ -1,13 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9940065eb8..b25fa4919a 100644 +index 100bfb8b59be..b0779885c788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -298,7 +298,7 @@ add_subdirectory(dart) +@@ -292,7 +292,7 @@ add_subdirectory(dart) set(DART_IN_SOURCE_BUILD TRUE) -if(TARGET dart) -+if(false) ++if(0) # Add a "tests" target to build unit tests. enable_testing() +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 08ef983cdcfa..7092d89bb17d 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -1,6 +1,8 @@ + set(DART_DARTPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/dartpy") + + add_subdirectory(dartpy) ++if(0) + add_subdirectory(tests) + add_subdirectory(examples) + add_subdirectory(tutorials) ++endif() diff --git a/external_imported/vcpkg/ports/dartsim/portfile.cmake b/external_imported/vcpkg/ports/dartsim/portfile.cmake index 0a12d6a14..7059ac1d9 100644 --- a/external_imported/vcpkg/ports/dartsim/portfile.cmake +++ b/external_imported/vcpkg/ports/dartsim/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dartsim/dart - REF v6.11.0 - SHA512 01fbff039bcec71d41334db2d07d0973b1ba58d30d05b29e35e1e3cee853917753b64e1101881113a33adb801559855d38d274fbb3383cfb24d85565254d112d + REF v6.12.2 + SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b HEAD_REF main PATCHES disable_unit_tests_examples_and_tutorials.patch @@ -20,11 +20,12 @@ vcpkg_cmake_configure( -DDART_SKIP_FLANN=ON -DDART_SKIP_IPOPT=ON -DDART_SKIP_NLOPT=ON - -DDART_SKIP_OPENGL=ON -DDART_SKIP_pagmo=ON - -Durdfdom_headers_VERSION_MAJOR=1 - -Durdfdom_headers_VERSION_MINOR=0 - -Durdfdom_headers_VERSION_PATCH=4 + -Durdfdom_headers_VERSION_MAJOR=1 # urdfdom-headers does not expose a header macro for its version. + -Durdfdom_headers_VERSION_MINOR=0 # versions of at least 1.0.0 use std:: constructs in their ABI instead of boost:: ones. + -Durdfdom_headers_VERSION_PATCH=0 + MAYBE_UNUSED_VARIABLES + DART_MSVC_DEFAULT_OPTIONS ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/dartsim/vcpkg.json b/external_imported/vcpkg/ports/dartsim/vcpkg.json index 6bc7403f1..d410210ae 100644 --- a/external_imported/vcpkg/ports/dartsim/vcpkg.json +++ b/external_imported/vcpkg/ports/dartsim/vcpkg.json @@ -1,9 +1,11 @@ { "name": "dartsim", - "version": "6.11.0", - "port-version": 3, + "version": "6.12.2", + "port-version": 1, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", + "license": "BSD-2-Clause", + "supports": "!x86", "dependencies": [ "assimp", "boost-algorithm", @@ -18,8 +20,11 @@ "ccd", "eigen3", "fcl", + "fmt", + "freeglut", "octomap", "ode", + "opengl", "tinyxml2", "urdfdom", { diff --git a/external_imported/vcpkg/ports/dav1d/patch_underscore_prefix.patch b/external_imported/vcpkg/ports/dav1d/patch_underscore_prefix.patch deleted file mode 100644 index 30506faf5..000000000 --- a/external_imported/vcpkg/ports/dav1d/patch_underscore_prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 07b2586..02acd91 100644 ---- a/meson.build -+++ b/meson.build -@@ -370,7 +370,7 @@ endif - - cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le') - --if cc.symbols_have_underscore_prefix() -+if cc.symbols_have_underscore_prefix() or (host_machine.cpu_family() == 'x86' and host_machine.system() == 'windows') - cdata.set10('PREFIX', true) - cdata_asm.set10('PREFIX', true) - endif diff --git a/external_imported/vcpkg/ports/dav1d/portfile.cmake b/external_imported/vcpkg/ports/dav1d/portfile.cmake index cd7276225..9dc774ee7 100644 --- a/external_imported/vcpkg/ports/dav1d/portfile.cmake +++ b/external_imported/vcpkg/ports/dav1d/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://code.videolan.org OUT_SOURCE_PATH SOURCE_PATH REPO videolan/dav1d - REF 0.8.2 - SHA512 2f48c88fdbe627f089eb378f43b8f18e1c5cff4645148ee7e14b8f3f8e9d690b28e58fc9cb466e7a9a4c147f06b0d34c47c132070acefbd01abe23cd3c6047d8 - PATCHES - "patch_underscore_prefix.patch" + REF 99172b11470776177939c3d2bc366fe8d904eab7 #v1.0.0 + SHA512 8ab32d7f1e7ec0fb2aae9ae19e199f7a6b17f88af2287c13a9ca577f80f02351e601fb6c6f03c9505d6cecd047b823007ffef83a5ca3703e4d2a4dd5ff6d5d3b ) vcpkg_find_acquire_program(NASM) @@ -18,7 +16,7 @@ if (LIBRARY_TYPE STREQUAL "dynamic") endif(LIBRARY_TYPE STREQUAL "dynamic") vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS --default-library=${LIBRARY_TYPE} -Denable_tests=false diff --git a/external_imported/vcpkg/ports/dav1d/vcpkg.json b/external_imported/vcpkg/ports/dav1d/vcpkg.json index 0a10cfc65..52eed6ddf 100644 --- a/external_imported/vcpkg/ports/dav1d/vcpkg.json +++ b/external_imported/vcpkg/ports/dav1d/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dav1d", - "version-semver": "0.8.2", - "port-version": 3, + "version": "1.0.0", "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", + "license": "BSD-2-Clause", "supports": "!(uwp | arm | x86)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake b/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake index 5bd908ceb..9424e326b 100644 --- a/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake +++ b/external_imported/vcpkg/ports/daw-header-libraries/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF bd372e81e04e256a6ba88217c4b99a3601fb5ef7 #v1.29.7 - SHA512 7aad017e70e79c3244011cbcb719afb385a639e1e4d37955be074bd1d2f501052dcae9347d094a8ef970f3762ebdfe33c90318b2e6891f4b354e823acfee7188 + REF d32ba610088041429d48b4f3398f8d1eb84cfe58 #v2.68.1 + SHA512 4d25b5d83401ea36ea4b987ee7530824d3599a36fd8ca8b0bb4ff7560854550eb267414d762770f8b30179178d5d2758060eedd6534913088a5c220f0d14915d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json b/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json index d203e9597..94980babc 100644 --- a/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json +++ b/external_imported/vcpkg/ports/daw-header-libraries/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-header-libraries", - "version-semver": "1.29.7", + "version": "2.68.1", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/daw-json-link/portfile.cmake b/external_imported/vcpkg/ports/daw-json-link/portfile.cmake index c9f417ef8..c3da5a9a7 100644 --- a/external_imported/vcpkg/ports/daw-json-link/portfile.cmake +++ b/external_imported/vcpkg/ports/daw-json-link/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF 828565f48bd077e776fcef322457186d8f01e7eb #v2.10.2 - SHA512 8c870d778c9abb295d323ae913d9e2bb0255f176c7e4f1d8cdf424af9bbe4c5eb650436065bb47e3e8745ff1c12234959526c8dcdf2c169ab55af4b150e6b477 + REF 6275cd9dadfed96e1b21e552657680ea9fce24cb #v3.0.4 + SHA512 7ba326480047b1cfc3cf40114d2793e368d5bc8e90a4e690f17fbac1066e6a89b2c031bef19abab9199b83314dff327651b67f73654e306b17b070b85c50a0f6 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/daw-json-link/vcpkg.json b/external_imported/vcpkg/ports/daw-json-link/vcpkg.json index c9470ecc8..62ebae40d 100644 --- a/external_imported/vcpkg/ports/daw-json-link/vcpkg.json +++ b/external_imported/vcpkg/ports/daw-json-link/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-json-link", - "version-semver": "2.10.2", + "version": "3.0.4", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", + "license": "BSL-1.0", "dependencies": [ "daw-utf-range", { diff --git a/external_imported/vcpkg/ports/daw-utf-range/portfile.cmake b/external_imported/vcpkg/ports/daw-utf-range/portfile.cmake index cabdf720b..ba75d4fac 100644 --- a/external_imported/vcpkg/ports/daw-utf-range/portfile.cmake +++ b/external_imported/vcpkg/ports/daw-utf-range/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/utf_range - REF cd45b91a1530a68ce019b876a32b1694b4031613 #v2.2.0 - SHA512 21943b488b4efb8696bfe95f80c8043beed8f5f3cc9a34cfb95d34186d6a0ac2354943ebfd767bd6df42837c29e3c467a107d2f8556a7f719833d43f566afa40 + REF 105862ffe283e96ae514d4a6ec98d6ea16b25827 #v2.2.2 + SHA512 49772c7450ec432925b44ecddaee594ecec01afa4cc49db88e798347d6e5df51b7acf2bea7e11951b7de42a0a4d5a6c9046d5cb101a65e7da68b7d7242ad5b1c HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/daw-utf-range/vcpkg.json b/external_imported/vcpkg/ports/daw-utf-range/vcpkg.json index 60581e13d..5a2708850 100644 --- a/external_imported/vcpkg/ports/daw-utf-range/vcpkg.json +++ b/external_imported/vcpkg/ports/daw-utf-range/vcpkg.json @@ -1,8 +1,9 @@ { "name": "daw-utf-range", - "version-semver": "2.2.0", + "version": "2.2.2", "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", "homepage": "https://github.com/beached/header_libraries", + "license": "BSL-1.0", "dependencies": [ "daw-header-libraries", { diff --git a/external_imported/vcpkg/ports/dbow3/fix_cmake.patch b/external_imported/vcpkg/ports/dbow3/fix_cmake.patch index 0b802425e..81b6a7e20 100644 --- a/external_imported/vcpkg/ports/dbow3/fix_cmake.patch +++ b/external_imported/vcpkg/ports/dbow3/fix_cmake.patch @@ -1,632 +1,293 @@ -From d72cb42f5147f7648c462ee1b211070c1691a887 Mon Sep 17 00:00:00 2001 -From: Ramadan -Date: Thu, 15 Aug 2019 12:27:19 +0200 -Subject: [PATCH 1/2] Fix CMakeLists.txt and installation - ---- - .gitignore | 249 ++++++++++ - CMakeLists.txt | 275 +---------- - Lib/CMakeLists.txt | 99 ++++ - Lib/DBow3Config.cmake | 4 + - {src => Lib/include/DBow3}/BowVector.h | 1 + - {src => Lib/include/DBow3}/DBoW3.h | 0 - {src => Lib/include/DBow3}/Database.h | 0 - {src => Lib/include/DBow3}/DescManip.h | 0 - {src => Lib/include/DBow3}/FeatureVector.h | 0 - {src => Lib/include/DBow3}/QueryResults.h | 0 - {src => Lib/include/DBow3}/ScoringObject.h | 0 - {src => Lib/include/DBow3}/Vocabulary.h | 0 - {src => Lib/include/DBow3}/exports.h | 16 +- - {src => Lib/include/DBow3}/quicklz.h | 0 - {src => Lib/include/DBow3}/timers.h | 0 - {src => Lib/src}/BowVector.cpp | 2 +- - {src => Lib/src}/Database.cpp | 2 +- - {src => Lib/src}/DescManip.cpp | 546 ++++++++++----------- - {src => Lib/src}/FeatureVector.cpp | 2 +- - {src => Lib/src}/QueryResults.cpp | 2 +- - {src => Lib/src}/ScoringObject.cpp | 4 +- - {src => Lib/src}/Vocabulary.cpp | 8 +- - {src => Lib/src}/quicklz.c | 2 +- - cmake/instructionSet.cmake | 13 + - cmake_uninstall.cmake.in | 28 -- - config.cmake.in | 36 -- - {utils => examples}/CMakeLists.txt | 0 - {utils => examples}/create_voc_step0.cpp | 252 +++++----- - {utils => examples}/create_voc_step1.cpp | 142 +++--- - {utils => examples}/demo_general.cpp | 404 +++++++-------- - {utils => examples}/images/image0.png | Bin - {utils => examples}/images/image1.png | Bin - {utils => examples}/images/image2.png | Bin - {utils => examples}/images/image3.png | Bin - src/CMakeLists.txt | 35 -- - orbvoc.dbow3 => voc/orbvoc.dbow3 | Bin - 36 files changed, 1072 insertions(+), 1050 deletions(-) - create mode 100644 .gitignore - create mode 100644 Lib/CMakeLists.txt - create mode 100644 Lib/DBow3Config.cmake - rename {src => Lib/include/DBow3}/BowVector.h (99%) - rename {src => Lib/include/DBow3}/DBoW3.h (100%) - rename {src => Lib/include/DBow3}/Database.h (100%) - rename {src => Lib/include/DBow3}/DescManip.h (100%) - rename {src => Lib/include/DBow3}/FeatureVector.h (100%) - rename {src => Lib/include/DBow3}/QueryResults.h (100%) - rename {src => Lib/include/DBow3}/ScoringObject.h (100%) - rename {src => Lib/include/DBow3}/Vocabulary.h (100%) - rename {src => Lib/include/DBow3}/exports.h (78%) - rename {src => Lib/include/DBow3}/quicklz.h (100%) - rename {src => Lib/include/DBow3}/timers.h (100%) - rename {src => Lib/src}/BowVector.cpp (99%) - rename {src => Lib/src}/Database.cpp (99%) - rename {src => Lib/src}/DescManip.cpp (96%) - rename {src => Lib/src}/FeatureVector.cpp (98%) - rename {src => Lib/src}/QueryResults.cpp (97%) - rename {src => Lib/src}/ScoringObject.cpp (99%) - rename {src => Lib/src}/Vocabulary.cpp (99%) - rename {src => Lib/src}/quicklz.c (99%) - create mode 100644 cmake/instructionSet.cmake - delete mode 100644 cmake_uninstall.cmake.in - delete mode 100644 config.cmake.in - rename {utils => examples}/CMakeLists.txt (100%) - rename {utils => examples}/create_voc_step0.cpp (97%) - rename {utils => examples}/create_voc_step1.cpp (97%) - rename {utils => examples}/demo_general.cpp (96%) - rename {utils => examples}/images/image0.png (100%) - rename {utils => examples}/images/image1.png (100%) - rename {utils => examples}/images/image2.png (100%) - rename {utils => examples}/images/image3.png (100%) - delete mode 100644 src/CMakeLists.txt - rename orbvoc.dbow3 => voc/orbvoc.dbow3 (100%) - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..8c4285e ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,249 @@ -+## Ignore Visual Studio temporary files, build results, and -+## files generated by popular Visual Studio add-ons. -+ -+# User-specific files -+*.suo -+*.user -+*.userosscache -+*.sln.docstates -+ -+# User-specific files (MonoDevelop/Xamarin Studio) -+*.userprefs -+ -+# Build results -+[Dd]ebug/ -+[Dd]ebugPublic/ -+[Rr]elease/ -+[Rr]eleases/ -+[Xx]64/ -+[Xx]86/ -+[Bb]uild/ -+bld/ -+[Bb]in/ -+[Oo]bj/ -+ -+# Visual Studio 2015 cache/options directory -+.vs/ -+out/ -+# Uncomment if you have tasks that create the project's static files in wwwroot -+#wwwroot/ -+ -+# MSTest test Results -+[Tt]est[Rr]esult*/ -+[Bb]uild[Ll]og.* -+ -+# NUNIT -+*.VisualState.xml -+TestResult.xml -+ -+# Build Results of an ATL Project -+[Dd]ebugPS/ -+[Rr]eleasePS/ -+dlldata.c -+ -+# DNX -+project.lock.json -+artifacts/ -+ -+*_i.c -+*_p.c -+*_i.h -+*.ilk -+*.meta -+*.obj -+*.pch -+*.pdb -+*.pgc -+*.pgd -+*.rsp -+*.sbr -+*.tlb -+*.tli -+*.tlh -+*.tmp -+*.tmp_proj -+*.log -+*.vspscc -+*.vssscc -+.builds -+*.pidb -+*.svclog -+*.scc -+*.tlog -+*.idb -+# Chutzpah Test files -+_Chutzpah* -+ -+# Visual C++ cache files -+ipch/ -+*.aps -+*.ncb -+*.opendb -+*.opensdf -+*.sdf -+*.cachefile -+*.VC.db -+ -+# Visual Studio profiler -+*.psess -+*.vsp -+*.vspx -+*.sap -+ -+# TFS 2012 Local Workspace -+$tf/ -+ -+# Guidance Automation Toolkit -+*.gpState -+ -+# ReSharper is a .NET coding add-in -+_ReSharper*/ -+*.[Rr]e[Ss]harper -+*.DotSettings.user -+ -+# JustCode is a .NET coding add-in -+.JustCode -+ -+# TeamCity is a build add-in -+_TeamCity* -+ -+# DotCover is a Code Coverage Tool -+*.dotCover -+ -+# NCrunch -+_NCrunch_* -+.*crunch*.local.xml -+nCrunchTemp_* -+ -+# MightyMoose -+*.mm.* -+AutoTest.Net/ -+ -+# Web workbench (sass) -+.sass-cache/ -+ -+# Installshield output folder -+[Ee]xpress/ -+ -+# DocProject is a documentation generator add-in -+DocProject/buildhelp/ -+DocProject/Help/*.HxT -+DocProject/Help/*.HxC -+DocProject/Help/*.hhc -+DocProject/Help/*.hhk -+DocProject/Help/*.hhp -+DocProject/Help/Html2 -+DocProject/Help/html -+ -+# Click-Once directory -+publish/ -+ -+# Publish Web Output -+*.[Pp]ublish.xml -+*.azurePubxml -+ -+# TODO: Un-comment the next line if you do not want to checkin -+# your web deploy settings because they may include unencrypted -+# passwords -+#*.pubxml -+*.publishproj -+ -+# NuGet Packages -+*.nupkg -+# The packages folder can be ignored because of Package Restore -+**/packages/* -+# except build/, which is used as an MSBuild target. -+!**/packages/build/ -+# Uncomment if necessary however generally it will be regenerated when needed -+#!**/packages/repositories.config -+# NuGet v3's project.json files produces more ignoreable files -+*.nuget.props -+*.nuget.targets -+ -+# Microsoft Azure Build Output -+csx/ -+*.build.csdef -+ -+# Microsoft Azure Emulator -+ecf/ -+rcf/ -+ -+# Microsoft Azure ApplicationInsights config file -+ApplicationInsights.config -+ -+# Windows Store app package directory -+AppPackages/ -+BundleArtifacts/ -+ -+# Visual Studio cache files -+# files ending in .cache can be ignored -+*.[Cc]ache -+# but keep track of directories ending in .cache -+!*.[Cc]ache/ -+ -+# Others -+ClientBin/ -+[Ss]tyle[Cc]op.* -+~$* -+*~ -+*.dbmdl -+*.dbproj.schemaview -+*.pfx -+*.publishsettings -+node_modules/ -+orleans.codegen.cs -+ -+# RIA/Silverlight projects -+Generated_Code/ -+ -+# Backup & report files from converting an old project file -+# to a newer Visual Studio version. Backup files are not needed, -+# because we have git ;-) -+_UpgradeReport_Files/ -+Backup*/ -+UpgradeLog*.XML -+UpgradeLog*.htm -+ -+# SQL Server files -+*.mdf -+*.ldf -+ -+# Business Intelligence projects -+*.rdl.data -+*.bim.layout -+*.bim_*.settings -+ -+# Microsoft Fakes -+FakesAssemblies/ -+ -+# GhostDoc plugin setting file -+*.GhostDoc.xml -+ -+# Node.js Tools for Visual Studio -+.ntvs_analysis.dat -+ -+# Visual Studio 6 build log -+*.plg -+ -+# Visual Studio 6 workspace options file -+*.opt -+ -+# Visual Studio LightSwitch build output -+**/*.HTMLClient/GeneratedArtifacts -+**/*.DesktopClient/GeneratedArtifacts -+**/*.DesktopClient/ModelManifest.xml -+**/*.Server/GeneratedArtifacts -+**/*.Server/ModelManifest.xml -+_Pvt_Extensions -+ -+# LightSwitch generated files -+GeneratedArtifacts/ -+ModelManifest.xml -+ -+# Paket dependency manager -+.paket/paket.exe -+ -+# FAKE - F# Make -+.fake/ -+html -+xml -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9541cd7..a2a563a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,268 +1,25 @@ --# ---------------------------------------------------------------------------- --# Basic Configuration --# ---------------------------------------------------------------------------- --CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -+cmake_minimum_required(VERSION 3.10) - --set(CMAKE_CXX_STANDARD 11) -+project(DBow3 VERSION 1.0.0) - --PROJECT(DBoW3) --set(PROJECT_VERSION "0.0.1") --string(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") --list(GET PROJECT_VERSION_PARTS 0 PROJECT_VERSION_MAJOR) --list(GET PROJECT_VERSION_PARTS 1 PROJECT_VERSION_MINOR) --list(GET PROJECT_VERSION_PARTS 2 PROJECT_VERSION_PATCH) --set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") -+option(BUILD_EXAMPLES "Set to ON to build examples" OFF) -+option(BUILD_TESTS "Set to ON to build tests" OFF) -+option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) - --message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}") -+# OpenCV -+option(USE_OPENCV_CONTRIB "Set on to use opencv-contrib" ON) - --#------------------------------------------------------ --# Build type --#------------------------------------------------------ -+# Optimization -+option(USE_SIMD "Set on to enabel avx optimization" ON) - --IF(NOT CMAKE_BUILD_TYPE ) -- SET( CMAKE_BUILD_TYPE "Release" ) --ENDIF() - --#------------------------------------------------------ --# Lib Names and Dirs --#------------------------------------------------------ -+add_subdirectory(Lib) - --if(WIN32) -- # Postfix of DLLs: -- SET(PROJECT_DLLVERSION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}") -- SET(RUNTIME_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls and binaries") -- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for binaries") -- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls") --else() -- # Postfix of so's: -- set(PROJECT_DLLVERSION) -- set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries (e.g. lib32 or lib64 for multilib installations)") -- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/ /usr/${LIB_INSTALL_DIR}/cmake ) --endif() -+if(BUILD_EXAMPLES) -+ add_subdirectory(examples) -+endif(BUILD_EXAMPLES) - -+if(BUILD_TESTS) -+ add_subdirectory(tests) -+endif(BUILD_TESTS) - -- --# --OPTION(BUILD_UTILS "Set to OFF to not build utils" ON) --OPTION(USE_CONTRIB "Set to ON if contrib are installed" OFF) --OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) -- --# ---------------------------------------------------------------------------- --# Find Dependencies --# ---------------------------------------------------------------------------- --find_package(OpenCV REQUIRED) --IF(USE_CONTRIB) --add_definitions(-DUSE_CONTRIB) --ENDIF() --if(NOT OpenCV_VERSION VERSION_LESS "3.0") -- ADD_DEFINITIONS(-DOPENCV_VERSION_3) -- SET(OPENCV_VERSION_3 ON) --ELSE() -- SET(OPENCV_VERSION_3 OFF) --ENDIF() -- --include_directories(${OpenCV_INCLUDE_DIRS}) -- --SET(REQUIRED_LIBRARIES ${REQUIRED_LIBRARIES} ${OpenCV_LIBS}) -- --# ---------------------------------------------------------------------------- --# PROJECT CONFIGURATION --# force some variables that could be defined in the command line to be written to cache --# ---------------------------------------------------------------------------- --OPTION(INSTALL_DOC "Set to ON to build/install Documentation" OFF) --IF (INSTALL_DOC) -- FIND_PACKAGE(Doxygen REQUIRED) -- MESSAGE( STATUS "INSTALL_DOC: ${INSTALL_DOC} ") -- INCLUDE("${PROJECT_SOURCE_DIR}/generateDoc.cmake") -- GENERATE_DOCUMENTATION(${PROJECT_SOURCE_DIR}/dox.in) --ENDIF() -- --# ---------------------------------------------------------------------------- --# Uninstall target, for "make uninstall" --# ---------------------------------------------------------------------------- --CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) --ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -- --# ---------------------------------------------------------------------------- --# create configuration file from .in file (If you use windows take care with paths) --# ---------------------------------------------------------------------------- -- --CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake") --CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") --INSTALL(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/ ) --INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) -- -- -- -- --# ---------------------------------------------------------------------------- --# Program Optimization and debug (Extracted from OpenCV) --# ---------------------------------------------------------------------------- --set(WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") --set(WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.") -- --set(EXTRA_C_FLAGS "") --set(EXTRA_C_FLAGS_RELEASE "") --set(EXTRA_C_FLAGS_DEBUG "") --set(EXTRA_EXE_LINKER_FLAGS "") --set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") --set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") -- --IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) -- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") -- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) # We can use only -O2 because the -O3 causes gcc crash -- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- endif() -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") -- endif () -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") -- set(USE_SSE ON CACHE BOOL "Enable SSE for GCC") -- set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC") -- set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC") -- endif() -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") -- set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC") -- set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC") -- set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC") -- endif () -- -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall") -- -- if(WARNINGS_ARE_ERRORS) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") -- endif() -- -- # The -Wno-long-long is required in 64bit systems when including sytem headers. -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-long-long") -- endif() -- -- # Whole program optimization -- if(WHOLE_PROGRAM_OPTIMIZATION) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine") -- endif() -- -- # Other optimizations -- if(USE_OMIT_FRAME_POINTER) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") -- endif() -- if(USE_O2) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O2") -- endif() -- if(USE_O3) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O3") -- endif() -- if(USE_FAST_MATH) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math") -- endif() -- if(USE_POWERPC) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5") -- endif() -- if(USE_MMX) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx") -- endif() -- if(USE_SSE) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse") -- endif() -- if(USE_SSE2) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2") -- endif() -- if(USE_SSE3 AND NOT MINGW) # SSE3 should be disabled under MingW because it generates compiler errors -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3") -- endif() -- -- if(ENABLE_PROFILING) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") -- else() -- if(NOT APPLE) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections") -- endif() -- endif() -- -- -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG ") -- set(EXTRA_C_FLAGS_DEBUG "-g3 -O0 -DDEBUG -D_DEBUG -W -Wextra -Wno-return-type ") -- -- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) -- message( STATUS "GNU COMPILER") -- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) -- -- -- -- --ELSE() # MSVC -- -- --ENDIF()#END OF COMPILER SPECIFIC OPTIONS --SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_RELEASE}") --SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_DEBUG}") --SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11") --SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11") --set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}") --SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_EXE_LINKER_FLAGS}") --SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${EXTRA_EXE_LINKER_FLAGS_RELEASE}") --SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${EXTRA_EXE_LINKER_FLAGS_DEBUG}") -- -- -- --#------------------------------------------------ --# DIRS --#------------------------------------------------ --ADD_SUBDIRECTORY(src) --IF (BUILD_UTILS) --ADD_SUBDIRECTORY(utils) --ENDIF() -- --IF (BUILD_TESTS) --ADD_SUBDIRECTORY(tests) --ENDIF() -- -- --# ---------------------------------------------------------------------------- --# display status message for important variables --# ---------------------------------------------------------------------------- --message( STATUS ) --MESSAGE( STATUS "-------------------------------------------------------------------------------" ) --message( STATUS "General configuration for ${PROJECT_NAME} ${PROJECT_VERSION}") --MESSAGE( STATUS "-------------------------------------------------------------------------------" ) --message(" Built as dynamic libs?:" ${BUILD_SHARED_LIBS}) --message(" Compiler:" "${CMAKE_COMPILER}" "${CMAKE_CXX_COMPILER}") -- --message( STATUS "Build Type: ${CMAKE_BUILD_TYPE}") --message( STATUS "C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") --message( STATUS "C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") --message( STATUS "C++ flags (Relase+Debug): ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") -- --message( STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") --message( STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") -- --MESSAGE( STATUS ) --MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) --MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) --MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) --MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) --MESSAGE( STATUS "BUILD_UTILS= ${BUILD_UTILS}" ) --MESSAGE( STATUS "BUILD_TESTS= ${BUILD_TESTS}" ) --MESSAGE( STATUS "OPENCV_DIR= ${OpenCV_DIR} VERSION=${OpenCV_VERSION}" ) -- --MESSAGE( STATUS "USE_CONTRIB= ${USE_CONTRIB}" ) -- --MESSAGE( STATUS ) --MESSAGE( STATUS "OpenCV_LIB_DIR=${OpenCV_LIB_DIR}") --MESSAGE( STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}") -- --MESSAGE( STATUS ) --MESSAGE( STATUS ) --MESSAGE( STATUS "Change a value with: cmake -D=" ) --MESSAGE( STATUS ) -diff --git a/Lib/CMakeLists.txt b/Lib/CMakeLists.txt -new file mode 100644 -index 0000000..e56077b +-# ---------------------------------------------------------------------------- +-# Basic Configuration +-# ---------------------------------------------------------------------------- +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10) + +-set(CMAKE_CXX_STANDARD 11) ++project(DBow3 VERSION 1.0.0) + +-PROJECT(DBoW3) +-set(PROJECT_VERSION "0.0.1") +-string(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") +-list(GET PROJECT_VERSION_PARTS 0 PROJECT_VERSION_MAJOR) +-list(GET PROJECT_VERSION_PARTS 1 PROJECT_VERSION_MINOR) +-list(GET PROJECT_VERSION_PARTS 2 PROJECT_VERSION_PATCH) +-set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") ++option(BUILD_EXAMPLES "Set to ON to build examples" OFF) ++option(BUILD_TESTS "Set to ON to build tests" OFF) ++option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) + +-message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}") ++# OpenCV ++option(USE_OPENCV_CONTRIB "Set on to use opencv-contrib" ON) + +-#------------------------------------------------------ +-# Build type +-#------------------------------------------------------ ++# Optimization ++option(USE_SIMD "Set on to enabel avx optimization" ON) + +-IF(NOT CMAKE_BUILD_TYPE ) +- SET( CMAKE_BUILD_TYPE "Release" ) +-ENDIF() + +-#------------------------------------------------------ +-# Lib Names and Dirs +-#------------------------------------------------------ ++add_subdirectory(Lib) + +-if(WIN32) +- # Postfix of DLLs: +- SET(PROJECT_DLLVERSION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}") +- SET(RUNTIME_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls and binaries") +- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for binaries") +- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls") +-else() +- # Postfix of so's: +- set(PROJECT_DLLVERSION) +- set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries (e.g. lib32 or lib64 for multilib installations)") +- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/ /usr/${LIB_INSTALL_DIR}/cmake ) +-endif() ++if(BUILD_EXAMPLES) ++ add_subdirectory(examples) ++endif(BUILD_EXAMPLES) + ++if(BUILD_TESTS) ++ add_subdirectory(tests) ++endif(BUILD_TESTS) + +- +-# +-OPTION(BUILD_UTILS "Set to OFF to not build utils" ON) +-OPTION(USE_CONTRIB "Set to ON if contrib are installed" OFF) +-OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) +- +-# ---------------------------------------------------------------------------- +-# Find Dependencies +-# ---------------------------------------------------------------------------- +-find_package(OpenCV REQUIRED) +-IF(USE_CONTRIB) +-add_definitions(-DUSE_CONTRIB) +-ENDIF() +-if(NOT OpenCV_VERSION VERSION_LESS "3.0") +- ADD_DEFINITIONS(-DOPENCV_VERSION_3) +- SET(OPENCV_VERSION_3 ON) +-ELSE() +- SET(OPENCV_VERSION_3 OFF) +-ENDIF() +- +-include_directories(${OpenCV_INCLUDE_DIRS}) +- +-SET(REQUIRED_LIBRARIES ${REQUIRED_LIBRARIES} ${OpenCV_LIBS}) +- +-# ---------------------------------------------------------------------------- +-# PROJECT CONFIGURATION +-# force some variables that could be defined in the command line to be written to cache +-# ---------------------------------------------------------------------------- +-OPTION(INSTALL_DOC "Set to ON to build/install Documentation" OFF) +-IF (INSTALL_DOC) +- FIND_PACKAGE(Doxygen REQUIRED) +- MESSAGE( STATUS "INSTALL_DOC: ${INSTALL_DOC} ") +- INCLUDE("${PROJECT_SOURCE_DIR}/generateDoc.cmake") +- GENERATE_DOCUMENTATION(${PROJECT_SOURCE_DIR}/dox.in) +-ENDIF() +- +-# ---------------------------------------------------------------------------- +-# Uninstall target, for "make uninstall" +-# ---------------------------------------------------------------------------- +-CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) +-ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +- +-# ---------------------------------------------------------------------------- +-# create configuration file from .in file (If you use windows take care with paths) +-# ---------------------------------------------------------------------------- +- +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake") +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") +-INSTALL(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/ ) +-INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) +- +- +- +- +-# ---------------------------------------------------------------------------- +-# Program Optimization and debug (Extracted from OpenCV) +-# ---------------------------------------------------------------------------- +-set(WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") +-set(WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.") +- +-set(EXTRA_C_FLAGS "") +-set(EXTRA_C_FLAGS_RELEASE "") +-set(EXTRA_C_FLAGS_DEBUG "") +-set(EXTRA_EXE_LINKER_FLAGS "") +-set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") +-set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") +- +-IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) +- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") +- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) # We can use only -O2 because the -O3 causes gcc crash +- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") +- endif () +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE ON CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC") +- endif () +- +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall") +- +- if(WARNINGS_ARE_ERRORS) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") +- endif() +- +- # The -Wno-long-long is required in 64bit systems when including sytem headers. +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-long-long") +- endif() +- +- # Whole program optimization +- if(WHOLE_PROGRAM_OPTIMIZATION) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine") +- endif() +- +- # Other optimizations +- if(USE_OMIT_FRAME_POINTER) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") +- endif() +- if(USE_O2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O2") +- endif() +- if(USE_O3) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O3") +- endif() +- if(USE_FAST_MATH) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math") +- endif() +- if(USE_POWERPC) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5") +- endif() +- if(USE_MMX) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx") +- endif() +- if(USE_SSE) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse") +- endif() +- if(USE_SSE2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2") +- endif() +- if(USE_SSE3 AND NOT MINGW) # SSE3 should be disabled under MingW because it generates compiler errors +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3") +- endif() +- +- if(ENABLE_PROFILING) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") +- else() +- if(NOT APPLE) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections") +- endif() +- endif() +- +- +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG ") +- set(EXTRA_C_FLAGS_DEBUG "-g3 -O0 -DDEBUG -D_DEBUG -W -Wextra -Wno-return-type ") +- +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- message( STATUS "GNU COMPILER") +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- +- +- +- +-ELSE() # MSVC +- +- +-ENDIF()#END OF COMPILER SPECIFIC OPTIONS +-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_RELEASE}") +-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_DEBUG}") +-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11") +-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11") +-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_DEBUG}") +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}") +-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_EXE_LINKER_FLAGS}") +-SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${EXTRA_EXE_LINKER_FLAGS_RELEASE}") +-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${EXTRA_EXE_LINKER_FLAGS_DEBUG}") +- +- +- +-#------------------------------------------------ +-# DIRS +-#------------------------------------------------ +-ADD_SUBDIRECTORY(src) +-IF (BUILD_UTILS) +-ADD_SUBDIRECTORY(utils) +-ENDIF() +- +-IF (BUILD_TESTS) +-ADD_SUBDIRECTORY(tests) +-ENDIF() +- +- +-# ---------------------------------------------------------------------------- +-# display status message for important variables +-# ---------------------------------------------------------------------------- +-message( STATUS ) +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message( STATUS "General configuration for ${PROJECT_NAME} ${PROJECT_VERSION}") +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message(" Built as dynamic libs?:" ${BUILD_SHARED_LIBS}) +-message(" Compiler:" "${CMAKE_COMPILER}" "${CMAKE_CXX_COMPILER}") +- +-message( STATUS "Build Type: ${CMAKE_BUILD_TYPE}") +-message( STATUS "C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") +-message( STATUS "C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") +-message( STATUS "C++ flags (Relase+Debug): ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") +- +-message( STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") +-message( STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) +-MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) +-MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) +-MESSAGE( STATUS "BUILD_UTILS= ${BUILD_UTILS}" ) +-MESSAGE( STATUS "BUILD_TESTS= ${BUILD_TESTS}" ) +-MESSAGE( STATUS "OPENCV_DIR= ${OpenCV_DIR} VERSION=${OpenCV_VERSION}" ) +- +-MESSAGE( STATUS "USE_CONTRIB= ${USE_CONTRIB}" ) +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "OpenCV_LIB_DIR=${OpenCV_LIB_DIR}") +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS ) +-MESSAGE( STATUS "Change a value with: cmake -D=" ) +-MESSAGE( STATUS ) --- /dev/null +++ b/Lib/CMakeLists.txt -@@ -0,0 +1,99 @@ +@@ -0,0 +1,92 @@ +cmake_minimum_required(VERSION 3.10) + +find_package(OpenCV REQUIRED) @@ -684,13 +345,6 @@ index 0000000..e56077b +) +endif() + -+if(USE_SIMD) -+ target_link_libraries(DBow3 -+ PRIVATE -+ SIMD::SSE4.1 -+ ) -+endif() -+ +target_compile_definitions(DBow3 + PUBLIC + NOMINMAX @@ -727,9 +381,6 @@ index 0000000..e56077b +install(FILES DBow3Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/DBow3ConfigVersion.cmake + DESTINATION cmake/DBow3) \ No newline at end of file -diff --git a/Lib/DBow3Config.cmake b/Lib/DBow3Config.cmake -new file mode 100644 -index 0000000..9720a14 --- /dev/null +++ b/Lib/DBow3Config.cmake @@ -0,0 +1,4 @@ @@ -858,279 +509,279 @@ index d6331af..430ce2b 100644 --- a/src/DescManip.cpp +++ b/Lib/src/DescManip.cpp @@ -1,273 +1,273 @@ --/** -- * File: DescManip.cpp -- * Date: June 2012 -- * Author: Dorian Galvez-Lopez -- * Description: functions for ORB descriptors -- * License: see the LICENSE.txt file -- * -- */ -- --#include --#include --#include --#include --#include --#include -- --#include "DescManip.h" -- --using namespace std; -- --namespace DBoW3 { -- --// -------------------------------------------------------------------------- -- --void DescManip::meanValue(const std::vector &descriptors, -- cv::Mat &mean) --{ -- -- if(descriptors.empty()) return; -- -- if(descriptors.size() == 1) -- { -- mean = descriptors[0].clone(); -- return; -- } -- //binary descriptor -- if (descriptors[0].type()==CV_8U ){ -- //determine number of bytes of the binary descriptor -- int L= getDescSizeBytes( descriptors[0]); -- vector sum( L * 8, 0); -- -- for(size_t i = 0; i < descriptors.size(); ++i) -- { -- const cv::Mat &d = descriptors[i]; -- const unsigned char *p = d.ptr(); -- -- for(int j = 0; j < d.cols; ++j, ++p) -- { -- if(*p & (1 << 7)) ++sum[ j*8 ]; -- if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; -- if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; -- if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; -- if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; -- if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; -- if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; -- if(*p & (1)) ++sum[ j*8 + 7 ]; -- } -- } -- -- mean = cv::Mat::zeros(1, L, CV_8U); -- unsigned char *p = mean.ptr(); -- -- const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; -- for(size_t i = 0; i < sum.size(); ++i) -- { -- if(sum[i] >= N2) -- { -- // set bit -- *p |= 1 << (7 - (i % 8)); -- } -- -- if(i % 8 == 7) ++p; -- } -- } -- //non binary descriptor -- else{ -- assert(descriptors[0].type()==CV_32F );//ensure it is float -- -- mean.create(1, descriptors[0].cols,descriptors[0].type()); -- mean.setTo(cv::Scalar::all(0)); -- float inv_s =1./double( descriptors.size()); -- for(size_t i=0;i(); // a & b are actually CV_8U -- pb = b.ptr(); -- -- uint64_t v, ret = 0; -- for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) -- { -- v = *pa ^ *pb; -- v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); -- v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & -- (uint64_t)~(uint64_t)0/15*3); -- v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; -- ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> -- (sizeof(uint64_t) - 1) * CHAR_BIT; -- } -- -- return ret; -- } -- else{ -- double sqd = 0.; -- assert(a.type()==CV_32F); -- assert(a.rows==1); -- const float *a_ptr=a.ptr(0); -- const float *b_ptr=b.ptr(0); -- for(int i = 0; i < a.cols; i ++) -- sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); -- return sqd; -- } --} -- -- -- -- --// -------------------------------------------------------------------------- -- --std::string DescManip::toString(const cv::Mat &a) --{ -- stringstream ss; -- //introduce a magic value to distinguish from DBOw2 -- ss<<"dbw3 "; -- //save size and type -- -- -- ss <(); -- for(int i = 0; i < a.cols; ++i, ++p) -- ss << (int)*p << " "; -- }else{ -- -- const float *p = a.ptr(); -- for(int i = 0; i < a.cols; ++i, ++p) -- ss << *p << " "; -- -- } -- -- return ss.str(); --} -- --// -------------------------------------------------------------------------- -- --void DescManip::fromString(cv::Mat &a, const std::string &s) --{ -- -- //check if the dbow3 is present -- string ss_aux;ss_aux.reserve(10); -- for(size_t i=0;i<10 && i data;data.reserve(100); -- while( ss>>val) data.push_back(val); -- //copy to a -- a.create(1,data.size(),CV_8UC1); -- memcpy(a.ptr(0),&data[0],data.size()); -- } -- else { -- char szSign[10]; -- int type,cols; -- stringstream ss(s); -- ss >> szSign >> type >> cols; -- a.create(1, cols, type); -- if(type==CV_8UC1){ -- unsigned char *p = a.ptr(); -- int n; -- for(int i = 0; i < a.cols; ++i, ++p) -- if ( ss >> n) *p = (unsigned char)n; -- } -- else{ -- float *p = a.ptr(); -- for(int i = 0; i < a.cols; ++i, ++p) -- if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, -- cv::Mat &mat) --{ -- if(descriptors.empty()) -- { -- mat.release(); -- return; -- } -- -- if(descriptors[0].type()==CV_8UC1){ -- -- const size_t N = descriptors.size(); -- int L=getDescSizeBytes(descriptors[0]); -- mat.create(N, L*8, CV_32F); -- float *p = mat.ptr(); -- -- for(size_t i = 0; i < N; ++i) -- { -- const int C = descriptors[i].cols; -- const unsigned char *desc = descriptors[i].ptr(); -- -- for(int j = 0; j < C; ++j, p += 8) -- { -- p[0] = (desc[j] & (1 << 7) ? 1 : 0); -- p[1] = (desc[j] & (1 << 6) ? 1 : 0); -- p[2] = (desc[j] & (1 << 5) ? 1 : 0); -- p[3] = (desc[j] & (1 << 4) ? 1 : 0); -- p[4] = (desc[j] & (1 << 3) ? 1 : 0); -- p[5] = (desc[j] & (1 << 2) ? 1 : 0); -- p[6] = (desc[j] & (1 << 1) ? 1 : 0); -- p[7] = desc[j] & (1); -- } -- } -- } -- else{ -- assert(descriptors[0].type()==CV_32F); -- const int N = descriptors.size(); -- int L=descriptors[0].cols; -- mat.create(N, L, CV_32F); -- for(int i = 0; i < N; ++i) -- memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); -- } --} -- --void DescManip::toStream(const cv::Mat &m,std::ostream &str){ -- assert(m.rows==1 || m.isContinuous()); -- int type=m.type(); -- int cols=m.cols; -- int rows=m.rows; -- str.write((char*)&cols,sizeof(cols)); -- str.write((char*)&rows,sizeof(rows)); -- str.write((char*)&type,sizeof(type)); -- str.write((char*)m.ptr(0),m.elemSize()*m.cols); --} -- --void DescManip::fromStream(cv::Mat &m,std::istream &str){ -- int type,cols,rows; -- str.read((char*)&cols,sizeof(cols)); -- str.read((char*)&rows,sizeof(rows)); -- str.read((char*)&type,sizeof(type)); -- m.create(rows,cols,type); -- str.read((char*)m.ptr(0),m.elemSize()*m.cols); --} -- -- --// -------------------------------------------------------------------------- -- --} // namespace DBoW3 -- +-/** +- * File: DescManip.cpp +- * Date: June 2012 +- * Author: Dorian Galvez-Lopez +- * Description: functions for ORB descriptors +- * License: see the LICENSE.txt file +- * +- */ +- +-#include +-#include +-#include +-#include +-#include +-#include +- +-#include "DescManip.h" +- +-using namespace std; +- +-namespace DBoW3 { +- +-// -------------------------------------------------------------------------- +- +-void DescManip::meanValue(const std::vector &descriptors, +- cv::Mat &mean) +-{ +- +- if(descriptors.empty()) return; +- +- if(descriptors.size() == 1) +- { +- mean = descriptors[0].clone(); +- return; +- } +- //binary descriptor +- if (descriptors[0].type()==CV_8U ){ +- //determine number of bytes of the binary descriptor +- int L= getDescSizeBytes( descriptors[0]); +- vector sum( L * 8, 0); +- +- for(size_t i = 0; i < descriptors.size(); ++i) +- { +- const cv::Mat &d = descriptors[i]; +- const unsigned char *p = d.ptr(); +- +- for(int j = 0; j < d.cols; ++j, ++p) +- { +- if(*p & (1 << 7)) ++sum[ j*8 ]; +- if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; +- if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; +- if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; +- if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; +- if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; +- if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; +- if(*p & (1)) ++sum[ j*8 + 7 ]; +- } +- } +- +- mean = cv::Mat::zeros(1, L, CV_8U); +- unsigned char *p = mean.ptr(); +- +- const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; +- for(size_t i = 0; i < sum.size(); ++i) +- { +- if(sum[i] >= N2) +- { +- // set bit +- *p |= 1 << (7 - (i % 8)); +- } +- +- if(i % 8 == 7) ++p; +- } +- } +- //non binary descriptor +- else{ +- assert(descriptors[0].type()==CV_32F );//ensure it is float +- +- mean.create(1, descriptors[0].cols,descriptors[0].type()); +- mean.setTo(cv::Scalar::all(0)); +- float inv_s =1./double( descriptors.size()); +- for(size_t i=0;i(); // a & b are actually CV_8U +- pb = b.ptr(); +- +- uint64_t v, ret = 0; +- for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) +- { +- v = *pa ^ *pb; +- v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); +- v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & +- (uint64_t)~(uint64_t)0/15*3); +- v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; +- ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> +- (sizeof(uint64_t) - 1) * CHAR_BIT; +- } +- +- return ret; +- } +- else{ +- double sqd = 0.; +- assert(a.type()==CV_32F); +- assert(a.rows==1); +- const float *a_ptr=a.ptr(0); +- const float *b_ptr=b.ptr(0); +- for(int i = 0; i < a.cols; i ++) +- sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); +- return sqd; +- } +-} +- +- +- +- +-// -------------------------------------------------------------------------- +- +-std::string DescManip::toString(const cv::Mat &a) +-{ +- stringstream ss; +- //introduce a magic value to distinguish from DBOw2 +- ss<<"dbw3 "; +- //save size and type +- +- +- ss <(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << (int)*p << " "; +- }else{ +- +- const float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << *p << " "; +- +- } +- +- return ss.str(); +-} +- +-// -------------------------------------------------------------------------- +- +-void DescManip::fromString(cv::Mat &a, const std::string &s) +-{ +- +- //check if the dbow3 is present +- string ss_aux;ss_aux.reserve(10); +- for(size_t i=0;i<10 && i data;data.reserve(100); +- while( ss>>val) data.push_back(val); +- //copy to a +- a.create(1,data.size(),CV_8UC1); +- memcpy(a.ptr(0),&data[0],data.size()); +- } +- else { +- char szSign[10]; +- int type,cols; +- stringstream ss(s); +- ss >> szSign >> type >> cols; +- a.create(1, cols, type); +- if(type==CV_8UC1){ +- unsigned char *p = a.ptr(); +- int n; +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( ss >> n) *p = (unsigned char)n; +- } +- else{ +- float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, +- cv::Mat &mat) +-{ +- if(descriptors.empty()) +- { +- mat.release(); +- return; +- } +- +- if(descriptors[0].type()==CV_8UC1){ +- +- const size_t N = descriptors.size(); +- int L=getDescSizeBytes(descriptors[0]); +- mat.create(N, L*8, CV_32F); +- float *p = mat.ptr(); +- +- for(size_t i = 0; i < N; ++i) +- { +- const int C = descriptors[i].cols; +- const unsigned char *desc = descriptors[i].ptr(); +- +- for(int j = 0; j < C; ++j, p += 8) +- { +- p[0] = (desc[j] & (1 << 7) ? 1 : 0); +- p[1] = (desc[j] & (1 << 6) ? 1 : 0); +- p[2] = (desc[j] & (1 << 5) ? 1 : 0); +- p[3] = (desc[j] & (1 << 4) ? 1 : 0); +- p[4] = (desc[j] & (1 << 3) ? 1 : 0); +- p[5] = (desc[j] & (1 << 2) ? 1 : 0); +- p[6] = (desc[j] & (1 << 1) ? 1 : 0); +- p[7] = desc[j] & (1); +- } +- } +- } +- else{ +- assert(descriptors[0].type()==CV_32F); +- const int N = descriptors.size(); +- int L=descriptors[0].cols; +- mat.create(N, L, CV_32F); +- for(int i = 0; i < N; ++i) +- memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); +- } +-} +- +-void DescManip::toStream(const cv::Mat &m,std::ostream &str){ +- assert(m.rows==1 || m.isContinuous()); +- int type=m.type(); +- int cols=m.cols; +- int rows=m.rows; +- str.write((char*)&cols,sizeof(cols)); +- str.write((char*)&rows,sizeof(rows)); +- str.write((char*)&type,sizeof(type)); +- str.write((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +-void DescManip::fromStream(cv::Mat &m,std::istream &str){ +- int type,cols,rows; +- str.read((char*)&cols,sizeof(cols)); +- str.read((char*)&rows,sizeof(rows)); +- str.read((char*)&type,sizeof(type)); +- m.create(rows,cols,type); +- str.read((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +- +-// -------------------------------------------------------------------------- +- +-} // namespace DBoW3 +- +/** + * File: DescManip.cpp + * Date: June 2012 @@ -1549,42 +1200,42 @@ index 9d15feb..0000000 --- a/config.cmake.in +++ /dev/null @@ -1,36 +0,0 @@ --# =================================================================================== --# @PROJECT_NAME@ CMake configuration file --# --# ** File generated automatically, do not modify ** --# --# Usage from an external project: --# In your CMakeLists.txt, add these lines: --# --# FIND_PACKAGE(@PROJECT_NAME@ REQUIRED ) --# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${@PROJECT_NAME@_LIBS}) --# --# This file will define the following variables: --# - @PROJECT_NAME@_LIBS : The list of libraries to links against. --# - @PROJECT_NAME@_LIB_DIR : The directory where lib files are. Calling LINK_DIRECTORIES --# with this path is NOT needed. --# - @PROJECT_NAME@_VERSION : The version of this PROJECT_NAME build. Example: "1.2.0" --# - @PROJECT_NAME@_VERSION_MAJOR : Major version part of VERSION. Example: "1" --# - @PROJECT_NAME@_VERSION_MINOR : Minor version part of VERSION. Example: "2" --# - @PROJECT_NAME@_VERSION_PATCH : Patch version part of VERSION. Example: "0" --# --# =================================================================================== --INCLUDE_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/include") --SET(@PROJECT_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") -- --LINK_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") --SET(@PROJECT_NAME@_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") -- --SET(@PROJECT_NAME@_LIBS @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) --SET(@PROJECT_NAME@_LIBRARIES @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) -- --SET(@PROJECT_NAME@_FOUND YES) --SET(@PROJECT_NAME@_FOUND "YES") --SET(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) --SET(@PROJECT_NAME@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) --SET(@PROJECT_NAME@_VERSION_MINOR @PROJECT_VERSION_MINOR@) --SET(@PROJECT_NAME@_VERSION_PATCH @PROJECT_VERSION_PATCH@) +-# =================================================================================== +-# @PROJECT_NAME@ CMake configuration file +-# +-# ** File generated automatically, do not modify ** +-# +-# Usage from an external project: +-# In your CMakeLists.txt, add these lines: +-# +-# FIND_PACKAGE(@PROJECT_NAME@ REQUIRED ) +-# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${@PROJECT_NAME@_LIBS}) +-# +-# This file will define the following variables: +-# - @PROJECT_NAME@_LIBS : The list of libraries to links against. +-# - @PROJECT_NAME@_LIB_DIR : The directory where lib files are. Calling LINK_DIRECTORIES +-# with this path is NOT needed. +-# - @PROJECT_NAME@_VERSION : The version of this PROJECT_NAME build. Example: "1.2.0" +-# - @PROJECT_NAME@_VERSION_MAJOR : Major version part of VERSION. Example: "1" +-# - @PROJECT_NAME@_VERSION_MINOR : Minor version part of VERSION. Example: "2" +-# - @PROJECT_NAME@_VERSION_PATCH : Patch version part of VERSION. Example: "0" +-# +-# =================================================================================== +-INCLUDE_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/include") +-SET(@PROJECT_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") +- +-LINK_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +-SET(@PROJECT_NAME@_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +- +-SET(@PROJECT_NAME@_LIBS @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +-SET(@PROJECT_NAME@_LIBRARIES @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +- +-SET(@PROJECT_NAME@_FOUND YES) +-SET(@PROJECT_NAME@_FOUND "YES") +-SET(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) +-SET(@PROJECT_NAME@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) +-SET(@PROJECT_NAME@_VERSION_MINOR @PROJECT_VERSION_MINOR@) +-SET(@PROJECT_NAME@_VERSION_PATCH @PROJECT_VERSION_PATCH@) diff --git a/utils/CMakeLists.txt b/examples/CMakeLists.txt similarity index 100% rename from utils/CMakeLists.txt @@ -1597,132 +1248,132 @@ index 4fd78f6..c48a3c4 100644 --- a/utils/create_voc_step0.cpp +++ b/examples/create_voc_step0.cpp @@ -1,126 +1,126 @@ -- --//First step of creating a vocabulary is extracting features from a set of images. We save them to a file for next step --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --#include --#include --#ifdef USE_CONTRIB --#include --#include --#endif --#include "DescManip.h" -- --using namespace DBoW3; --using namespace std; -- -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ -- vector paths; -- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ -- //select detector -- cv::Ptr fdetector; -- if (descriptor=="orb") fdetector=cv::ORB::create(); -- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); --#ifdef OPENCV_VERSION_3 -- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); --#endif --#ifdef USE_CONTRIB -- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); --#endif -- -- else throw std::runtime_error("Invalid descriptor"); -- assert(!descriptor.empty()); -- vector features; -- -- -- cout << "Extracting features..." << endl; -- for(size_t i = 0; i < path_to_images.size(); ++i) -- { -- vector keypoints; -- cv::Mat descriptors; -- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); -- features.push_back(descriptors); -- cout<<"done detecting features"< &features){ -- -- //test it is not created -- std::ifstream ifile(filename); -- if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); -- } --} -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc==1){ -- cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); -- -- //save features to file -- saveToFile(argv[2],features); -- -- }catch(std::exception &ex){ -- cerr< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features){ +- +- //test it is not created +- std::ifstream ifile(filename); +- if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); +- } +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc==1){ +- cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- +- //save features to file +- saveToFile(argv[2],features); +- +- }catch(std::exception &ex){ +- cerr< @@ -1857,77 +1508,77 @@ index 8d9de7d..1f82c66 100644 --- a/utils/create_voc_step1.cpp +++ b/examples/create_voc_step1.cpp @@ -1,71 +1,71 @@ --//Second step,creates the vocabulary from the set of features. It can be slow --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --using namespace DBoW3; --using namespace std; -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ --vector features; -- //test it is not created -- std::ifstream ifile(filename); -- if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); -- } -- return features; --} -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc!=3){ -- cerr<<"Usage: features output_voc.yml[.gz]"< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-using namespace DBoW3; +-using namespace std; +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ +-vector features; +- //test it is not created +- std::ifstream ifile(filename); +- if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); +- } +- return features; +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc!=3){ +- cerr<<"Usage: features output_voc.yml[.gz]"< +#include @@ -2007,208 +1658,208 @@ index 63db40b..b4bc391 100644 --- a/utils/demo_general.cpp +++ b/examples/demo_general.cpp @@ -1,202 +1,202 @@ --/** -- * Date: 2016 -- * Author: Rafael Muñoz Salinas -- * Description: demo application of DBoW3 -- * License: see the LICENSE.txt file -- */ -- --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --#include --#include --#ifdef USE_CONTRIB --#include --#include --#endif --#include "DescManip.h" -- --using namespace DBoW3; --using namespace std; -- -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ -- vector paths; -- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ -- //select detector -- cv::Ptr fdetector; -- if (descriptor=="orb") fdetector=cv::ORB::create(); -- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); --#ifdef OPENCV_VERSION_3 -- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); --#endif --#ifdef USE_CONTRIB -- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); --#endif -- -- else throw std::runtime_error("Invalid descriptor"); -- assert(!descriptor.empty()); -- vector features; -- -- -- cout << "Extracting features..." << endl; -- for(size_t i = 0; i < path_to_images.size(); ++i) -- { -- vector keypoints; -- cv::Mat descriptors; -- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); -- features.push_back(descriptors); -- cout<<"done detecting features"< &features) --{ -- // branching factor and depth levels -- const int k = 9; -- const int L = 3; -- const WeightingType weight = TF_IDF; -- const ScoringType score = L1_NORM; -- -- DBoW3::Vocabulary voc(k, L, weight, score); -- -- cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; -- voc.create(features); -- cout << "... done!" << endl; -- -- cout << "Vocabulary information: " << endl -- << voc << endl << endl; -- -- // lets do something with this vocabulary -- cout << "Matching images against themselves (0 low, 1 high): " << endl; -- BowVector v1, v2; -- for(size_t i = 0; i < features.size(); i++) -- { -- voc.transform(features[i], v1); -- for(size_t j = 0; j < features.size(); j++) -- { -- voc.transform(features[j], v2); -- -- double score = voc.score(v1, v2); -- cout << "Image " << i << " vs Image " << j << ": " << score << endl; -- } -- } -- -- // save the vocabulary to disk -- cout << endl << "Saving vocabulary..." << endl; -- voc.save("small_voc.yml.gz"); -- cout << "Done" << endl; --} -- --////// ---------------------------------------------------------------------------- -- --void testDatabase(const vector &features) --{ -- cout << "Creating a small database..." << endl; -- -- // load the vocabulary from disk -- Vocabulary voc("small_voc.yml.gz"); -- -- Database db(voc, false, 0); // false = do not use direct index -- // (so ignore the last param) -- // The direct index is useful if we want to retrieve the features that -- // belong to some vocabulary node. -- // db creates a copy of the vocabulary, we may get rid of "voc" now -- -- // add images to the database -- for(size_t i = 0; i < features.size(); i++) -- db.add(features[i]); -- -- cout << "... done!" << endl; -- -- cout << "Database information: " << endl << db << endl; -- -- // and query the database -- cout << "Querying the database: " << endl; -- -- QueryResults ret; -- for(size_t i = 0; i < features.size(); i++) -- { -- db.query(features[i], ret, 4); -- -- // ret[0] is always the same image in this case, because we added it to the -- // database. ret[1] is the second best match. -- -- cout << "Searching for Image " << i << ". " << ret << endl; -- } -- -- cout << endl; -- -- // we can save the database. The created file includes the vocabulary -- // and the entries added -- cout << "Saving database..." << endl; -- db.save("small_db.yml.gz"); -- cout << "... done!" << endl; -- -- // once saved, we can load it again -- cout << "Retrieving database once again..." << endl; -- Database db2("small_db.yml.gz"); -- cout << "... done! This is: " << endl << db2 << endl; --} -- -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc<=2){ -- cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); -- testVocCreation(features); -- -- -- testDatabase(features); -- -- }catch(std::exception &ex){ -- cerr< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features) +-{ +- // branching factor and depth levels +- const int k = 9; +- const int L = 3; +- const WeightingType weight = TF_IDF; +- const ScoringType score = L1_NORM; +- +- DBoW3::Vocabulary voc(k, L, weight, score); +- +- cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; +- voc.create(features); +- cout << "... done!" << endl; +- +- cout << "Vocabulary information: " << endl +- << voc << endl << endl; +- +- // lets do something with this vocabulary +- cout << "Matching images against themselves (0 low, 1 high): " << endl; +- BowVector v1, v2; +- for(size_t i = 0; i < features.size(); i++) +- { +- voc.transform(features[i], v1); +- for(size_t j = 0; j < features.size(); j++) +- { +- voc.transform(features[j], v2); +- +- double score = voc.score(v1, v2); +- cout << "Image " << i << " vs Image " << j << ": " << score << endl; +- } +- } +- +- // save the vocabulary to disk +- cout << endl << "Saving vocabulary..." << endl; +- voc.save("small_voc.yml.gz"); +- cout << "Done" << endl; +-} +- +-////// ---------------------------------------------------------------------------- +- +-void testDatabase(const vector &features) +-{ +- cout << "Creating a small database..." << endl; +- +- // load the vocabulary from disk +- Vocabulary voc("small_voc.yml.gz"); +- +- Database db(voc, false, 0); // false = do not use direct index +- // (so ignore the last param) +- // The direct index is useful if we want to retrieve the features that +- // belong to some vocabulary node. +- // db creates a copy of the vocabulary, we may get rid of "voc" now +- +- // add images to the database +- for(size_t i = 0; i < features.size(); i++) +- db.add(features[i]); +- +- cout << "... done!" << endl; +- +- cout << "Database information: " << endl << db << endl; +- +- // and query the database +- cout << "Querying the database: " << endl; +- +- QueryResults ret; +- for(size_t i = 0; i < features.size(); i++) +- { +- db.query(features[i], ret, 4); +- +- // ret[0] is always the same image in this case, because we added it to the +- // database. ret[1] is the second best match. +- +- cout << "Searching for Image " << i << ". " << ret << endl; +- } +- +- cout << endl; +- +- // we can save the database. The created file includes the vocabulary +- // and the entries added +- cout << "Saving database..." << endl; +- db.save("small_db.yml.gz"); +- cout << "... done!" << endl; +- +- // once saved, we can load it again +- cout << "Retrieving database once again..." << endl; +- Database db2("small_db.yml.gz"); +- cout << "... done! This is: " << endl << db2 << endl; +-} +- +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc<=2){ +- cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- testVocCreation(features); +- +- +- testDatabase(features); +- +- }catch(std::exception &ex){ +- cerr<>:/guard:ehcont>") diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp index 17bd171..825cfe4 100644 --- a/DirectXTex/DirectXTexEXR.cpp @@ -20,3 +41,47 @@ index 17bd171..825cfe4 100644 namespace { struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; +@@ -161,7 +161,7 @@ namespace + return result.QuadPart >= m_EOF; + } + +- Imf::Int64 tellg() override ++ uint64_t tellg() override + { + const LARGE_INTEGER dist = {}; + LARGE_INTEGER result; +@@ -169,10 +169,10 @@ namespace + { + throw com_exception(HRESULT_FROM_WIN32(GetLastError())); + } +- return static_cast(result.QuadPart); ++ return static_cast(result.QuadPart); + } + +- void seekg(Imf::Int64 pos) override ++ void seekg(uint64_t pos) override + { + LARGE_INTEGER dist; + dist.QuadPart = static_cast(pos); +@@ -213,7 +213,7 @@ namespace + } + } + +- Imf::Int64 tellp() override ++ uint64_t tellp() override + { + const LARGE_INTEGER dist = {}; + LARGE_INTEGER result; +@@ -221,10 +221,10 @@ namespace + { + throw com_exception(HRESULT_FROM_WIN32(GetLastError())); + } +- return static_cast(result.QuadPart); ++ return static_cast(result.QuadPart); + } + +- void seekp(Imf::Int64 pos) override ++ void seekp(uint64_t pos) override + { + LARGE_INTEGER dist; + dist.QuadPart = static_cast(pos); diff --git a/external_imported/vcpkg/ports/directxtex/portfile.cmake b/external_imported/vcpkg/ports/directxtex/portfile.cmake index 62e43378a..d007dd07d 100644 --- a/external_imported/vcpkg/ports/directxtex/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtex/portfile.cmake @@ -1,10 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF mar2022 - SHA512 04f898b2cf2c76edd400147db9144e196fc8441739de3293f8851952ce8153bab033deba52a0d35e51c4fbc9705ffe183f1606a0fae29970dc2babe65ed78e19 + REF jul2022 + SHA512 21b21dfff8bbedabfcb7d3694d750370304382ce0a9847c4ff3c153a3b6a6c5b61fc4051eb95b210e186107092488572757c43e1ca37319e763d49b0bca49dd4 HEAD_REF main ) @@ -52,33 +56,34 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} + -DBUILD_SAMPLE=OFF -DBC_USE_OPENMP=ON -DBUILD_DX11=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texassemble.exe" - FILENAME "texassemble-mar2022.exe" - SHA512 2a2bec1f012ba6778d99f53a3b4f015f84e4ab76dd68a1980d77cdac588c60a21b30abbfc0de9f0b0ef790ef5ed8444f1648b80990053f8a1f967a04d20d3c33 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texassemble.exe" + FILENAME "texassemble-jul2022.exe" + SHA512 72b47e30f810481f2af00cf45eb5789ae78c3ce0cc385f8168a74f178798cefa69b837060fe0ff4cf8dedaf8d1e489bbf4b3e1453c821df478636aca73f89b43 ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texconv.exe" - FILENAME "texconv-mar2022.exe" - SHA512 fa0b12dcc7e4688f356bb591dedd07dcb27b6029c6490438b39368f72b77f90112360544e035f89e1098dc09b26fb921840ecae851ad5eba6a339cd46316c4e3 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texconv.exe" + FILENAME "texconv-jul2022.exe" + SHA512 6fe66d90a33510005f3dcc0190aef4e0139d077ee7aeeef015b1e9204149384d46d02e0d9274b68e6f4299b64d3c4eb57fc4bfa6bfefc317699e624ae332abb6 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texdiag.exe" - FILENAME "texdiag-mar2022.exe" - SHA512 7fe074a08599edca9ad8ad5ff930c9c4dbc74faad6502c288e9a555a4a79f51affbce51758c99518d54c4698457e0edb379ffaebfd3dcae0bd16a343195f8292 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texdiag.exe" + FILENAME "texdiag-jul2022.exe" + SHA512 804a361293b5350d722604f5150a72751e1c25642986a505e83e0b33be8f53535ea42b6adbbc0b0b88e16d494012e9d02150c60e0ce0115fba30a84e7c2a14bd ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -89,9 +94,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/external_imported/vcpkg/ports/directxtex/vcpkg.json b/external_imported/vcpkg/ports/directxtex/vcpkg.json index 297f6f220..0ede01f7f 100644 --- a/external_imported/vcpkg/ports/directxtex/vcpkg.json +++ b/external_imported/vcpkg/ports/directxtex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtex", - "version-date": "2022-03-24", + "version-date": "2022-07-29", + "port-version": 1, "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/external_imported/vcpkg/ports/directxtk/portfile.cmake b/external_imported/vcpkg/ports/directxtk/portfile.cmake index ab5b1db56..f1ef0c55a 100644 --- a/external_imported/vcpkg/ports/directxtk/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtk/portfile.cmake @@ -1,10 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_MINGW) + message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF mar2022 - SHA512 09264e19ff786b1f8cf56f0a789ce9df60b3682adba6dbb3e9c8c8c7d869b464c0ad869299fc5cda2d535db19c7a96b43cba2fd40d8cb6aa9dc14914b181d410 + REF jul2022 + SHA512 1f16d682e2ed7d177ec7ab0f5ecbcfd11f85478eff52db781403c6c1dca8945521da3a5fd926ea46a4d319c94bc0f21eacea7b456da4283ccac21614e3338f58 HEAD_REF main ) @@ -28,21 +32,21 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/MakeSpriteFont.exe" - FILENAME "makespritefont-mar2022.exe" - SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jul2022/MakeSpriteFont.exe" + FILENAME "makespritefont-jul2022.exe" + SHA512 fd039070fad3dee3fe146d2cd4950f599f680cb4abd370e7c21bedeb8c0a970455ad2eac463fc6d198505b6bbdabebfcc453bf74c317f6a10bf2e2f9a0bfc418 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/XWBTool.exe" - FILENAME "xwbtool-mar2022.exe" - SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jul2022/XWBTool.exe" + FILENAME "xwbtool-jul2022.exe" + SHA512 6276e17241afc8c0b82789b99667577394eedf001fa2d4b3acdfac847744c3ac5ec9a8072a1e3e9f247386711232aab93f066a0689f4f9f7d84744dc3862ea05 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -52,8 +56,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/external_imported/vcpkg/ports/directxtk/vcpkg.json b/external_imported/vcpkg/ports/directxtk/vcpkg.json index e0379377d..b0e0e6ed5 100644 --- a/external_imported/vcpkg/ports/directxtk/vcpkg.json +++ b/external_imported/vcpkg/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2022-03-24", + "version-date": "2022-07-29", "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", @@ -22,7 +22,7 @@ "description": "Build with XAudio 2.8 support for Windows 8.x or later" }, "xaudio2-9": { - "description": "Build with XAudio 2.9 support for Windows 10" + "description": "Build with XAudio 2.9 support for Windows 10/11" }, "xaudio2redist": { "description": "Build with XAudio2Redist support for Windows 7 SP1 or later", diff --git a/external_imported/vcpkg/ports/directxtk12/portfile.cmake b/external_imported/vcpkg/ports/directxtk12/portfile.cmake index c980b3de6..92bf31c23 100644 --- a/external_imported/vcpkg/ports/directxtk12/portfile.cmake +++ b/external_imported/vcpkg/ports/directxtk12/portfile.cmake @@ -3,32 +3,40 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF mar2022 - SHA512 fc41450aad51491f4ac89f87bfd76a62179052db1b98ee626561ef3edb8716578c8dfee01613731cdd9fd91f03ed54a8ec73595374ae16e217cfc87d6f11eca4 + REF jul2022 + SHA512 54e58e181fec16f6bc9b27ad9e8267bc23601912f18759d99b278c4086cc0979ff18fe80db8ee7cbb9dfa7e38d0c892b665f005ffbb60f9d0ccdbe69093b6b5d HEAD_REF main ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xaudio2-9 BUILD_XAUDIO_WIN10 + xaudio2redist BUILD_XAUDIO_REDIST +) + +set(DXCPATH ${CURRENT_HOST_INSTALLED_DIR}/tools/directx-dxc) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DBUILD_XAUDIO_WIN10=ON -DBUILD_DXIL_SHADERS=ON + OPTIONS ${FEATURE_OPTIONS} -DBUILD_DXIL_SHADERS=ON -DDIRECTX_DXC_PATH=${DXCPATH} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/MakeSpriteFont.exe" - FILENAME "makespritefont-mar2022.exe" - SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jul2022/MakeSpriteFont.exe" + FILENAME "makespritefont-jul2022.exe" + SHA512 fd039070fad3dee3fe146d2cd4950f599f680cb4abd370e7c21bedeb8c0a970455ad2eac463fc6d198505b6bbdabebfcc453bf74c317f6a10bf2e2f9a0bfc418 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/XWBTool.exe" - FILENAME "xwbtool-mar2022.exe" - SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jul2022/XWBTool.exe" + FILENAME "xwbtool-jul2022.exe" + SHA512 6276e17241afc8c0b82789b99667577394eedf001fa2d4b3acdfac847744c3ac5ec9a8072a1e3e9f247386711232aab93f066a0689f4f9f7d84744dc3862ea05 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -38,8 +46,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/directxtk12/vcpkg.json b/external_imported/vcpkg/ports/directxtk12/vcpkg.json index e6e83a029..2438d31f7 100644 --- a/external_imported/vcpkg/ports/directxtk12/vcpkg.json +++ b/external_imported/vcpkg/ports/directxtk12/vcpkg.json @@ -1,12 +1,16 @@ { "name": "directxtk12", - "version-date": "2022-03-24", + "version-date": "2022-07-29", "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", "license": "MIT", "supports": "windows", "dependencies": [ + { + "name": "directx-dxc", + "host": true + }, "directx-headers", "directxmath", { @@ -17,5 +21,22 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "xaudio2-9" + ], + "features": { + "xaudio2-9": { + "description": "Build with XAudio 2.9 support for Windows 10/11" + }, + "xaudio2redist": { + "description": "Build with XAudio2Redist", + "dependencies": [ + { + "name": "xaudio2redist", + "platform": "!uwp & !arm" + } + ] + } + } } diff --git a/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake index d61b18143..d8537e228 100644 --- a/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake +++ b/external_imported/vcpkg/ports/discordcoreapi/portfile.cmake @@ -1,12 +1,12 @@ if(VCPKG_TARGET_IS_LINUX) - message(WARNING "Discordcoreapi only supports g++ 11 on linux.") + message(WARNING "DiscordCoreAPI only supports g++ 11 on linux.") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF 6d7c899f0690513855119aa225259dccf17b10f0 - SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e + REF 057df9c13edce1939e48abb0ecbf737bd8349bd2 + SHA512 81ec37163c7667e3f87b91db95f71f52d3a9301200131626e67fae1d23a774edf6e0597d987a7a7cc4128419a147da0766186e9ee5a14efafc5751c8de31ca27 HEAD_REF main ) @@ -18,18 +18,14 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) -vcpkg_fixup_pkgconfig() - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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}/License" + INSTALL "${SOURCE_PATH}/License.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json index e9b175b3e..de1857c55 100644 --- a/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json +++ b/external_imported/vcpkg/ports/discordcoreapi/vcpkg.json @@ -1,18 +1,16 @@ { "name": "discordcoreapi", - "version-date": "2022-03-30", + "version-date": "2022-09-25", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", - "license": "AGPL-3.0-or-later", + "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !static) | (linux & x64)", "dependencies": [ - "curl", "ffmpeg", - "glib", "libsodium", - "nlohmann-json", "openssl", "opus", + "simdjson", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake index 29726bcc3..6645a5f03 100644 --- a/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/dlfcn-win32/portfile.cmake @@ -1,10 +1,10 @@ -set(SOURCE_VERSION 1.1.1) +set(SOURCE_VERSION 1.3.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dlfcn-win32/dlfcn-win32 REF v${SOURCE_VERSION} - SHA512 557729511546f574487f8c7de437c53bcf5ae11640349c338ead9965a4ac0f937de647839b63c821003be54dca5bcbf28f2899d2348acf7dfef31e487da1cba1 + SHA512 0aa01c49ee8628c42cdc8b9782b4741a36502764d4442227ea4e9a8062356ff17e8eaa3cdd4113009ad7ad2044b6cfd24128319d71825e13062259dd1906e27e HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json index e4d0b1651..12a9607d2 100644 --- a/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/dlfcn-win32/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dlfcn-win32", - "version": "1.1.1", - "port-version": 6, + "version": "1.3.1", "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", + "license": "MIT", "supports": "windows & !uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/dlib/fix-dependencies.patch b/external_imported/vcpkg/ports/dlib/fix-dependencies.patch new file mode 100644 index 000000000..8077fd393 --- /dev/null +++ b/external_imported/vcpkg/ports/dlib/fix-dependencies.patch @@ -0,0 +1,80 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +index 9f3001d..962cfc4 100644 +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -287,6 +287,7 @@ if (NOT TARGET dlib) + + set(dlib_needed_libraries) + set(dlib_needed_includes) ++ set(pkg_config_dlib_requires_private "") + + if (DLIB_ISO_CPP_ONLY) + add_library(dlib ${source_files} ) +@@ -814,6 +815,10 @@ if (NOT TARGET dlib) + + + if (DLIB_LINK_WITH_SQLITE3) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) ++ list(APPEND dlib_needed_libraries unofficial::sqlite3::sqlite3) ++ string(APPEND pkg_config_dlib_requires_private " sqlite3") ++ elseif(0) + find_library(sqlite sqlite3) + # make sure sqlite3.h is in the include path + find_path(sqlite_path sqlite3.h) +@@ -829,6 +834,10 @@ if (NOT TARGET dlib) + + + if (DLIB_USE_FFTW) ++ find_package(FFTW3 CONFIG REQUIRED) ++ list(APPEND dlib_needed_libraries FFTW3::fftw3) ++ string(APPEND pkg_config_dlib_requires_private " fftw3") ++ elseif(0) + find_library(fftw fftw3) + # make sure fftw3.h is in the include path + find_path(fftw_path fftw3.h) +@@ -964,6 +973,8 @@ if (NOT TARGET dlib) + + ## dlib-1.pc generation and installation + ++ string (REGEX REPLACE " m " " -lm " pkg_config_dlib_needed_libraries "${pkg_config_dlib_needed_libraries} ") ++ string (REGEX REPLACE "[^ ]*::[^ ]*" "" pkg_config_dlib_needed_libraries "${pkg_config_dlib_needed_libraries}") + configure_file("cmake_utils/dlib.pc.in" "dlib-1.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dlib-1.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +@@ -977,7 +988,7 @@ if (NOT TARGET dlib) + + endif() + +-if (MSVC) ++if (0) + # Give the output library files names that are unique functions of the + # visual studio mode that compiled them. We do this so that people who + # compile dlib and then copy the .lib files around (which they shouldn't be +diff --git a/dlib/cmake_utils/dlib.pc.in b/dlib/cmake_utils/dlib.pc.in +index 9060110..2ec27e8 100644 +--- a/dlib/cmake_utils/dlib.pc.in ++++ b/dlib/cmake_utils/dlib.pc.in +@@ -6,3 +6,4 @@ Description: Numerical and networking C++ library + Version: @VERSION@ + Libs: -L${libdir} -ldlib @pkg_config_dlib_needed_libraries@ + Cflags: -I${includedir} @pkg_config_dlib_needed_includes@ ++Requires.private: @pkg_config_dlib_requires_private@ +diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in +index 2667a2e..cc7b4a2 100644 +--- a/dlib/cmake_utils/dlibConfig.cmake.in ++++ b/dlib/cmake_utils/dlibConfig.cmake.in +@@ -31,6 +31,14 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR) + unset(dlib_deps_threads_check) + endif() + ++include(CMakeFindDependencyMacro) ++if("@DLIB_USE_FFTW@") ++ find_dependency(FFTW3 CONFIG) ++endif() ++if("@DLIB_LINK_WITH_SQLITE3@") ++ find_dependency(unofficial-sqlite3 CONFIG) ++endif() ++ + set(dlib_LIBRARIES dlib::dlib) + set(dlib_LIBS dlib::dlib) + set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/external_imported/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch b/external_imported/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch deleted file mode 100644 index 41ba700b4..000000000 --- a/external_imported/vcpkg/ports/dlib/fix-sqlite3-fftw-linkage.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt ---- a/dlib/CMakeLists.txt -+++ b/dlib/CMakeLists.txt -@@ -747,32 +750,15 @@ - - - if (DLIB_LINK_WITH_SQLITE3) -- find_library(sqlite sqlite3) -- # make sure sqlite3.h is in the include path -- find_path(sqlite_path sqlite3.h) -- if (sqlite AND sqlite_path) -- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path}) -- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) -- else() -- set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) -- endif() -- mark_as_advanced(sqlite sqlite_path) -+ find_package(unofficial-sqlite3 CONFIG) -+ set(dlib_needed_libraries ${dlib_needed_libraries} unofficial::sqlite3::sqlite3) - endif() - - - - if (DLIB_USE_FFTW) -- find_library(fftw fftw3) -- # make sure fftw3.h is in the include path -- find_path(fftw_path fftw3.h) -- if (fftw AND fftw_path) -- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path}) -- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} ) -- else() -- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE ) -- toggle_preprocessor_switch(DLIB_USE_FFTW) -- endif() -- mark_as_advanced(fftw fftw_path) -+ find_package(FFTW3 CONFIG) -+ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3) - endif() - - ---- a/dlib/cmake_utils/dlibConfig.cmake.in -+++ b/dlib/cmake_utils/dlibConfig.cmake.in -@@ -28,6 +28,14 @@ - include("${dlib_CMAKE_DIR}/dlib.cmake") - endif() - -+include(CMakeFindDependencyMacro) -+if("@DLIB_USE_FFTW@") -+ find_dependency(FFTW3 CONFIG) -+endif() -+if("@DLIB_LINK_WITH_SQLITE3@") -+ find_dependency(unofficial-sqlite3 CONFIG) -+endif() -+ - set(dlib_LIBRARIES dlib::dlib) - set(dlib_LIBS dlib::dlib) - set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/external_imported/vcpkg/ports/dlib/force_finding_packages.patch b/external_imported/vcpkg/ports/dlib/force_finding_packages.patch deleted file mode 100644 index 558b75f1f..000000000 --- a/external_imported/vcpkg/ports/dlib/force_finding_packages.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/dlib/cmake_utils/find_libjpeg.cmake b/dlib/cmake_utils/find_libjpeg.cmake -index 3b9e656..d741f31 100644 ---- a/dlib/cmake_utils/find_libjpeg.cmake -+++ b/dlib/cmake_utils/find_libjpeg.cmake -@@ -14,7 +14,7 @@ if (DEFINED JPEG_FOUND) - return() - endif() - --find_package(JPEG QUIET) -+find_package(JPEG REQUIRED) - - if(JPEG_FOUND) - set(JPEG_TEST_CMAKE_FLAGS -@@ -31,7 +31,7 @@ if(JPEG_FOUND) - message (STATUS "Found system copy of libjpeg: ${JPEG_LIBRARY}") - if(NOT test_for_libjpeg_worked) - set(JPEG_FOUND 0) -- message (STATUS "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") -+ message (FATAL_ERROR "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") - endif() - endif() - -diff --git a/dlib/cmake_utils/find_libpng.cmake b/dlib/cmake_utils/find_libpng.cmake -index 1b35604..489a4c8 100644 ---- a/dlib/cmake_utils/find_libpng.cmake -+++ b/dlib/cmake_utils/find_libpng.cmake -@@ -14,7 +14,7 @@ if (DEFINED PNG_FOUND) - return() - endif() - --find_package(PNG QUIET) -+find_package(PNG REQUIRED) - - if(PNG_FOUND) - set(PNG_TEST_CMAKE_FLAGS -@@ -31,7 +31,7 @@ if(PNG_FOUND) - message (STATUS "Found system copy of libpng: ${PNG_LIBRARIES}") - if(NOT test_for_libpng_worked) - set(PNG_FOUND 0) -- message (STATUS "System copy of libpng is broken. Will build our own libpng and use that instead.") -+ message (FATAL_ERROR "System copy of libpng is broken. Will build our own libpng and use that instead.") - endif() - endif() - diff --git a/external_imported/vcpkg/ports/dlib/portfile.cmake b/external_imported/vcpkg/ports/dlib/portfile.cmake index 8df6a8c2b..fa093539f 100644 --- a/external_imported/vcpkg/ports/dlib/portfile.cmake +++ b/external_imported/vcpkg/ports/dlib/portfile.cmake @@ -3,23 +3,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO davisking/dlib - REF 074ab8bdbadbee1afb95653c3ce46867ed32dfa1 #v19.23 - SHA512 da7942cf006566bafdd7079cc31ac445cd66e300714e522c53dfcf6b1a811de4cf2188c9a75c978388b09554bccc4164d40afc907bf9e6f75a17f8ca10ee0355 + REF 6097093ab329fcd19aed03a8fe67949f6971a65d #v19.24 + SHA512 4bdcecdf0f986abc748245d21616bf2c304461e9a37572c66743f69141fc3f37eb846fdaedc6c910135d986534f7989cbcc52a884ae7a52464fbb2a07b16a327 HEAD_REF master PATCHES - fix-sqlite3-fftw-linkage.patch - force_finding_packages.patch + fix-dependencies.patch find_blas.patch ) -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libjpeg") -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libpng") -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/zlib") - -# This fixes static builds; dlib doesn't pull in the needed transitive dependencies -file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) -string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") -file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -28,17 +20,24 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cuda" DLIB_USE_CUDA ) +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(COMMON_OPTIONS -DUSE_SSE2_INSTRUCTIONS=OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${COMMON_OPTIONS} -DDLIB_PNG_SUPPORT=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON -DDLIB_JPEG_SUPPORT=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON -DDLIB_USE_BLAS=ON -DDLIB_USE_LAPACK=ON -DDLIB_GIF_SUPPORT=OFF + -DDLIB_WEBP_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF - -DCMAKE_DEBUG_POSTFIX=d OPTIONS_DEBUG -DDLIB_ENABLE_ASSERTS=ON #-DDLIB_ENABLE_STACK_TRACE=ON @@ -50,9 +49,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dlib) vcpkg_fixup_pkgconfig() -# There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # Remove other files not required in package file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/all") @@ -73,6 +72,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif") -# Handle copyright file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/external_imported/vcpkg/ports/dlib/vcpkg.json b/external_imported/vcpkg/ports/dlib/vcpkg.json index fa7907dec..752f77a6b 100644 --- a/external_imported/vcpkg/ports/dlib/vcpkg.json +++ b/external_imported/vcpkg/ports/dlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dlib", - "version": "19.23", + "version": "19.24", + "port-version": 2, "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/doctest/portfile.cmake b/external_imported/vcpkg/ports/doctest/portfile.cmake index 2f78fb5b3..d9510a0ff 100644 --- a/external_imported/vcpkg/ports/doctest/portfile.cmake +++ b/external_imported/vcpkg/ports/doctest/portfile.cmake @@ -1,21 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO onqtam/doctest - REF v2.4.8 - SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c + REPO doctest/doctest + REF v2.4.9 + SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DDOCTEST_WITH_TESTS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/doctest/vcpkg.json b/external_imported/vcpkg/ports/doctest/vcpkg.json index 8b838d450..1983708f5 100644 --- a/external_imported/vcpkg/ports/doctest/vcpkg.json +++ b/external_imported/vcpkg/ports/doctest/vcpkg.json @@ -1,6 +1,17 @@ { "name": "doctest", - "version": "2.4.8", + "version": "2.4.9", "description": "The fastest feature-rich C++11/14/17/20 single-header testing framework", - "homepage": "https://github.com/onqtam/doctest" + "homepage": "https://github.com/doctest/doctest", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/dpdk/CMakeLists.txt b/external_imported/vcpkg/ports/dpdk/CMakeLists.txt deleted file mode 100644 index 1952227ae..000000000 --- a/external_imported/vcpkg/ports/dpdk/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(dpdk C) - -LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") -LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -#ARCH can be: i686, x86_64, ppc_64, arm64 -#MACHINE can be: native, power8, armv8a -#EXECENV can be: linuxapp, bsdapp -#TOOLCHAIN can be: gcc, icc - -SET(ARCH x86_64) -SET(MACHINE native) -SET(EXECENV linuxapp) -SET(TOOLCHAIN gcc) - -IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") - SET(ARCH "i686") -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(MACHINE arm8a) -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - SET(MACHINE power8) - SET(ARCH ppc_64) -ENDIF () - -IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - SET(EXECENV bsdapp) -ENDIF () - -FIND_PACKAGE(Numa REQUIRED) -FIND_PROGRAM(MAKE make) - -SET(DPDK_CFLAGS "-fPIC") -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") -ENDIF () - -SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) -#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) -SET(DPDK_CONFIG "T=${DPDK_TARGET}") - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -ADD_CUSTOM_TARGET(dpdk-configure - COMMAND ${MAKE} config ${DPDK_CONFIG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - VERBATIM - ) - -ADD_CUSTOM_TARGET(dpdk ALL - COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -ADD_DEPENDENCIES(dpdk dpdk-configure) - -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/external_imported/vcpkg/ports/dpdk/FindNuma.cmake b/external_imported/vcpkg/ports/dpdk/FindNuma.cmake deleted file mode 100644 index d5bb61435..000000000 --- a/external_imported/vcpkg/ports/dpdk/FindNuma.cmake +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PATH(NUMA_ROOT_DIR - NAMES include/numa.h - PATHS ENV NUMA_ROOT - DOC "NUMA library root directory") - -FIND_PATH(NUMA_INCLUDE_DIR - NAMES numa.h - HINTS ${NUMA_ROOT_DIR} - PATH_SUFFIXES include - DOC "NUMA include directory") - -FIND_LIBRARY(NUMA_LIBRARY - NAMES numa - HINTS ${NUMA_ROOT_DIR} - DOC "NUMA library file") - -IF (NUMA_LIBRARY) - GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) - MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) -ELSE () - SET(NUMA_FOUND FALSE) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () diff --git a/external_imported/vcpkg/ports/dpdk/dpdkConfig.cmake b/external_imported/vcpkg/ports/dpdk/dpdkConfig.cmake deleted file mode 100644 index d60265a77..000000000 --- a/external_imported/vcpkg/ports/dpdk/dpdkConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) - -SET_LIBRARY_TARGET("DPDK" "dpdk" "${DPDK_ROOT}/debug/lib/libdpdk.a" "${DPDK_ROOT}/lib/libdpdk.a" "${DPDK_ROOT}/include/dpdk") - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/) -ELSE () - LINK_DIRECTORIES(${DPDK_ROOT}/lib/) -ENDIF () - -FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/librte*.*) -FOREACH (LIB_FILE_NAME ${DPDK_LIBS}) - GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) - GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) - STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") - SET_LIBRARY_TARGET("DPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/dpdk") -ENDFOREACH () diff --git a/external_imported/vcpkg/ports/dpdk/enable-either-static-or-shared-build.patch b/external_imported/vcpkg/ports/dpdk/enable-either-static-or-shared-build.patch new file mode 100644 index 000000000..5ec8f581e --- /dev/null +++ b/external_imported/vcpkg/ports/dpdk/enable-either-static-or-shared-build.patch @@ -0,0 +1,81 @@ +diff --git a/config/meson.build b/config/meson.build +index 7134e80..a77f533 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -57,7 +57,9 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) + # driver .so files often depend upon the bus drivers for their connect bus, + # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need + # to be in the library path, so symlink the drivers from the main lib directory. +-if not is_windows ++if get_option('default_library') == 'static' ++ # skip ++elif not is_windows + meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', + get_option('libdir'), pmd_subdir_opt) + elif meson.version().version_compare('>=0.55.0') +diff --git a/drivers/meson.build b/drivers/meson.build +index 1d8123b..36ab3c0 100644 +--- a/drivers/meson.build ++++ b/drivers/meson.build +@@ -180,7 +180,7 @@ foreach subpath:subdirs + include_directories: includes, + dependencies: static_deps, + c_args: cflags, +- install: true) ++ install: get_option('default_library') == 'static') + + # now build the shared driver + version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path) +@@ -220,6 +220,7 @@ foreach subpath:subdirs + endif + endif + ++ if get_option('default_library') == 'shared' + shared_lib = shared_library(lib_name, sources, + objects: objs, + include_directories: includes, +@@ -237,9 +238,13 @@ foreach subpath:subdirs + shared_dep = declare_dependency(link_with: shared_lib, + include_directories: includes, + dependencies: shared_deps) ++ endif + static_dep = declare_dependency( + include_directories: includes, + dependencies: static_deps) ++ if get_option('default_library') == 'static' ++ shared_dep = static_dep ++ endif + + dpdk_drivers += static_lib + +diff --git a/lib/meson.build b/lib/meson.build +index 24adbe4..eef6e93 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -192,7 +192,7 @@ foreach l:libraries + c_args: cflags, + dependencies: static_deps, + include_directories: includes, +- install: true) ++ install: get_option('default_library') == 'static') + static_dep = declare_dependency( + include_directories: includes, + dependencies: static_deps) +@@ -246,6 +246,7 @@ foreach l:libraries + output: name + '.sym_chk') + endif + ++ if get_option('default_library') == 'shared' + shared_lib = shared_library(libname, + sources, + objects: objs, +@@ -262,6 +263,9 @@ foreach l:libraries + dependencies: shared_deps) + + dpdk_libraries = [shared_lib] + dpdk_libraries ++ else ++ shared_dep = static_dep ++ endif + dpdk_static_libraries = [static_lib] + dpdk_static_libraries + + set_variable('shared_rte_' + name, shared_dep) diff --git a/external_imported/vcpkg/ports/dpdk/fix-dependencies.patch b/external_imported/vcpkg/ports/dpdk/fix-dependencies.patch new file mode 100644 index 000000000..7bb4c26ef --- /dev/null +++ b/external_imported/vcpkg/ports/dpdk/fix-dependencies.patch @@ -0,0 +1,65 @@ +diff --git a/config/meson.build b/config/meson.build +index 0dde249..64f7d1c 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -181,12 +181,10 @@ if meson.is_cross_build() and not meson.get_cross_property('numa', true) + find_libnuma = false + endif + if find_libnuma +- numa_dep = cc.find_library('numa', required: false) +- if numa_dep.found() and cc.has_header('numaif.h') ++ numa_dep = dependency('numa', method: 'pkg-config') ++ if numa_dep.found() + dpdk_conf.set10('RTE_HAS_LIBNUMA', true) + has_libnuma = 1 +- add_project_link_arguments('-lnuma', language: 'c') +- dpdk_extra_ldflags += '-lnuma' + endif + endif + +@@ -211,8 +209,6 @@ if libarchive.found() + # Push libarchive link dependency at the project level to support + # statically linking dpdk apps. Details at: + # https://inbox.dpdk.org/dev/20210605004024.660267a1@sovereign/ +- add_project_link_arguments('-larchive', language: 'c') +- dpdk_extra_ldflags += '-larchive' + endif + + # check for libbsd +diff --git a/lib/eal/linux/meson.build b/lib/eal/linux/meson.build +index 65f2ac6..3e023f8 100644 +--- a/lib/eal/linux/meson.build ++++ b/lib/eal/linux/meson.build +@@ -23,5 +23,6 @@ sources += files( + + deps += ['kvargs', 'telemetry'] + if has_libnuma == 1 ++ ext_deps += numa_dep + dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true) + endif +diff --git a/lib/eal/meson.build b/lib/eal/meson.build +index 056beb9..04bd3fe 100644 +--- a/lib/eal/meson.build ++++ b/lib/eal/meson.build +@@ -29,6 +29,9 @@ endif + if dpdk_conf.has('RTE_USE_LIBBSD') + ext_deps += libbsd + endif ++if dpdk_conf.has('RTE_HAS_LIBARCHIVE') ++ ext_deps += libarchive ++endif + if cc.has_function('getentropy', prefix : '#include ') + cflags += '-DRTE_LIBEAL_USE_GETENTROPY' + endif +diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build +index bc72720..83970c7 100644 +--- a/lib/vhost/meson.build ++++ b/lib/vhost/meson.build +@@ -6,6 +6,7 @@ if not is_linux + reason = 'only supported on Linux' + endif + if has_libnuma == 1 ++ ext_deps += numa_dep + dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true) + endif + if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0')) diff --git a/external_imported/vcpkg/ports/dpdk/no-absolute-driver-path.patch b/external_imported/vcpkg/ports/dpdk/no-absolute-driver-path.patch new file mode 100644 index 000000000..5c54a9734 --- /dev/null +++ b/external_imported/vcpkg/ports/dpdk/no-absolute-driver-path.patch @@ -0,0 +1,13 @@ +diff --git a/config/meson.build b/config/meson.build +index 7f7b6c92fd..51c3572793 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -375,7 +375,7 @@ if not dpdk_conf.has('RTE_MAX_NUMA_NODES') + endif + + # set the install path for the drivers +-dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) ++dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', '') + + install_headers(['rte_config.h'], + subdir: get_option('include_subdir_arch')) diff --git a/external_imported/vcpkg/ports/dpdk/portfile.cmake b/external_imported/vcpkg/ports/dpdk/portfile.cmake index 9ac5fa161..e940011bd 100644 --- a/external_imported/vcpkg/ports/dpdk/portfile.cmake +++ b/external_imported/vcpkg/ports/dpdk/portfile.cmake @@ -1,43 +1,90 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO DPDK/dpdk - REF v19.02 - SHA512 e0cc7081b163b4e264b65c1abb7e0f8aa29211539cecc5cf52986699b800eb4d4f2026377c3048c5c3bd2791e41f21645bb655797a3300740aa83633fb87626e - HEAD_REF master +if(VCPKG_TARGET_IS_LINUX) + execute_process( + COMMAND uname --kernel-release + OUTPUT_VARIABLE KERNEL_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(KERNEL_VERSION VERSION_LESS 4.4) + message( + WARNING + " Kernel version requires >= 4.4 on Linux (current version: ${KERNEL_VERSION})\n" + " Building may fail or have functional defects. See\n" + " https://doc.dpdk.org/guides/linux_gsg/sys_reqs.html#system-software" + ) + endif() + + execute_process( + COMMAND sh -c "ldd --version | head -n1 | rev | cut -d' ' -f 1 | rev" + OUTPUT_VARIABLE GLIBC_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(GLIBC_VERSION VERSION_LESS 2.7) + message( + FATAL_ERROR + "glibc version requires >= 2.7 (for features related to cpuset)") + endif() +endif() + +set(PORT_VERSION 22.07) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DPDK/dpdk + REF v${PORT_VERSION} + SHA512 86892f5f61ee8f7ccd61c47767515603683d0e7a217389490a9a5d4ac87b42557572113f4cd56425fef212eff5715095a34ed3c03a3ce6351ffdcacb850b0851 + HEAD_REF main + PATCHES + enable-either-static-or-shared-build.patch + fix-dependencies.patch + remove-examples-src-from-datadir.patch + stop-building-apps.patch + no-absolute-driver-path.patch ) -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} +macro(append_bool_option feature_name option_name) + if("${feature_name}" IN_LIST FEATURES) + list(APPEND DPDK_OPTIONS -D${option_name}=true) + else() + list(APPEND DPDK_OPTIONS -D${option_name}=false) + endif() +endmacro() + +set(DPDK_OPTIONS "") +append_bool_option("docs" "enable_docs") +append_bool_option("kmods" "enable_kmods") +append_bool_option("tests" "tests") +append_bool_option("trace" "enable_trace_fp") +string(REPLACE "-Denable_docs=true" "-Denable_docs=false" DPDK_OPTIONS_DEBUG "${DPDK_OPTIONS}") + +list(APPEND PYTHON_PACKAGES pyelftools) +if("docs" IN_LIST FEATURES) + list(APPEND PYTHON_PACKAGES packaging sphinx) +endif() +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES ${PYTHON_PACKAGES}) + +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Ddisable_drivers=regex/cn9k + -Dexamples= + OPTIONS_RELEASE + ${DPDK_OPTIONS} + OPTIONS_DEBUG + ${DPDK_OPTIONS_DEBUG} ) +vcpkg_install_meson() + +set(tools dpdk-devbind.py dpdk-pmdinfo.py dpdk-telemetry.py dpdk-hugepages.py) +if("tests" IN_LIST FEATURES) + list(APPEND tools dpdk-test) +endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) + +vcpkg_fixup_pkgconfig() + +if("docs" IN_LIST FEATURES) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/dpdk") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/dpdk" "${CURRENT_PACKAGES_DIR}/share/dpdk/doc") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/doc") -VCPKG_INSTALL_CMAKE() - -# Headers are symbolic links here, gather all, resolve and copy real files -FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") -SET(REAL_FILES "") -FOREACH (HEADER ${HEADERS}) - GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) - LIST(APPEND REAL_FILES "${REAL_FILE}") -ENDFOREACH () - -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/dpdkConfig.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/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/dpdk/remove-examples-src-from-datadir.patch b/external_imported/vcpkg/ports/dpdk/remove-examples-src-from-datadir.patch new file mode 100644 index 000000000..fbbc84a27 --- /dev/null +++ b/external_imported/vcpkg/ports/dpdk/remove-examples-src-from-datadir.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 0541e7f145..00f6e67550 100644 +--- a/meson.build ++++ b/meson.build +@@ -79,9 +79,9 @@ subdir('doc') + # build any examples explicitly requested - useful for developers - and + # install any example code into the appropriate install path + subdir('examples') +-install_subdir('examples', +- install_dir: get_option('datadir') + '/dpdk', +- exclude_files: ex_file_excludes) ++# install_subdir('examples', ++# install_dir: get_option('datadir') + '/dpdk', ++# exclude_files: ex_file_excludes) + + # build kernel modules if enabled + if get_option('enable_kmods') diff --git a/external_imported/vcpkg/ports/dpdk/stop-building-apps.patch b/external_imported/vcpkg/ports/dpdk/stop-building-apps.patch new file mode 100644 index 000000000..644bd63be --- /dev/null +++ b/external_imported/vcpkg/ports/dpdk/stop-building-apps.patch @@ -0,0 +1,13 @@ +diff --git a/app/meson.build b/app/meson.build +index 93d8c15032..389dc13b99 100644 +--- a/app/meson.build ++++ b/app/meson.build +@@ -27,7 +27,7 @@ if get_option('default_library') == 'static' and not is_windows + endif + + foreach app:apps +- build = true ++ build = false + name = app + sources = [] + includes = [] diff --git a/external_imported/vcpkg/ports/dpdk/usage b/external_imported/vcpkg/ports/dpdk/usage index 6ecb606dd..5e058c3a4 100644 --- a/external_imported/vcpkg/ports/dpdk/usage +++ b/external_imported/vcpkg/ports/dpdk/usage @@ -1,4 +1,6 @@ -The package dpdk is compatible with built-in CMake targets: - - FIND_PACKAGE(dpdk CONFIGURE REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE DPDK::dpdk) +The package dpdk can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(DPDK REQUIRED IMPORTED_TARGET libdpdk) + + target_link_libraries(main PRIVATE PkgConfig::DPDK) diff --git a/external_imported/vcpkg/ports/dpdk/vcpkg.json b/external_imported/vcpkg/ports/dpdk/vcpkg.json index 111defe83..ff0b7586a 100644 --- a/external_imported/vcpkg/ports/dpdk/vcpkg.json +++ b/external_imported/vcpkg/ports/dpdk/vcpkg.json @@ -1,7 +1,43 @@ { "name": "dpdk", - "version-string": "19.02", + "version-string": "22.07", "port-version": 1, "description": "A set of libraries and drivers for fast packet processing", - "supports": "linux" + "homepage": "https://www.dpdk.org/", + "documentation": "https://doc.dpdk.org/guides/index.html", + "license": "BSD-3-Clause", + "supports": "linux | freebsd", + "dependencies": [ + { + "name": "libarchive", + "default-features": false + }, + { + "name": "numactl", + "platform": "linux" + }, + "python3", + { + "name": "vcpkg-get-python-packages", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "docs": { + "description": "Build and install docs" + }, + "kmods": { + "description": "Build and install kernel modules" + }, + "tests": { + "description": "Build and install tests" + }, + "trace": { + "description": "Build with fast path traces enabled" + } + } } diff --git a/external_imported/vcpkg/ports/dpp/make-pkgconfig-required.patch b/external_imported/vcpkg/ports/dpp/make-pkgconfig-required.patch new file mode 100644 index 000000000..9cef2af0b --- /dev/null +++ b/external_imported/vcpkg/ports/dpp/make-pkgconfig-required.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/FindSodium.cmake b/cmake/FindSodium.cmake +index 23c5317..abbd08f 100644 +--- a/cmake/FindSodium.cmake ++++ b/cmake/FindSodium.cmake +@@ -46,9 +46,9 @@ endif() + # UNIX + if(UNIX) + # import pkg-config +- find_package(PkgConfig QUIET) ++ find_package(PkgConfig REQUIRED) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(sodium_PKG QUIET libsodium) ++ pkg_check_modules(sodium_PKG REQUIRED libsodium) + endif() + + if(sodium_USE_STATIC_LIBS) diff --git a/external_imported/vcpkg/ports/dpp/portfile.cmake b/external_imported/vcpkg/ports/dpp/portfile.cmake new file mode 100644 index 000000000..614233532 --- /dev/null +++ b/external_imported/vcpkg/ports/dpp/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brainboxdotcc/DPP + REF d7f92689381e66decf7ec7e247570690534206a4 + SHA512 994d5ea58b7d95aa28f831864017018dacfeb0f52fd86ab2fc58a913ac041b0097dbef04d4c62ba4a4726c8b7a24e3360c06300fae5d5a79a8f2ab855e701b72 + HEAD_REF master + PATCHES + make-pkgconfig-required.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/dpp") +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() + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + diff --git a/external_imported/vcpkg/ports/dpp/usage b/external_imported/vcpkg/ports/dpp/usage new file mode 100644 index 000000000..4c9c1b373 --- /dev/null +++ b/external_imported/vcpkg/ports/dpp/usage @@ -0,0 +1,3 @@ +dpp provides CMake targets: + find_package(dpp CONFIG REQUIRED) + target_link_libraries(main PRIVATE dpp::dpp) diff --git a/external_imported/vcpkg/ports/dpp/vcpkg.json b/external_imported/vcpkg/ports/dpp/vcpkg.json new file mode 100644 index 000000000..52123767d --- /dev/null +++ b/external_imported/vcpkg/ports/dpp/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "dpp", + "version": "10.0.19", + "description": "D++ Extremely Lightweight C++ Discord Library.", + "homepage": "https://dpp.dev/", + "license": "Apache-2.0", + "supports": "(windows & !static & !uwp) | linux | osx", + "dependencies": [ + "libsodium", + "nlohmann-json", + "openssl", + "opus", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch b/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch index 63f672d81..0b62512bc 100644 --- a/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch +++ b/external_imported/vcpkg/ports/draco/fix-compile-error-uwp.patch @@ -1,5 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0362420..2b09073 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,10 @@ 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" diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc -index 6e42a58..3c302b9 100644 +index 378de73..be7e032 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc @@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { @@ -13,18 +28,3 @@ index 6e42a58..3c302b9 100644 return true; } -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e79da7..c4d9880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,10 @@ draco_set_build_definitions() - draco_set_cxx_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" diff --git a/external_imported/vcpkg/ports/draco/portfile.cmake b/external_imported/vcpkg/ports/draco/portfile.cmake index bde70c664..1ae5d45e4 100644 --- a/external_imported/vcpkg/ports/draco/portfile.cmake +++ b/external_imported/vcpkg/ports/draco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.4.3 - SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 + REF bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2 + SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0 HEAD_REF master PATCHES fix-compile-error-uwp.patch diff --git a/external_imported/vcpkg/ports/draco/vcpkg.json b/external_imported/vcpkg/ports/draco/vcpkg.json index 288be5537..a2f5617e3 100644 --- a/external_imported/vcpkg/ports/draco/vcpkg.json +++ b/external_imported/vcpkg/ports/draco/vcpkg.json @@ -1,8 +1,9 @@ { "name": "draco", - "version": "1.4.3", + "version": "1.5.2", "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/drlibs/portfile.cmake b/external_imported/vcpkg/ports/drlibs/portfile.cmake index 9919d67a6..e3ee273a9 100644 --- a/external_imported/vcpkg/ports/drlibs/portfile.cmake +++ b/external_imported/vcpkg/ports/drlibs/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs - REF c729134b41cf09542542b5da841ac2f933b36cba - SHA512 3760a5921d120db21c9351e7edf1877b7052783e20dd7f6ab673992db0f6e4014c07c559f993f7870f6e7fe021b5e47b10b27ea0ed3895d07077b0eea8e13078 + REF dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb + SHA512 4ec10ea1d9622879b5bdb61a11768e36b56a558d32aac6f8c8a52168ab401f9d53db0eeba074fe56de39f3809fb0bd73e2e6c5ef4ea8fd158abeb45e18285f08 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/drlibs/vcpkg.json b/external_imported/vcpkg/ports/drlibs/vcpkg.json index db59c2fe4..27214d902 100644 --- a/external_imported/vcpkg/ports/drlibs/vcpkg.json +++ b/external_imported/vcpkg/ports/drlibs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drlibs", - "version-date": "2022-04-03", + "version-date": "2022-09-26", "description": "Single-file audio decoding libraries for C/C++", "homepage": "https://github.com/mackron/dr_libs", "license": "Unlicense OR MIT-0" diff --git a/external_imported/vcpkg/ports/drogon/portfile.cmake b/external_imported/vcpkg/ports/drogon/portfile.cmake index 4f24228c3..ad7b310a3 100644 --- a/external_imported/vcpkg/ports/drogon/portfile.cmake +++ b/external_imported/vcpkg/ports/drogon/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.7.5 - SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 + REF v1.8.0 + SHA512 a834d937e3719059223d9bf19d777dbc92eaf09c5c9c44b5a742bfefcbcd95a146a6568cef8c058050fb87e330f221434ffe784dfa29a49de12b031f86ab1a33 HEAD_REF master PATCHES vcpkg.patch drogon_config.patch - static-brotli.patch - use-libmariadb.patch + redis.patch ) vcpkg_check_features( @@ -29,7 +28,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBUILD_DROGON_SHARED=${BUILD_DROGON_SHARED} + -DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED} -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ${FEATURE_OPTIONS} diff --git a/external_imported/vcpkg/ports/drogon/redis.patch b/external_imported/vcpkg/ports/drogon/redis.patch new file mode 100644 index 000000000..1c54e1166 --- /dev/null +++ b/external_imported/vcpkg/ports/drogon/redis.patch @@ -0,0 +1,66 @@ +diff --git a/nosql_lib/redis/src/RedisClientImpl.cc b/nosql_lib/redis/src/RedisClientImpl.cc +index 15fa74b..b2f9ac1 100644 +--- a/nosql_lib/redis/src/RedisClientImpl.cc ++++ b/nosql_lib/redis/src/RedisClientImpl.cc +@@ -12,6 +12,7 @@ + * + */ + ++#include "RedisConnection.h" + #include "RedisClientImpl.h" + #include "RedisTransactionImpl.h" + #include "../../lib/src/TaskTimeoutFlag.h" +diff --git a/nosql_lib/redis/src/RedisClientImpl.h b/nosql_lib/redis/src/RedisClientImpl.h +index d84cfab..e7c8fab 100644 +--- a/nosql_lib/redis/src/RedisClientImpl.h ++++ b/nosql_lib/redis/src/RedisClientImpl.h +@@ -13,7 +13,6 @@ + */ + #pragma once + +-#include "RedisConnection.h" + #include + #include + #include +@@ -26,6 +25,8 @@ namespace drogon + { + namespace nosql + { ++class RedisConnection; ++using RedisConnectionPtr = std::shared_ptr; + class RedisClientImpl final + : public RedisClient, + public trantor::NonCopyable, +diff --git a/nosql_lib/redis/src/RedisClientLockFree.cc b/nosql_lib/redis/src/RedisClientLockFree.cc +index 2f27b64..fe225b2 100644 +--- a/nosql_lib/redis/src/RedisClientLockFree.cc ++++ b/nosql_lib/redis/src/RedisClientLockFree.cc +@@ -12,6 +12,7 @@ + * + */ + ++#include "RedisConnection.h" + #include "RedisClientLockFree.h" + #include "RedisTransactionImpl.h" + #include "../../lib/src/TaskTimeoutFlag.h" +diff --git a/nosql_lib/redis/src/RedisClientLockFree.h b/nosql_lib/redis/src/RedisClientLockFree.h +index 00bc6c1..136f315 100644 +--- a/nosql_lib/redis/src/RedisClientLockFree.h ++++ b/nosql_lib/redis/src/RedisClientLockFree.h +@@ -13,7 +13,6 @@ + */ + #pragma once + +-#include "RedisConnection.h" + #include + #include + #include +@@ -26,6 +25,8 @@ namespace drogon + { + namespace nosql + { ++class RedisConnection; ++using RedisConnectionPtr = std::shared_ptr; + class RedisClientLockFree final + : public RedisClient, + public trantor::NonCopyable, diff --git a/external_imported/vcpkg/ports/drogon/static-brotli.patch b/external_imported/vcpkg/ports/drogon/static-brotli.patch deleted file mode 100644 index a44a40cc5..000000000 --- a/external_imported/vcpkg/ports/drogon/static-brotli.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake -index da5b6d2..6b631ab 100755 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake -@@ -23,9 +23,9 @@ include(FindPackageHandleStandardArgs) - - find_path(BROTLI_INCLUDE_DIR "brotli/decode.h") - --find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon) --find_library(BROTLIDEC_LIBRARY NAMES brotlidec) --find_library(BROTLIENC_LIBRARY NAMES brotlienc) -+find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) -+find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) -+find_library(BROTLIENC_LIBRARY NAMES brotlienc brotlienc-static) - - find_package_handle_standard_args(Brotli - REQUIRED_VARS diff --git a/external_imported/vcpkg/ports/drogon/use-libmariadb.patch b/external_imported/vcpkg/ports/drogon/use-libmariadb.patch deleted file mode 100644 index 71ca89892..000000000 --- a/external_imported/vcpkg/ports/drogon/use-libmariadb.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 146d2b8..f180498 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL) - - if (BUILD_MYSQL) - # Find mysql, only mariadb client library is supported -- find_package(MySQL QUIET) - find_package(unofficial-libmariadb QUIET) -- if (MySQL_FOUND) -- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib) -- set(DROGON_FOUND_MYSQL TRUE) -- elseif (unofficial-libmariadb_FOUND) -+ if (unofficial-libmariadb_FOUND) - target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb) - set(DROGON_FOUND_MYSQL TRUE) - endif () -diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in -index 199cfb9..a3fbde0 100644 ---- a/cmake/templates/DrogonConfig.cmake.in -+++ b/cmake/templates/DrogonConfig.cmake.in -@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@) - find_dependency(SQLite3) - endif() - if(@MySQL_FOUND@) --find_dependency(MySQL) -+find_dependency(unofficial-libmariadb CONFIG REQUIRED) - endif() - if(@Boost_FOUND@) - find_dependency(Boost) diff --git a/external_imported/vcpkg/ports/drogon/vcpkg.json b/external_imported/vcpkg/ports/drogon/vcpkg.json index f6e70f75d..a5fd7284e 100644 --- a/external_imported/vcpkg/ports/drogon/vcpkg.json +++ b/external_imported/vcpkg/ports/drogon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drogon", - "version-semver": "1.7.5", + "version-semver": "1.8.0", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/external_imported/vcpkg/ports/drogon/vcpkg.patch b/external_imported/vcpkg/ports/drogon/vcpkg.patch index 489acd938..326fcaa99 100644 --- a/external_imported/vcpkg/ports/drogon/vcpkg.patch +++ b/external_imported/vcpkg/ports/drogon/vcpkg.patch @@ -39,11 +39,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt if (BUILD_MYSQL) diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +index 9f2f1e7..09871f8 100755 --- a/drogon_ctl/CMakeLists.txt +++ b/drogon_ctl/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(_drogon_ctl target_link_libraries(_drogon_ctl ${PROJECT_NAME}) - if (WIN32 AND BUILD_DROGON_SHARED) + if (WIN32 AND BUILD_SHARED_LIBS) set(DROGON_FILE $) - set(TRANTOR_FILE $) + set(TRANTOR_FILE $) diff --git a/external_imported/vcpkg/ports/dstorage/portfile.cmake b/external_imported/vcpkg/ports/dstorage/portfile.cmake index 45c04b469..b05d0e5d0 100644 --- a/external_imported/vcpkg/ports/dstorage/portfile.cmake +++ b/external_imported/vcpkg/ports/dstorage/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.0" - FILENAME "directstorage.1.0.0.zip" - SHA512 34f24842d509ccddf2c8a06e94a2f67c0746ed8acb6d90ab89453ed4ec9b123970cf1e802375af27e6d5be3c82211813009f8f4b83f233ce419a1467b8c10846 + URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.2" + FILENAME "directstorage.1.0.2.zip" + SHA512 42a8d21a1be9981d5fcaaa2aa90d1e4bfe20969ee7959803f6acb76b0846d91d49ad89cebac069463729d013532508c6fbe41af3a1e99187ac13e849d747dd7e ) vcpkg_extract_source_archive_ex( @@ -12,13 +12,13 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) -file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/native/include/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/native/include/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/native/lib/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/dstorage/vcpkg.json b/external_imported/vcpkg/ports/dstorage/vcpkg.json index 66ada05df..3e6c4bbae 100644 --- a/external_imported/vcpkg/ports/dstorage/vcpkg.json +++ b/external_imported/vcpkg/ports/dstorage/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dstorage", - "version": "1.0.0", + "version": "1.0.2", "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", + "documentation": "https://github.com/microsoft/DirectStorage", "license": null, - "supports": "windows & !uwp & !static" + "supports": "windows & !uwp & !staticcrt" } diff --git a/external_imported/vcpkg/ports/duckx/fix_dependencies.patch b/external_imported/vcpkg/ports/duckx/fix_dependencies.patch new file mode 100644 index 000000000..c48daacb0 --- /dev/null +++ b/external_imported/vcpkg/ports/duckx/fix_dependencies.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45218659..1ec4250c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,11 @@ endif() + option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) + option(BUILD_SAMPLE "Build provided sample" OFF) + +-set(HEADERS src/duckx.hpp src/zip.h src/miniz.h +- src/pugixml.hpp src/pugiconfig.hpp) +-set(SOURCES src/duckx.cpp src/zip.c src/pugixml.cpp) ++find_package(libzip REQUIRED) ++find_package(pugixml REQUIRED) ++ ++set(HEADERS src/duckx.hpp) ++set(SOURCES src/duckx.cpp) + + if(BUILD_SHARED_LIBS) + add_library(duckx SHARED ${HEADERS} ${SOURCES}) +@@ -19,6 +21,8 @@ else() + add_library(duckx STATIC ${HEADERS} ${SOURCES}) + endif() + ++target_link_libraries(duckx PUBLIC libzip::zip pugixml::pugixml) ++ + add_library(duckx::duckx ALIAS duckx) + + target_include_directories(duckx PUBLIC +@@ -38,12 +42,22 @@ endif() + include(GNUInstallDirs) + install( + TARGETS duckx +- EXPORT duckxConfig ++ EXPORT duckxTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) +-install(EXPORT duckxConfig NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++install(EXPORT duckxTargets NAMESPACE duckx:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/duckx) ++include(CMakePackageConfigHelpers) ++configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/duckxConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx" ++ NO_SET_AND_CHECK_MACRO ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" COMPATIBILITY ExactVersion) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/duckxConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/duckxConfigVersion.cmake" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/duckx") ++ + install(FILES ${HEADERS} DESTINATION include) + + +diff --git a/duckxConfig.cmake.in b/duckxConfig.cmake.in +new file mode 100644 +index 000000000..960b03b3b +--- /dev/null ++++ b/duckxConfig.cmake.in +@@ -0,0 +1,6 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++find_dependency(libzip) ++find_dependency(pugixml) ++include("${CMAKE_CURRENT_LIST_DIR}/duckxTargets.cmake") +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/duckx/portfile.cmake b/external_imported/vcpkg/ports/duckx/portfile.cmake index be1170ea3..9ee068c1b 100644 --- a/external_imported/vcpkg/ports/duckx/portfile.cmake +++ b/external_imported/vcpkg/ports/duckx/portfile.cmake @@ -1,18 +1,26 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO amiremohamadi/DuckX - REF v1.0.0 - SHA512 21db28f5c62a5695363cb844ce0ca45057433dd622dad44278459dd0582c92a8ca98d8bf597955426636ad31776abdcfdbe51a7fbfe256cfa8adcb8a2fd9410d + REF v1.2.2 + SHA512 3f1e626973b4638adaffcc0a20f59791f3a70abda1d2d09fddca9312014cef86d097f24873e74ef58c775b27c71a637e44f340da01a301b00ef334600bd412d6 + PATCHES fix_dependencies.patch ) -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() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/duckx) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx RENAME copyright) +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/duckx/vcpkg.json b/external_imported/vcpkg/ports/duckx/vcpkg.json index f38749088..36de4bea7 100644 --- a/external_imported/vcpkg/ports/duckx/vcpkg.json +++ b/external_imported/vcpkg/ports/duckx/vcpkg.json @@ -1,7 +1,20 @@ { "name": "duckx", - "version-string": "1.0.0", + "version": "1.2.2", "port-version": 1, "description": "DuckX is a library for creation of Office docx files.", - "homepage": "https://github.com/amiremohamadi/DuckX" + "homepage": "https://github.com/amiremohamadi/DuckX", + "license": "MIT", + "dependencies": [ + "libzip", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/dv-processing/portfile.cmake b/external_imported/vcpkg/ports/dv-processing/portfile.cmake new file mode 100644 index 000000000..20ab20e4f --- /dev/null +++ b/external_imported/vcpkg/ports/dv-processing/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/dv-processing + REF 6029bb4ecc06566b5f68375c68f00dfe78587baa + SHA512 9d0928e6ded1dab147814f380c57fb5b2c467c213c1fd12dddad9982e7d6a94a7bef526fcd248dd672b4b84753a44599b10d7794640ec63027152cd33b675787 + HEAD_REF rel_1.5 +) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation + OUT_SOURCE_PATH CMAKEMOD_SOURCE_PATH + REPO dv/cmakemod + REF a4d7eccfdc5f83e399786a77df79b178b762858b + SHA512 4fe9cc5099ab8b41c982df45cbf9a000b2cb1f1c6ed536685943a60520cff49e262ec43af8187177c50a0df2dfca57e7861bf2e7d07834fc16e85c30eb9a9edb + HEAD_REF a4d7eccfdc5f83e399786a77df79b178b762858b +) + +file(GLOB CMAKEMOD_FILES ${CMAKEMOD_SOURCE_PATH}/*) +file(COPY ${CMAKEMOD_FILES} DESTINATION ${SOURCE_PATH}/cmakemod) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS=OFF + -DENABLE_SAMPLES=OFF + -DENABLE_PYTHON=OFF + -DENABLE_UTILITIES=OFF + -DBUILD_CONFIG_VCPKG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-processing") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig(SKIP_CHECK) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/dv-processing/vcpkg.json b/external_imported/vcpkg/ports/dv-processing/vcpkg.json new file mode 100644 index 000000000..b95c1ac9f --- /dev/null +++ b/external_imported/vcpkg/ports/dv-processing/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "dv-processing", + "version": "1.5.1", + "port-version": 1, + "description": "Generic algorithms for event cameras.", + "homepage": "https://gitlab.com/inivation/dv/dv-processing", + "license": "Apache-2.0", + "dependencies": [ + "boost-callable-traits", + "boost-circular-buffer", + "boost-geometry", + "boost-lockfree", + "boost-nowide", + "boost-property-tree", + "boost-stacktrace", + "boost-tti", + "cli11", + "eigen3", + "fmt", + "libcaer", + "lz4", + "opencv4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json index 7b0cf6d69..d4a951815 100644 --- a/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json +++ b/external_imported/vcpkg/ports/dxsdk-d3dx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 3, + "port-version": 4, "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, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/external_imported/vcpkg/ports/dxut/portfile.cmake b/external_imported/vcpkg/ports/dxut/portfile.cmake index a8cd6ceb1..a09a762c9 100644 --- a/external_imported/vcpkg/ports/dxut/portfile.cmake +++ b/external_imported/vcpkg/ports/dxut/portfile.cmake @@ -3,18 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF jun2021 - SHA512 4c95cefcf685e95b26677d0aba3d118df7860e3bf1b99b567013d326f890a3f67657be2c60677d3d996cccacce30f70d0c2fc60a692372053cce50318fa79a70 - HEAD_REF master + REF aug2022 + SHA512 33552c4ced7a2e5653e3af9eda19dc48e3794c67e02b1588a96f2b964e552137930f5b6a9ff26b9377074137a743cbf7bd654b3d17bca442a7b667eff6d9eff8 + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dxtk DIRECTXTK_INTEGRATION +) + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/dxut/vcpkg.json b/external_imported/vcpkg/ports/dxut/vcpkg.json index 777546f34..326e63198 100644 --- a/external_imported/vcpkg/ports/dxut/vcpkg.json +++ b/external_imported/vcpkg/ports/dxut/vcpkg.json @@ -1,13 +1,28 @@ { "name": "dxut", - "version": "11.26", - "port-version": 1, + "version": "11.28", "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", "license": "MIT", "supports": "windows & !uwp", "dependencies": [ - "directxmath" - ] + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "dxtk": { + "description": "Support integration with DirectX Tool Kit for DX11", + "dependencies": [ + "directxtk" + ] + } + } } diff --git a/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff b/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff new file mode 100644 index 000000000..8b464b6dd --- /dev/null +++ b/external_imported/vcpkg/ports/eastl/fix-error-C2039.diff @@ -0,0 +1,88 @@ +diff --git a/include/EASTL/numeric_limits.h b/include/EASTL/numeric_limits.h +index e991e7e9..e933c845 100644 +--- a/include/EASTL/numeric_limits.h ++++ b/include/EASTL/numeric_limits.h +@@ -1435,6 +1435,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_valf(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nanf("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nansf("1"); } ++ ++ static value_type denorm_min() ++ { return FLT_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _FInf._Float; } + +@@ -1446,6 +1459,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _FDenorm._Float; } ++ #endif + + #endif + }; +@@ -1553,6 +1567,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_val(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nan("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nans("1"); } ++ ++ static value_type denorm_min() ++ { return DBL_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _Inf._Double; } + +@@ -1564,6 +1591,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _Denorm._Double; } ++ #endif + + #endif + }; +@@ -1671,6 +1699,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_val(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nan("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nans("1"); } ++ ++ static value_type denorm_min() ++ { return LDBL_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _LInf._Long_double; } + +@@ -1682,6 +1723,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _LDenorm._Long_double; } ++ #endif + + #endif + }; diff --git a/external_imported/vcpkg/ports/eastl/portfile.cmake b/external_imported/vcpkg/ports/eastl/portfile.cmake index 04ba63fc5..1c8185fa8 100644 --- a/external_imported/vcpkg/ports/eastl/portfile.cmake +++ b/external_imported/vcpkg/ports/eastl/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_cmake_install.patch - Fix-error-C2338.patch + Fix-error-C2338.patch + fix-error-C2039.diff ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/eastl/vcpkg.json b/external_imported/vcpkg/ports/eastl/vcpkg.json index b2c97ba50..7db58cc90 100644 --- a/external_imported/vcpkg/ports/eastl/vcpkg.json +++ b/external_imported/vcpkg/ports/eastl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "eastl", "version-string": "3.18.00", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/edflib/CMakeLists.txt b/external_imported/vcpkg/ports/edflib/CMakeLists.txt new file mode 100644 index 000000000..6a60fa510 --- /dev/null +++ b/external_imported/vcpkg/ports/edflib/CMakeLists.txt @@ -0,0 +1,64 @@ +cmake_minimum_required(VERSION 3.5) + +project(EDFlib VERSION 1.21 LANGUAGES C) + +option(BUILD_TOOLS "Build EDFlib tools." OFF) + +include(GNUInstallDirs) + +set(sources edflib.h edflib.c) + +add_library(EDFlib ${sources}) + +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) +endif() + +set_target_properties(EDFlib PROPERTIES PUBLIC_HEADER edflib.h) + +install(TARGETS EDFlib + EXPORT EDFlibTargets + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +install(EXPORT EDFlibTargets + FILE unofficial-EDFlibConfig.cmake + DESTINATION "share/unofficial-EDFlib" +) + +if(BUILD_TOOLS) + include(CheckSymbolExists) + + # https://stackoverflow.com/questions/32816646/can-cmake-detect-if-i-need-to-link-to-libm-when-using-pow-in-c + if(NOT POW_FUNCTION_EXISTS AND NOT NEED_LINKING_AGAINST_LIBM) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(NOT POW_FUNCTION_EXISTS) + unset(POW_FUNCTION_EXISTS CACHE) + list(APPEND CMAKE_REQUIRED_LIBRARIES m) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(POW_FUNCTION_EXISTS) + set(NEED_LINKING_AGAINST_LIBM True CACHE BOOL "" FORCE) + else() + message(FATAL_ERROR "Failed making the pow() function available") + endif() + endif() + endif() + + add_executable(sine_generator sine_generator.c) + target_link_libraries(sine_generator PRIVATE EDFlib) + + add_executable(sweep_generator sweep_generator.c) + target_link_libraries(sweep_generator PRIVATE EDFlib) + + if(NEED_LINKING_AGAINST_LIBM) + target_link_libraries(sine_generator PRIVATE m) + target_link_libraries(sweep_generator PRIVATE m) + endif() + + install(TARGETS sine_generator sweep_generator + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/external_imported/vcpkg/ports/edflib/portfile.cmake b/external_imported/vcpkg/ports/edflib/portfile.cmake new file mode 100644 index 000000000..2987b5919 --- /dev/null +++ b/external_imported/vcpkg/ports/edflib/portfile.cmake @@ -0,0 +1,41 @@ +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 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + sine_generator + sweep_generator + AUTO_CLEAN + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/edflib/vcpkg.json b/external_imported/vcpkg/ports/edflib/vcpkg.json new file mode 100644 index 000000000..e13eccddb --- /dev/null +++ b/external_imported/vcpkg/ports/edflib/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "edflib", + "version": "1.21", + "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files", + "homepage": "https://www.teuniz.net/edflib/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools" + } + } +} diff --git a/external_imported/vcpkg/ports/effects11/portfile.cmake b/external_imported/vcpkg/ports/effects11/portfile.cmake index 798d3554d..01b490e3f 100644 --- a/external_imported/vcpkg/ports/effects11/portfile.cmake +++ b/external_imported/vcpkg/ports/effects11/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 - REF feb2021 - SHA512 bdf35347582646e782c20a96180c8286786da46583527b76b2d348cd76a75285a31ebb88297962cd279c09bbd416c15c0d25ae91881ffebbf9e8ce2f21912f16 - HEAD_REF master - FILE_DISAMBIGUATOR 1 + REF aug2022 + SHA512 babb9fb5f2ee822d21e7262e4d0a9fce8383c2415d6c59f4101b782688ea4a7818411a922c60fc88da136bf427eec4e57da3610955d4cdbf11a77b61fd9bba14 + HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/effects11/vcpkg.json b/external_imported/vcpkg/ports/effects11/vcpkg.json index a5bd57af4..50a0d31da 100644 --- a/external_imported/vcpkg/ports/effects11/vcpkg.json +++ b/external_imported/vcpkg/ports/effects11/vcpkg.json @@ -1,10 +1,19 @@ { "name": "effects11", - "version": "11.26", - "port-version": 2, + "version": "11.28", "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", "license": "MIT", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake b/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake index 0afcc1043..3acd390fb 100644 --- a/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake +++ b/external_imported/vcpkg/ports/effolkronium-random/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO effolkronium/random - REF v1.4.0 - SHA512 B3DDEC048BBFB48877FD12295D4E0492E25976E1C4FE66F13E9E6E611DAAF654BD8D4AE75EA75125CB5AB420B82472C1CC1AB0BED3AEF632911B0934B45B23AF + REF v1.4.1 + SHA512 215fd34ea3a99c955a1fcd70d6c317e3829b3c562c737d22be1371213b3e14346b2f61fc76afbbcc55e26b4fdf630fa428b8bc34104170cbfc4afebcf24d160b HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json b/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json index 2e7502540..9c4be3d55 100644 --- a/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json +++ b/external_imported/vcpkg/ports/effolkronium-random/vcpkg.json @@ -1,9 +1,9 @@ { "name": "effolkronium-random", - "version": "1.4.0", - "port-version": 1, + "version": "1.4.1", "description": "Random with a modern C++ API", "homepage": "https://github.com/effolkronium/random", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/elfutils/portfile.cmake b/external_imported/vcpkg/ports/elfutils/portfile.cmake index 58480ef41..434d40463 100644 --- a/external_imported/vcpkg/ports/elfutils/portfile.cmake +++ b/external_imported/vcpkg/ports/elfutils/portfile.cmake @@ -45,6 +45,12 @@ else() endif() file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*") file(REMOVE ${TO_REMOVE}) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/elfutils/debug") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/elfutils/vcpkg.json b/external_imported/vcpkg/ports/elfutils/vcpkg.json index 1e8588f32..a0f4da2ec 100644 --- a/external_imported/vcpkg/ports/elfutils/vcpkg.json +++ b/external_imported/vcpkg/ports/elfutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "elfutils", "version": "0.186", - "port-version": 2, + "port-version": 4, "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", "homepage": "https://sourceware.org/elfutils/", "license": null, diff --git a/external_imported/vcpkg/ports/embree2/cmake_policy.patch b/external_imported/vcpkg/ports/embree2/cmake_policy.patch deleted file mode 100644 index ed4d339e3..000000000 --- a/external_imported/vcpkg/ports/embree2/cmake_policy.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index afa704d..96dc4f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,9 @@ IF(COMMAND cmake_policy) - if (POLICY CMP0042) - cmake_policy(SET CMP0042 OLD) - endif() -+ if (POLICY CMP0001) -+ cmake_policy(SET CMP0001 OLD) -+ endif() - ENDIF(COMMAND cmake_policy) - - MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY) diff --git a/external_imported/vcpkg/ports/embree2/portfile.cmake b/external_imported/vcpkg/ports/embree2/portfile.cmake deleted file mode 100644 index fc1e8384e..000000000 --- a/external_imported/vcpkg/ports/embree2/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO embree/embree - REF v2.17.7 - SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873 - HEAD_REF devel2 - PATCHES - cmake_policy.patch -) - -file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake") - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DEMBREE_ISPC_SUPPORT=OFF - -DEMBREE_TUTORIALS=OFF - -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} - -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME} - "-DTBB_LIBRARIES=TBB::tbb" - "-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" -) - -# just wait, the release build of embree is insanely slow in MSVC -# a single file will took about 2-10 min -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -# these cmake files do not seem to contain helpful configuration for find libs, just remove them -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/models") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/models") - -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/embree2") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/embree2/doc") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/embree2/vcpkg.json b/external_imported/vcpkg/ports/embree2/vcpkg.json deleted file mode 100644 index e89bc2b2e..000000000 --- a/external_imported/vcpkg/ports/embree2/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "embree2", - "version-semver": "2.17.7", - "port-version": 4, - "description": "High Performance Ray Tracing Kernels.", - "homepage": "https://github.com/embree/embree", - "supports": "!arm", - "dependencies": [ - "tbb", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/external_imported/vcpkg/ports/entt/portfile.cmake b/external_imported/vcpkg/ports/entt/portfile.cmake index 7b04105f6..ab578ea38 100644 --- a/external_imported/vcpkg/ports/entt/portfile.cmake +++ b/external_imported/vcpkg/ports/entt/portfile.cmake @@ -8,14 +8,14 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v3.9.0 - SHA512 b318ea06deb69350a00b3e824462a22fe443f4c778d0934857b68e43f0e6f1fe30c281889c14e3456067629e62a2bbb54491458c43d52ef543b2db8903133922 + REF v3.10.1 + SHA512 ce611f8892626d8df2d6be6a0e7c0218683899bae5665b4466f149c6a5b6a4d184b390370262faa3ea822a399ac71a92f4780e9a22438d4a7a14ca5f554e94c4 HEAD_REF master ) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DENTT_BUILD_TESTING=OFF @@ -23,13 +23,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Install natvis files +file(INSTALL "${SOURCE_PATH}/natvis/entt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis") # 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/external_imported/vcpkg/ports/entt/vcpkg.json b/external_imported/vcpkg/ports/entt/vcpkg.json index 27a59d978..4bec827d4 100644 --- a/external_imported/vcpkg/ports/entt/vcpkg.json +++ b/external_imported/vcpkg/ports/entt/vcpkg.json @@ -1,8 +1,10 @@ { "name": "entt", - "version": "3.9.0", + "version": "3.10.1", + "port-version": 1, "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/epsilon/portfile.cmake b/external_imported/vcpkg/ports/epsilon/portfile.cmake index 525974ab5..e75352697 100644 --- a/external_imported/vcpkg/ports/epsilon/portfile.cmake +++ b/external_imported/vcpkg/ports/epsilon/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO epsilon-project/epsilon @@ -43,6 +41,13 @@ vcpkg_install_nmake( vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_copy_tools(TOOL_NAMES epsilon SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + +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() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/epsilon/vcpkg.json b/external_imported/vcpkg/ports/epsilon/vcpkg.json index d19ef5749..7973271ea 100644 --- a/external_imported/vcpkg/ports/epsilon/vcpkg.json +++ b/external_imported/vcpkg/ports/epsilon/vcpkg.json @@ -1,9 +1,10 @@ { "name": "epsilon", - "version-string": "0.9.2", - "port-version": 6, + "version": "0.9.2", + "port-version": 7, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", + "license": "GPL-2.0-only OR LGPL-2.0-only", "supports": "windows", "dependencies": [ "libpopt" diff --git a/external_imported/vcpkg/ports/ereignis/portfile.cmake b/external_imported/vcpkg/ports/ereignis/portfile.cmake new file mode 100644 index 000000000..42aea9b4e --- /dev/null +++ b/external_imported/vcpkg/ports/ereignis/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Soundux/ereignis + REF v1.1 + SHA512 506a54e8d109028cd9e85597fbd6bf77694d55e78727d2889aa15846eb4ef00390153b719c6eb3d7f8d424eb7607b66f18adc24a2d907887e32c30ca0dca7034 + 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) diff --git a/external_imported/vcpkg/ports/ereignis/vcpkg.json b/external_imported/vcpkg/ports/ereignis/vcpkg.json new file mode 100644 index 000000000..4508f4214 --- /dev/null +++ b/external_imported/vcpkg/ports/ereignis/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "ereignis", + "version": "1.1", + "description": "A thread-safe C++17 Event Library", + "homepage": "https://github.com/Soundux/ereignis", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/eve/portfile.cmake b/external_imported/vcpkg/ports/eve/portfile.cmake index 621fe8a3c..4f6f203d0 100644 --- a/external_imported/vcpkg/ports/eve/portfile.cmake +++ b/external_imported/vcpkg/ports/eve/portfile.cmake @@ -3,9 +3,9 @@ message(WARNING "EVE requires a C++ 20 compliant compiler. GCC-11 and clang-12 a vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jfalcou/eve - REF v2021.10.0 - SHA512 bdac483d07c968cfe2cd2e0f26df68f0e3b6cd83fbfe4b89650dc58fb534fd37c5540682283a2ee29a82e87bdfc678beac3651e40cde5b4cf30c20ea8304c72c - HEAD_REF master + REF v2022.09.0 + SHA512 ab5be8c897955e08e1aa192ac9dd90e310b2786a2f295b0d5a5d309fa8e621b66673668b9dbe2f683a5e2596d291b0521d80a8bb80f493ecb12e86ab5d830c7b + HEAD_REF main ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/eve/vcpkg.json b/external_imported/vcpkg/ports/eve/vcpkg.json index 24d27832a..f5bbf6499 100644 --- a/external_imported/vcpkg/ports/eve/vcpkg.json +++ b/external_imported/vcpkg/ports/eve/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eve", - "version-date": "2021-10-16", + "version-date": "2022-09-20", "description": "EVE - the Expressive Vector Engine", "homepage": "https://github.com/jfalcou/eve", - "documentation": "https://jfalcou.github.io/eve/html/pages.html", + "documentation": "https://jfalcou.github.io/eve/", + "license": "BSL-1.0", "supports": "!windows", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/evpp/Add-static-shared-handling.patch b/external_imported/vcpkg/ports/evpp/Add-static-shared-handling.patch new file mode 100644 index 000000000..f597bfe70 --- /dev/null +++ b/external_imported/vcpkg/ports/evpp/Add-static-shared-handling.patch @@ -0,0 +1,98 @@ +diff --git a/apps/evmc/CMakeLists.txt b/apps/evmc/CMakeLists.txt +index 9918919..f8cffa7 100644 +--- a/apps/evmc/CMakeLists.txt ++++ b/apps/evmc/CMakeLists.txt +@@ -9,6 +9,7 @@ add_library(evmc_static STATIC ${evmc_SRCS}) + target_link_libraries(evmc_static ${LIBRARIES}) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evmc SHARED ${evmc_SRCS}) + target_link_libraries(evmc ${LIBRARIES}) + +@@ -25,6 +26,7 @@ if (UNIX) + TARGETS evmc + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ endif() + endif (UNIX) + + install ( +diff --git a/apps/evnsq/CMakeLists.txt b/apps/evnsq/CMakeLists.txt +index c510814..65f15cd 100644 +--- a/apps/evnsq/CMakeLists.txt ++++ b/apps/evnsq/CMakeLists.txt +@@ -5,6 +5,7 @@ add_library(evnsq_static STATIC ${evnsq_SRCS}) + target_link_libraries(evnsq_static ${LIBRARIES}) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evnsq SHARED ${evnsq_SRCS}) + target_link_libraries(evnsq ${LIBRARIES}) + +@@ -21,6 +22,7 @@ if (UNIX) + TARGETS evnsq + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ endif() + endif (UNIX) + + install ( +diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt +index 031659f..c16d708 100644 +--- a/evpp/CMakeLists.txt ++++ b/evpp/CMakeLists.txt +@@ -22,24 +22,19 @@ target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_lite_static PRIVATE cxx_std_11) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evpp SHARED ${evpp_SRCS}) + target_link_libraries(evpp ${DEPENDENT_LIBRARIES}) + + # boost lockfree queue + add_library(evpp_boost SHARED ${evpp_SRCS}) +- add_library(evpp_boost_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_boost PRIVATE -DH_HAVE_BOOST=1) +- target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost ${DEPENDENT_LIBRARIES}) +- target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) + + # https://github.com/cameron314/concurrentqueue + add_library(evpp_concurrentqueue SHARED ${evpp_SRCS}) +- add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) +- target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue ${DEPENDENT_LIBRARIES}) +- target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) + + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) +@@ -51,11 +46,26 @@ if (UNIX) + ) + + install ( +- TARGETS evpp evpp_static evpp_lite_static evpp_boost evpp_boost_static evpp_concurrentqueue evpp_concurrentqueue_static ++ TARGETS evpp evpp_boost evpp_concurrentqueue + EXPORT ${PACKAGE_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ else() ++ add_library(evpp_boost_static STATIC ${evpp_SRCS}) ++ target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) ++ target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) ++ ++ add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) ++ target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) ++ target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) ++ ++ install ( ++ TARGETS evpp_static evpp_lite_static evpp_boost_static evpp_concurrentqueue_static ++ EXPORT ${PACKAGE_NAME} ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ endif() + + else (UNIX) + install ( diff --git a/external_imported/vcpkg/ports/evpp/Export-unofficial-target.patch b/external_imported/vcpkg/ports/evpp/Export-unofficial-target.patch new file mode 100644 index 000000000..dfe7c82bb --- /dev/null +++ b/external_imported/vcpkg/ports/evpp/Export-unofficial-target.patch @@ -0,0 +1,168 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d325df7..772da36 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,3 +88,17 @@ include (packages) + + include (CPack) + include (CTest) ++ ++install(EXPORT unofficial-evpp-target ++ FILE unofficial-evpp-target.cmake ++ NAMESPACE unofficial::evpp:: ++ DESTINATION share/unofficial-evpp ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-evpp-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(glog CONFIG) ++find_dependency(Libevent CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-evpp-target.cmake") ++]]) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-evpp-config.cmake DESTINATION "share/unofficial-evpp") +\ No newline at end of file +diff --git a/apps/evmc/CMakeLists.txt b/apps/evmc/CMakeLists.txt +index f8cffa7..91663d6 100644 +--- a/apps/evmc/CMakeLists.txt ++++ b/apps/evmc/CMakeLists.txt +@@ -7,12 +7,13 @@ file(GLOB evmc_PUBLIC_HEADERS *.h) + + add_library(evmc_static STATIC ${evmc_SRCS}) + target_link_libraries(evmc_static ${LIBRARIES}) ++target_include_directories(evmc_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evmc SHARED ${evmc_SRCS}) + target_link_libraries(evmc ${LIBRARIES}) +- ++ target_include_directories(evmc INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -24,6 +25,8 @@ if (UNIX) + + install ( + TARGETS evmc ++ EXPORT unofficial-evpp-target ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -31,6 +34,7 @@ endif (UNIX) + + install ( + TARGETS evmc_static ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install (FILES ${evmc_PUBLIC_HEADERS} DESTINATION "include/evmc") +diff --git a/apps/evnsq/CMakeLists.txt b/apps/evnsq/CMakeLists.txt +index 65f15cd..7c9fbf5 100644 +--- a/apps/evnsq/CMakeLists.txt ++++ b/apps/evnsq/CMakeLists.txt +@@ -3,12 +3,13 @@ file(GLOB evnsq_PUBLIC_HEADERS *.h) + + add_library(evnsq_static STATIC ${evnsq_SRCS}) + target_link_libraries(evnsq_static ${LIBRARIES}) ++target_include_directories(evnsq_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evnsq SHARED ${evnsq_SRCS}) + target_link_libraries(evnsq ${LIBRARIES}) +- ++ target_include_directories(evnsq INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -20,6 +21,8 @@ if (UNIX) + + install ( + TARGETS evnsq ++ EXPORT unofficial-evpp-target ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -27,6 +30,7 @@ endif (UNIX) + + install ( + TARGETS evnsq_static ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install (FILES ${evnsq_PUBLIC_HEADERS} DESTINATION "include/evnsq") +diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt +index c16d708..1c17f04 100644 +--- a/evpp/CMakeLists.txt ++++ b/evpp/CMakeLists.txt +@@ -16,26 +16,28 @@ include_directories(${PROJECT_SOURCE_DIR}) + add_library(evpp_static STATIC ${evpp_SRCS}) + target_link_libraries(evpp_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_static PRIVATE cxx_std_11) ++target_include_directories(evpp_static INTERFACE $) + + add_library(evpp_lite_static STATIC ${evpp_lite_SRCS}) + target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_lite_static PRIVATE cxx_std_11) ++target_include_directories(evpp_lite_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evpp SHARED ${evpp_SRCS}) + target_link_libraries(evpp ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp INTERFACE $) + # boost lockfree queue + add_library(evpp_boost SHARED ${evpp_SRCS}) + target_compile_definitions(evpp_boost PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_boost INTERFACE $) + # https://github.com/cameron314/concurrentqueue + add_library(evpp_concurrentqueue SHARED ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_concurrentqueue INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -47,7 +49,7 @@ if (UNIX) + + install ( + TARGETS evpp evpp_boost evpp_concurrentqueue +- EXPORT ${PACKAGE_NAME} ++ EXPORT unofficial-evpp-target + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +@@ -55,14 +57,14 @@ if (UNIX) + add_library(evpp_boost_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_boost_static INTERFACE $) + add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_concurrentqueue_static INTERFACE $) + install ( + TARGETS evpp_static evpp_lite_static evpp_boost_static evpp_concurrentqueue_static +- EXPORT ${PACKAGE_NAME} ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -70,8 +72,7 @@ if (UNIX) + else (UNIX) + install ( + TARGETS evpp_static evpp_lite_static +- EXPORT ${PACKAGE_NAME} +- RUNTIME DESTINATION bin ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + diff --git a/external_imported/vcpkg/ports/evpp/compile-features.patch b/external_imported/vcpkg/ports/evpp/compile-features.patch new file mode 100644 index 000000000..c80e5515b --- /dev/null +++ b/external_imported/vcpkg/ports/evpp/compile-features.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47eb0a6..d325df7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,9 @@ if (UNIX) + list(APPEND DEPENDENT_INCLUDE_DIRS "${GLOG_INCLUDE_DIRS}/../") + SET(DEPENDENT_LIBRARIES libevent::core libevent::extra libevent::openssl glog::glog pthread) + else (UNIX) +- SET(DEPENDENT_LIBRARIES event glog) ++ find_package(glog CONFIG REQUIRED) ++ find_package(Libevent CONFIG REQUIRED) ++ SET(DEPENDENT_LIBRARIES libevent::core libevent::extra libevent::openssl glog::glog) + endif (UNIX) + + if (CMAKE_BENCHMARK_TESTING) +diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt +index b2e470d..031659f 100644 +--- a/evpp/CMakeLists.txt ++++ b/evpp/CMakeLists.txt +@@ -15,9 +15,11 @@ include_directories(${PROJECT_SOURCE_DIR}) + + add_library(evpp_static STATIC ${evpp_SRCS}) + target_link_libraries(evpp_static ${DEPENDENT_LIBRARIES}) ++target_compile_features(evpp_static PRIVATE cxx_std_11) + + add_library(evpp_lite_static STATIC ${evpp_lite_SRCS}) + target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES}) ++target_compile_features(evpp_lite_static PRIVATE cxx_std_11) + + if (UNIX) + add_library(evpp SHARED ${evpp_SRCS}) diff --git a/external_imported/vcpkg/ports/evpp/portfile.cmake b/external_imported/vcpkg/ports/evpp/portfile.cmake index b3edaf3aa..0a930d18c 100644 --- a/external_imported/vcpkg/ports/evpp/portfile.cmake +++ b/external_imported/vcpkg/ports/evpp/portfile.cmake @@ -10,20 +10,25 @@ vcpkg_from_github( fix-rapidjson-1-1.patch fix-linux-build.patch fix-osx-build.patch + compile-features.patch + Add-static-shared-handling.patch + Export-unofficial-target.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/rapidjson ${SOURCE_PATH}/3rdparty/concurrentqueue) +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/rapidjson" "${SOURCE_PATH}/3rdparty/concurrentqueue") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEVPP_VCPKG_BUILD=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-evpp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # 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/external_imported/vcpkg/ports/evpp/vcpkg.json b/external_imported/vcpkg/ports/evpp/vcpkg.json index ee95a96a7..f3837e728 100644 --- a/external_imported/vcpkg/ports/evpp/vcpkg.json +++ b/external_imported/vcpkg/ports/evpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "evpp", - "version-string": "0.7.0", - "port-version": 5, + "version": "0.7.0", + "port-version": 7, "description": "A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.", "homepage": "https://github.com/Qihoo360/evpp", + "license": "BSD-3-Clause", "dependencies": [ { "name": "boost-lockfree", @@ -14,17 +15,20 @@ "platform": "!windows" }, "glog", - { - "name": "libevent", - "platform": "windows" - }, { "name": "libevent", "features": [ "openssl" - ], - "platform": "!windows" + ] }, - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/expected-lite/portfile.cmake b/external_imported/vcpkg/ports/expected-lite/portfile.cmake index 33079f674..2e4b119c4 100644 --- a/external_imported/vcpkg/ports/expected-lite/portfile.cmake +++ b/external_imported/vcpkg/ports/expected-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/expected-lite - REF v0.5.0 - SHA512 6dd8974d518db0c79fe7bd0e407a85436c6ad222f8e5ed84efb34925d9a665b5b83ff08529b3e985034ed9a9201c80575f6a956132408ef6577c9c47cac55eae + REF 95b9cb015fa17baa749c2b396b335906e1596a9e # v0.6.2 + SHA512 f4d46daf45d857137d9b026fdeac3101c7707868aa133b696ee3c5cfc208ea402c71db73882eeece0c2eb6271ee06495c7afde4eefb20de0a98ad9bc5727dc35 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/expected-lite/vcpkg.json b/external_imported/vcpkg/ports/expected-lite/vcpkg.json index 3093555aa..faa68b9b0 100644 --- a/external_imported/vcpkg/ports/expected-lite/vcpkg.json +++ b/external_imported/vcpkg/ports/expected-lite/vcpkg.json @@ -1,8 +1,9 @@ { "name": "expected-lite", - "version": "0.5.0", + "version": "0.6.2", "description": "Expected objects in C++11 and later in a single-file header-only library", "homepage": "https://github.com/martinmoene/expected-lite", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/ezfoundation/ezFoundation_vcpkg.patch b/external_imported/vcpkg/ports/ezfoundation/ezFoundation_vcpkg.patch new file mode 100644 index 000000000..f4b40c554 --- /dev/null +++ b/external_imported/vcpkg/ports/ezfoundation/ezFoundation_vcpkg.patch @@ -0,0 +1,185 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a04be90..f853a0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,9 @@ + cmake_minimum_required(VERSION 3.19) + ++if(CMAKE_BUILD_TYPE STREQUAL Release) ++ set(CMAKE_BUILD_TYPE "Shipping" CACHE STRING "Release overridden with Shipping" FORCE) ++endif() ++ + if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + message(FATAL_ERROR "In-source builds are not supported. Please choose a different binary directory.") + return() +diff --git a/Code/Engine/CMakeLists.txt b/Code/Engine/CMakeLists.txt +index fb4bef4..ccda93d 100644 +--- a/Code/Engine/CMakeLists.txt ++++ b/Code/Engine/CMakeLists.txt +@@ -20,5 +20,3 @@ execute_process( + OUTPUT_VARIABLE EZ_GIT_BRANCH_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +- +-configure_file("${CMAKE_CURRENT_LIST_DIR}/ezBuildInfo.h.in" "${CMAKE_CURRENT_LIST_DIR}/ezBuildInfo.h" NEWLINE_STYLE LF) +\ No newline at end of file +diff --git a/Code/Engine/Foundation/Basics/Assert.cpp b/Code/Engine/Foundation/Basics/Assert.cpp +index 7a55afc..778fadd 100644 +--- a/Code/Engine/Foundation/Basics/Assert.cpp ++++ b/Code/Engine/Foundation/Basics/Assert.cpp +@@ -66,16 +66,6 @@ bool ezDefaultAssertHandler(const char* szSourceFile, ezUInt32 uiLine, const cha + + #if EZ_ENABLED(EZ_PLATFORM_WINDOWS) + +- // make sure the cursor is definitely shown, since the user must be able to click buttons +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_UWP) +- // Todo: Use modern Windows API to show cursor in current window. +- // http://stackoverflow.com/questions/37956628/change-mouse-pointer-in-uwp-app +-# else +- ezInt32 iHideCursor = 1; +- while (ShowCursor(true) < 0) +- ++iHideCursor; +-# endif +- + # if EZ_ENABLED(EZ_COMPILE_FOR_DEBUG) + + ezInt32 iRes = _CrtDbgReport(_CRT_ASSERT, szSourceFile, uiLine, nullptr, "'%s'\nFunction: %s\nMessage: %s", szExpression, szFunction, szAssertMsg); +@@ -83,24 +73,9 @@ bool ezDefaultAssertHandler(const char* szSourceFile, ezUInt32 uiLine, const cha + // currently we will ALWAYS trigger the breakpoint / crash (except for when the user presses 'ignore') + if (iRes == 0) + { +- // when the user ignores the assert, restore the cursor show/hide state to the previous count +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_UWP) +- // Todo: Use modern Windows API to restore cursor. +-# else +- for (ezInt32 i = 0; i < iHideCursor; ++i) +- ShowCursor(false); +-# endif +- + return false; + } + +-# else +- +- +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_DESKTOP) +- MessageBoxA(nullptr, szTemp, "Assertion", MB_ICONERROR); +-# endif +- + # endif + + #endif +diff --git a/Code/Engine/Foundation/Logging/Implementation/Log.cpp b/Code/Engine/Foundation/Logging/Implementation/Log.cpp +index 1a0d2ed..afcde54 100644 +--- a/Code/Engine/Foundation/Logging/Implementation/Log.cpp ++++ b/Code/Engine/Foundation/Logging/Implementation/Log.cpp +@@ -260,12 +260,7 @@ void ezLog::OsMessageBox(const ezFormatString& text) + title = ezApplication::GetApplicationInstance()->GetApplicationName(); + } + +-#if EZ_ENABLED(EZ_PLATFORM_WINDOWS_DESKTOP) +- MessageBoxW(nullptr, ezStringWChar(display).GetData(), ezStringWChar(title), MB_OK); +-#else + ezLog::Print(display); +- EZ_ASSERT_NOT_IMPLEMENTED; +-#endif + } + + void ezLog::GenerateFormattedTimestamp(TimestampMode mode, ezStringBuilder& sTimestampOut) +diff --git a/Code/Engine/Foundation/Math/Implementation/Math_inl.h b/Code/Engine/Foundation/Math/Implementation/Math_inl.h +index 1a2962e..9b31f01 100644 +--- a/Code/Engine/Foundation/Math/Implementation/Math_inl.h ++++ b/Code/Engine/Foundation/Math/Implementation/Math_inl.h +@@ -80,6 +80,7 @@ namespace ezMath + #endif + } + ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + EZ_ALWAYS_INLINE ezUInt32 FirstBitLow(ezUInt64 value) + { + EZ_ASSERT_DEBUG(value != 0, "FirstBitLow is undefined for 0"); +@@ -95,6 +96,7 @@ namespace ezMath + return 0; + #endif + } ++#endif + + EZ_ALWAYS_INLINE ezUInt32 FirstBitHigh(ezUInt32 value) + { +@@ -112,6 +114,7 @@ namespace ezMath + #endif + } + ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + EZ_ALWAYS_INLINE ezUInt32 FirstBitHigh(ezUInt64 value) + { + EZ_ASSERT_DEBUG(value != 0, "FirstBitHigh is undefined for 0"); +@@ -127,6 +130,7 @@ namespace ezMath + return 0; + #endif + } ++#endif + + EZ_ALWAYS_INLINE ezUInt32 CountTrailingZeros(ezUInt32 bitmask) { return (bitmask == 0) ? 32 : FirstBitLow(bitmask); } + +diff --git a/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h b/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h +index fb839b3..21e2ec1 100644 +--- a/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h ++++ b/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h +@@ -60,7 +60,11 @@ namespace ezInternal + template + EZ_FORCE_INLINE T* CreateRawBuffer(ezAllocatorBase* pAllocator, size_t uiCount) + { ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + ezUInt64 safeAllocationSize = ezMath::SafeMultiply64(uiCount, sizeof(T)); ++#else ++ ezUInt32 safeAllocationSize = ezMath::SafeMultiply32(uiCount, sizeof(T)); ++#endif + return static_cast(pAllocator->Allocate(safeAllocationSize, EZ_ALIGNMENT_OF(T))); + } + +diff --git a/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h b/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h +index 54939fb..15f928a 100644 +--- a/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h ++++ b/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h +@@ -229,11 +229,23 @@ ezUInt32 ezStackTracer::GetStackTrace(ezArrayPtr& trace, void* pContext) + frame.AddrFrame.Offset = context.Rbp; + frame.AddrStack.Offset = context.Rsp; + machine_type = IMAGE_FILE_MACHINE_AMD64; +-#else ++#elif defined(_M_IX86) + frame.AddrPC.Offset = context.Eip; + frame.AddrFrame.Offset = context.Ebp; + frame.AddrStack.Offset = context.Esp; + machine_type = IMAGE_FILE_MACHINE_I386; ++#elif defined(_M_ARM64) ++ frame.AddrPC.Offset = context.Pc; ++ frame.AddrFrame.Offset = context.Fp; ++ frame.AddrStack.Offset = context.Sp; ++ machine_type = IMAGE_FILE_MACHINE_ARM64; ++#elif defined(_M_ARM) ++ frame.AddrPC.Offset = context.Pc; ++ frame.AddrFrame.Offset = context.R11; ++ frame.AddrStack.Offset = context.Sp; ++ machine_type = IMAGE_FILE_MACHINE_ARM; ++#else ++ #error Unknown architecture + #endif + for (ezInt32 i = 0; i < (ezInt32)trace.GetCount(); i++) + { +diff --git b/Code/Engine/ezBuildInfo.h b/Code/Engine/ezBuildInfo.h +new file mode 100644 +index 0000000..763271c +--- /dev/null ++++ b/Code/Engine/ezBuildInfo.h +@@ -0,0 +1,10 @@ ++// ++// This file is auto-generated by CMake. ++// ++ ++#pragma once ++ ++#define EZ_GIT_COMMIT_HASH_SHORT ++#define EZ_GIT_COMMIT_HASH_LONG ++#define EZ_GIT_BRANCH_NAME "" ++ diff --git a/external_imported/vcpkg/ports/ezfoundation/portfile.cmake b/external_imported/vcpkg/ports/ezfoundation/portfile.cmake new file mode 100644 index 000000000..c93b4389a --- /dev/null +++ b/external_imported/vcpkg/ports/ezfoundation/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ezEngine/ezEngine + REF 1448308ab99bae0d8d2a292ad345ff3a757f3124 #21.10 + SHA512 20da87772366d1612795f534b31600123c0d04beba252d27d895c3c3cff7dae65952bd890629d79a7a691c2f3444601552c4b4eca99e8f8a99dc935ce2ebd284 + PATCHES + ezFoundation_vcpkg.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DEZ_3RDPARTY_ENET_SUPPORT=OFF + -DEZ_3RDPARTY_ZSTD_SUPPORT=OFF + -DEZ_3RDPARTY_ZLIB_SUPPORT=OFF + -DEZ_BUILD_FILTER=FoundationOnly + -DEZ_BUILD_UNITTESTS=OFF + -DEZ_ENABLE_FOLDER_UNITY_FILES=OFF + -DEZ_ENABLE_QT_SUPPORT=OFF + -DEZ_USE_PCH=OFF + OPTIONS_DEBUG + -DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib + -DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Bin + OPTIONS_RELEASE + -DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib + -DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Bin +) + +vcpkg_cmake_build(TARGET Foundation) + +# EzEngine does not support CMake-based install; copy headers and libraries manually. +file(GLOB_RECURSE FOUNDATION_INCLUDE_FILES RELATIVE "${SOURCE_PATH}/Code/Engine/Foundation" "${SOURCE_PATH}/Code/Engine/Foundation/*.h") +foreach(SOURCE_FILE ${FOUNDATION_INCLUDE_FILES}) + get_filename_component(SOURCE_FILE_DIR "${SOURCE_FILE}" DIRECTORY) + if(SOURCE_FILE_DIR STREQUAL "") + set(TARGET_DIR "${CURRENT_PACKAGES_DIR}/include/Foundation") + else() + set(TARGET_DIR "${CURRENT_PACKAGES_DIR}/include/Foundation/${SOURCE_FILE_DIR}") + endif() + file(COPY "${SOURCE_PATH}/Code/Engine/Foundation/${SOURCE_FILE}" DESTINATION "${TARGET_DIR}") +endforeach() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + set(LIB_SOURCE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib") + set(LIB_TARGET_DIR "${CURRENT_PACKAGES_DIR}/debug/lib") + file(GLOB_RECURSE LIB_FILES "${LIB_SOURCE_DIR}/*.lib") + foreach(LIB_FILE ${LIB_FILES}) + file(COPY "${LIB_FILE}" DESTINATION "${LIB_TARGET_DIR}") + endforeach() +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + set(LIB_SOURCE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib") + set(LIB_TARGET_DIR "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB_RECURSE LIB_FILES "${LIB_SOURCE_DIR}/*.lib") + foreach(LIB_FILE ${LIB_FILES}) + file(COPY "${LIB_FILE}" DESTINATION "${LIB_TARGET_DIR}") + endforeach() +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/ezfoundation/vcpkg.json b/external_imported/vcpkg/ports/ezfoundation/vcpkg.json new file mode 100644 index 000000000..6b60fd29d --- /dev/null +++ b/external_imported/vcpkg/ports/ezfoundation/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ezfoundation", + "version": "21.10", + "description": "Foundation library out of ezEngine", + "homepage": "https://ezengine.net/", + "license": "MIT", + "supports": "windows | uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/fakeit/portfile.cmake b/external_imported/vcpkg/ports/fakeit/portfile.cmake index 6b02ad63d..cf6b57655 100644 --- a/external_imported/vcpkg/ports/fakeit/portfile.cmake +++ b/external_imported/vcpkg/ports/fakeit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt - REF 98979d2784d270514c3d4cde18d4370d1381d866 #v2.1.0 - SHA512 f824d9f2171b2453b43a19ebaf203527ca2e943af9cf5caef435c31dcb3af74ccc9ea6e09cd14875652b887d68e9d1a006cd9543c099b4606e68eeae1ce042f7 + REF 78ca536e6b32f11e2883d474719a447915e40005 #v2.3.0 + SHA512 b3a76d278217d177e2222d6e4c782c8ee08a7b6244e5f89fd25b22faffc8f0cf402c1d04763fb6f6ef37272738adf5dd7ff7a0437c1bc9a5043765058fa2a648 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/fakeit/vcpkg.json b/external_imported/vcpkg/ports/fakeit/vcpkg.json index 2f3dfbc5f..6650ba760 100644 --- a/external_imported/vcpkg/ports/fakeit/vcpkg.json +++ b/external_imported/vcpkg/ports/fakeit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fakeit", - "version": "2.1.0", + "version": "2.3.0", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt", "license": "MIT" diff --git a/external_imported/vcpkg/ports/fann/portfile.cmake b/external_imported/vcpkg/ports/fann/portfile.cmake index 716bf3e8b..b74433baf 100644 --- a/external_imported/vcpkg/ports/fann/portfile.cmake +++ b/external_imported/vcpkg/ports/fann/portfile.cmake @@ -1,6 +1,3 @@ -# Official design -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libfann/fann @@ -12,12 +9,11 @@ vcpkg_from_github( fix-uwp-build.patch ) -set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug) -set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR}) +set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") +set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin @@ -50,12 +46,16 @@ vcpkg_configure_cmake( -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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() -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/fann/vcpkg.json b/external_imported/vcpkg/ports/fann/vcpkg.json index c4bc01717..03f16620c 100644 --- a/external_imported/vcpkg/ports/fann/vcpkg.json +++ b/external_imported/vcpkg/ports/fann/vcpkg.json @@ -1,7 +1,14 @@ { "name": "fann", "version": "2.2.0", - "port-version": 2, + "port-version": 3, "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", - "homepage": "https://github.com/libfann/fann" + "homepage": "https://github.com/libfann/fann", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/fast-float/portfile.cmake b/external_imported/vcpkg/ports/fast-float/portfile.cmake index 267abb3a2..347854034 100644 --- a/external_imported/vcpkg/ports/fast-float/portfile.cmake +++ b/external_imported/vcpkg/ports/fast-float/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float - REF v3.2.0 - SHA512 8c0819501f854688942bf2676a9592c537b14b472a942695d589a75499f43bef57a8cb98b41b285dcfc0122f804c85e477d5aee82750a69308bdbf16c98ce2a7 + REF v3.5.1 + SHA512 82f9a020167b3ba4e4583709164b4b28c2fabc7eb99a337f9cef7061eaa7479a51367420aeeb6578341038afe77f5656e8351518f062a04b02a08c2eacda7b46 HEAD_REF master ) @@ -12,7 +12,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/FastFloat) +vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/cmake/FastFloat) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/fast-float/vcpkg.json b/external_imported/vcpkg/ports/fast-float/vcpkg.json index b2155a266..5c7cd19b7 100644 --- a/external_imported/vcpkg/ports/fast-float/vcpkg.json +++ b/external_imported/vcpkg/ports/fast-float/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fast-float", - "version": "3.2.0", + "version": "3.5.1", "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/fastcgi/dll.patch b/external_imported/vcpkg/ports/fastcgi/dll.patch new file mode 100644 index 000000000..14e94faef --- /dev/null +++ b/external_imported/vcpkg/ports/fastcgi/dll.patch @@ -0,0 +1,109 @@ +diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h +index 6d242f36f..ec57131ce 100644 +--- a/include/fcgi_stdio.h ++++ b/include/fcgi_stdio.h +@@ -23,14 +23,6 @@ + extern "C" { + #endif + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + /* + * Wrapper type for FILE + */ +diff --git a/include/fcgiapp.h b/include/fcgiapp.h +index 8cadde16d..9b034def3 100644 +--- a/include/fcgiapp.h ++++ b/include/fcgiapp.h +@@ -23,11 +23,19 @@ + #endif + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + #if defined (c_plusplus) || defined (__cplusplus) +diff --git a/include/fcgio.h b/include/fcgio.h +index ce8b930a8..81981974a 100644 +--- a/include/fcgio.h ++++ b/include/fcgio.h +@@ -34,14 +34,6 @@ + + #include "fcgiapp.h" + +-#ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif +-#endif +- + #if ! HAVE_STREAMBUF_CHAR_TYPE + typedef char char_type; + #endif +diff --git a/include/fcgios.h b/include/fcgios.h +index 206973137..7a2f5333a 100644 +--- a/include/fcgios.h ++++ b/include/fcgios.h +@@ -50,11 +50,19 @@ extern "C" { + #endif /* !_WIN32 */ + + #ifndef DLLAPI +-#if defined (_WIN32) && defined (_MSC_VER) +-#define DLLAPI __declspec(dllimport) +-#else +-#define DLLAPI +-#endif ++# if defined (_WIN32) && defined (_MSC_VER) ++# if defined(DLL_EXPORT) && defined(LIBFCGI_BUILD) ++# define DLLAPI __declspec(dllexport) ++# else ++# ifdef LIBFCGI_DLL_IMPORT ++# define DLLAPI extern __declspec(dllimport) ++# else ++# define DLLAPI ++# endif ++# endif ++# else ++# define DLLAPI ++# endif + #endif + + +diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am +index 42d507253..26f06f550 100644 +--- a/libfcgi/Makefile.am ++++ b/libfcgi/Makefile.am +@@ -1,7 +1,7 @@ + # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ + + INCLUDEDIR = ../include +-AM_CPPFLAGS = -I$(top_srcdir)/include -W -Wall -pedantic -Wno-unused-parameter ++AM_CPPFLAGS = -I$(top_srcdir)/include -DLIBFCGI_BUILD + + INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ + $(INCLUDEDIR)/fcgiapp.h \ diff --git a/external_imported/vcpkg/ports/fastcgi/portfile.cmake b/external_imported/vcpkg/ports/fastcgi/portfile.cmake index 27b8c85cc..56fa6f863 100644 --- a/external_imported/vcpkg/ports/fastcgi/portfile.cmake +++ b/external_imported/vcpkg/ports/fastcgi/portfile.cmake @@ -4,70 +4,44 @@ vcpkg_from_github( REF fc8c6547ae38faf9926205a23075c47fbd4370c8 SHA512 7f27b1060fbeaf0de9b8a43aa4ff954a004c49e99f7d6ea11119a438fcffe575fb469ba06262e71ac8132f92e74189e2097fd049595a6a61d4d5a5bac2733f7a HEAD_REF master + PATCHES + dll.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - # Check build system first - find_program(NMAKE nmake REQUIRED) - - list(APPEND NMAKE_OPTIONS_REL - CFG=release - ) - - list(APPEND NMAKE_OPTIONS_DBG - CFG=debug - ) +# Check build system first +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n\nIt can be installed with brew install gettext automake libtool") +elseif(NOT VCPKG_TARGET_IS_WINDOWS) + message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") +endif() - file(RENAME "${SOURCE_PATH}/include/fcgi_config_x86.h" "${SOURCE_PATH}/include/fcgi_config.h") - vcpkg_build_nmake( +vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH libfcgi - PROJECT_NAME libfcgi.mak - OPTIONS_RELEASE - "${NMAKE_OPTIONS_REL}" - OPTIONS_DEBUG - "${NMAKE_OPTIONS_DBG}" - ) - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ${PORT}) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - endif() - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - endif() -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX - # Check build system first - if(VCPKG_TARGET_IS_OSX) - message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n\nIt can be installed with brew install gettext automake libtool") - else() - message("${PORT} currently requires the following library from the system package manager:\n gettext\n automake\n libtool\n libtool-bin\n\nIt can be installed with apt-get install gettext automake libtool libtool-bin") - endif() + AUTOCONFIG + COPY_SOURCE + OPTIONS + --disable-examples +) - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE - ) +vcpkg_install_make() - vcpkg_install_make() +# switch ${PORT} into /${PORT} +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") - # switch ${PORT} into /${PORT} - file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") - file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/include/fastcgi\"\n") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fcgi.pc" "Version: 2.4.2\n" "Version: 2.4.2\nCflags: -I\"\${prefix}/../include/fastcgi\"\n") +endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - vcpkg_fixup_pkgconfig() -else() # Other build system - message(FATAL_ERROR "fastcgi only supports Windows, Linux, and MacOS.") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgiapp.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/fcgios.h" "ifdef LIBFCGI_DLL_IMPORT" "if 1") endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.TERMS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/fastcgi/vcpkg.json b/external_imported/vcpkg/ports/fastcgi/vcpkg.json index 035242158..a85856361 100644 --- a/external_imported/vcpkg/ports/fastcgi/vcpkg.json +++ b/external_imported/vcpkg/ports/fastcgi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fastcgi", "version-date": "2020-09-11", - "port-version": 4, + "port-version": 5, "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", "homepage": "https://fastcgi-archives.github.io/", - "license": "OML" + "license": "OML", + "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/fastrtps/disable-symlink.patch b/external_imported/vcpkg/ports/fastrtps/disable-symlink.patch index a35558a19..d9584c81e 100644 --- a/external_imported/vcpkg/ports/fastrtps/disable-symlink.patch +++ b/external_imported/vcpkg/ports/fastrtps/disable-symlink.patch @@ -5,12 +5,12 @@ we force the build script to create a batch file in any case. diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt --- a/tools/fds/CMakeLists.txt +++ b/tools/fds/CMakeLists.txt -@@ -124,7 +124,7 @@ if(NOT BUILD_SHARED_LIBS) - if( WIN32 ) - # Use powershell to generate the link - install( -- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" -+ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" - COMPONENT discovery) - else() - # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix +@@ -116,7 +116,7 @@ # - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations) + if( WIN32 ) + # Use powershell to generate the link + install( +- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" ++ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" + COMPONENT discovery) + else() + # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix diff --git a/external_imported/vcpkg/ports/fastrtps/portfile.cmake b/external_imported/vcpkg/ports/fastrtps/portfile.cmake index 48342bd53..4bcf76b0e 100644 --- a/external_imported/vcpkg/ports/fastrtps/portfile.cmake +++ b/external_imported/vcpkg/ports/fastrtps/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-DDS - REF v2.4.0 - SHA512 2E9C0378AF86DD657391D577F6951096DD45970A2C4D9C384EE5A452A1DD129E6E0AED91E0B908A35A04CAF979253700560561D34082DA81FE737FE104C149AF + REF v2.7.0 + SHA512 289c94fb177209ffc80e93ae61822c83e7cb74ba7682f05a921c50ce048498bd811c19825d1fdb8af39b29a64904e96d87c5c59468139f0d8bb528549b80c94a HEAD_REF master PATCHES fix-find-package-asio.patch @@ -58,12 +58,15 @@ elseif(VCPKG_TARGET_IS_LINUX) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fastdds/discovery/parser.py" "tool_path / '../../../bin'" "tool_path / '../../${PORT}'") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${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/tools") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/fastrtps/vcpkg.json b/external_imported/vcpkg/ports/fastrtps/vcpkg.json index 6c846645c..117a007c8 100644 --- a/external_imported/vcpkg/ports/fastrtps/vcpkg.json +++ b/external_imported/vcpkg/ports/fastrtps/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fastrtps", - "version": "2.4.0", + "version": "2.7.0", "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", "dependencies": [ "asio", "fastcdr", diff --git a/external_imported/vcpkg/ports/fawdlstty-libfv/portfile.cmake b/external_imported/vcpkg/ports/fawdlstty-libfv/portfile.cmake new file mode 100644 index 000000000..f5eed2bd2 --- /dev/null +++ b/external_imported/vcpkg/ports/fawdlstty-libfv/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO fawdlstty/libfv + REF v0.0.8 + SHA512 66071db541269de9793c643fba6154d1743b047ac32486067207c88d61b706e81266ce365a5c96c203a1cea0ec4e406927d8a8df1e047bb8b9218cf741dae4f1 + HEAD_REF master +) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/fawdlstty-libfv/fawdlstty-libfv-config.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +find_dependency(ZLIB) +if(NOT TARGET fawdlstty-libfv::libfv) + add_library(fawdlstty-libfv::libfv INTERFACE IMPORTED) + target_include_directories(fawdlstty-libfv::libfv INTERFACE \"\${CMAKE_CURRENT_LIST_DIR}/../../include\") + target_link_libraries(fawdlstty-libfv::libfv INTERFACE ZLIB::ZLIB OpenSSL::SSL) +endif() +") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") diff --git a/external_imported/vcpkg/ports/fawdlstty-libfv/vcpkg.json b/external_imported/vcpkg/ports/fawdlstty-libfv/vcpkg.json new file mode 100644 index 000000000..c3c8f00a5 --- /dev/null +++ b/external_imported/vcpkg/ports/fawdlstty-libfv/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "fawdlstty-libfv", + "version": "0.0.8", + "description": "libfv is C++20 header-only network library, support TCP/SSL/Http/websocket server and client", + "homepage": "https://github.com/fawdlstty/libfv", + "license": "MIT", + "dependencies": [ + "asio", + "fmt", + "gzip-hpp", + "nlohmann-json", + "openssl", + "zlib" + ] +} diff --git a/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch b/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch new file mode 100644 index 000000000..f189e8777 --- /dev/null +++ b/external_imported/vcpkg/ports/fbthrift/0001-fix-compatibility-with-boost-1.79.0.patch @@ -0,0 +1,60 @@ +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/external_imported/vcpkg/ports/fbthrift/fix-glog.patch b/external_imported/vcpkg/ports/fbthrift/fix-glog.patch new file mode 100644 index 000000000..6429171b4 --- /dev/null +++ b/external_imported/vcpkg/ports/fbthrift/fix-glog.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b248a0..beae7d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,7 +101,8 @@ endif () + # Find required dependencies for thrift/lib + if(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) diff --git a/external_imported/vcpkg/ports/fbthrift/portfile.cmake b/external_imported/vcpkg/ports/fbthrift/portfile.cmake index 3cafd5feb..2781261bb 100644 --- a/external_imported/vcpkg/ports/fbthrift/portfile.cmake +++ b/external_imported/vcpkg/ports/fbthrift/portfile.cmake @@ -7,6 +7,9 @@ vcpkg_from_github( REF v2022.03.21.00 SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab HEAD_REF master + PATCHES + 0001-fix-compatibility-with-boost-1.79.0.patch + fix-glog.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/fbthrift/vcpkg.json b/external_imported/vcpkg/ports/fbthrift/vcpkg.json index 8e9552787..c491882e6 100644 --- a/external_imported/vcpkg/ports/fbthrift/vcpkg.json +++ b/external_imported/vcpkg/ports/fbthrift/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fbthrift", "version-string": "2022.03.21.00", + "port-version": 2, "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/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch b/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch index 513dc966b..6f921960a 100644 --- a/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch +++ b/external_imported/vcpkg/ports/ffmpeg/0004-fix-debug-build.patch @@ -31,7 +31,7 @@ index bd2de34..fba948a 100755 require libsmbclient libsmbclient.h smbc_init -lsmbclient; } -enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +if enabled debug_configure; then -+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappyd -lstdc++ ++ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +else + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +fi diff --git a/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch b/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch new file mode 100644 index 000000000..6019b0664 --- /dev/null +++ b/external_imported/vcpkg/ports/ffmpeg/0020-fix-aarch64-libswscale.patch @@ -0,0 +1,28 @@ +diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S +index af677afe6..f4b220fb6 100644 +--- a/libswscale/aarch64/yuv2rgb_neon.S ++++ b/libswscale/aarch64/yuv2rgb_neon.S +@@ -169,19 +169,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 + sqdmulh v26.8H, v26.8H, v0.8H // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15 + sqdmulh v27.8H, v27.8H, v0.8H // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15 + +-.ifc \ofmt,argb // 1 2 3 0 ++.ifc \ofmt,argb + compute_rgba v5.8B,v6.8B,v7.8B,v4.8B, v17.8B,v18.8B,v19.8B,v16.8B + .endif + +-.ifc \ofmt,rgba // 0 1 2 3 ++.ifc \ofmt,rgba + compute_rgba v4.8B,v5.8B,v6.8B,v7.8B, v16.8B,v17.8B,v18.8B,v19.8B + .endif + +-.ifc \ofmt,abgr // 3 2 1 0 ++.ifc \ofmt,abgr + compute_rgba v7.8B,v6.8B,v5.8B,v4.8B, v19.8B,v18.8B,v17.8B,v16.8B + .endif + +-.ifc \ofmt,bgra // 2 1 0 3 ++.ifc \ofmt,bgra + compute_rgba v6.8B,v5.8B,v4.8B,v7.8B, v18.8B,v17.8B,v16.8B,v19.8B + .endif + diff --git a/external_imported/vcpkg/ports/ffmpeg/0021-fix-sdl2-version-check.patch b/external_imported/vcpkg/ports/ffmpeg/0021-fix-sdl2-version-check.patch new file mode 100644 index 000000000..c26a155c6 --- /dev/null +++ b/external_imported/vcpkg/ports/ffmpeg/0021-fix-sdl2-version-check.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 2829d79..697a504 100755 +--- a/configure ++++ b/configure +@@ -6589,7 +6589,7 @@ fi + + if enabled sdl2; then + SDL2_CONFIG="${cross_prefix}sdl2-config" +- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent ++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent + if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs) diff --git a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake index 76cc00805..1ab26da6d 100644 --- a/external_imported/vcpkg/ports/ffmpeg/portfile.cmake +++ b/external_imported/vcpkg/ports/ffmpeg/portfile.cmake @@ -24,6 +24,8 @@ vcpkg_from_github( ${PATCHES} 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch + 0020-fix-aarch64-libswscale.patch + 0021-fix-sdl2-version-check.patch ) if (SOURCE_PATH MATCHES " ") @@ -96,6 +98,8 @@ if(VCPKG_TARGET_IS_MINGW) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") string(APPEND OPTIONS " --target-os=mingw64") endif() +elseif(VCPKG_TARGET_IS_LINUX) + string(APPEND OPTIONS " --target-os=linux") elseif(VCPKG_TARGET_IS_WINDOWS) string(APPEND OPTIONS " --target-os=win32") elseif(VCPKG_TARGET_IS_OSX) @@ -458,6 +462,11 @@ endif() set(OPTIONS_CROSS " --enable-cross-compile") +# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling. +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$") + string(APPEND OPTIONS_CROSS " --cross-prefix=${CMAKE_MATCH_1}") +endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") string(APPEND OPTIONS_CROSS " --arch=x86_64") else() diff --git a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json index be2c4993a..a464fa5b0 100644 --- a/external_imported/vcpkg/ports/ffmpeg/vcpkg.json +++ b/external_imported/vcpkg/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 12, + "port-version": 18, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -10,7 +10,7 @@ "license": null, "dependencies": [ { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-get-vars", "host": true }, { diff --git a/external_imported/vcpkg/ports/fftw3/bigobj.patch b/external_imported/vcpkg/ports/fftw3/bigobj.patch new file mode 100644 index 000000000..1ca386588 --- /dev/null +++ b/external_imported/vcpkg/ports/fftw3/bigobj.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64db20b6a..ce438a379 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,7 +315,7 @@ endif () + add_library (${fftw3_lib} ${SOURCEFILES}) + target_include_directories (${fftw3_lib} INTERFACE $) + if (MSVC AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Intel")) +- target_compile_definitions (${fftw3_lib} PRIVATE /bigobj) ++ target_compile_options (${fftw3_lib} PRIVATE "/bigobj") + endif () + if (HAVE_SSE) + target_compile_options (${fftw3_lib} PRIVATE ${SSE_FLAG}) diff --git a/external_imported/vcpkg/ports/fftw3/portfile.cmake b/external_imported/vcpkg/ports/fftw3/portfile.cmake index 7d3c75f19..e6a50f1d3 100644 --- a/external_imported/vcpkg/ports/fftw3/portfile.cmake +++ b/external_imported/vcpkg/ports/fftw3/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( patch_targets.patch fftw3_arch_fix.patch aligned_malloc.patch + bigobj.patch ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/fftw3/vcpkg.json b/external_imported/vcpkg/ports/fftw3/vcpkg.json index 99fe9ed09..a119ec907 100644 --- a/external_imported/vcpkg/ports/fftw3/vcpkg.json +++ b/external_imported/vcpkg/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 3, + "port-version": 4, "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/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/fixed-string/portfile.cmake b/external_imported/vcpkg/ports/fixed-string/portfile.cmake index 760d2d0a6..5442bfeaa 100644 --- a/external_imported/vcpkg/ports/fixed-string/portfile.cmake +++ b/external_imported/vcpkg/ports/fixed-string/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unterumarmung/fixed_string - REF v0.1.0 - SHA512 759c228e3bc4bc06d58b59bc19756ceb27a6f6104cb0c58288bf3156ca0958e6099741870fa09ba88a5572d17988529992cc5198faab30847118665e626c2ea4 + REF v0.1.1 + SHA512 8367f7cf898dd88918913f6e788cc5841eab7cd56d61f3ea21636bf3253f450d5dd6207a259d4c5980d863c2ce55fba35e3e8944341f56dbfd56faa29c39746e HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFIXED_STRING_OPT_BUILD_EXAMPLES=OFF -DFIXED_STRING_OPT_BUILD_TESTS=OFF -DFIXED_STRING_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fixed_string TARGET_PATH share/fixed_string) +vcpkg_cmake_config_fixup(PACKAGE_NAME fixed_string CONFIG_PATH lib/cmake/fixed_string) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # 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/external_imported/vcpkg/ports/fixed-string/vcpkg.json b/external_imported/vcpkg/ports/fixed-string/vcpkg.json index b7ed3e4d7..cbb1a272a 100644 --- a/external_imported/vcpkg/ports/fixed-string/vcpkg.json +++ b/external_imported/vcpkg/ports/fixed-string/vcpkg.json @@ -1,7 +1,17 @@ { "name": "fixed-string", - "version-string": "0.1.0", - "port-version": 1, + "version": "0.1.1", "description": "Header-only C++17 library provides a string class with std::array fixed-size semantic.", - "homepage": "https://github.com/unterumarmung/fixed_string" + "homepage": "https://github.com/unterumarmung/fixed_string", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/flann/portfile.cmake b/external_imported/vcpkg/ports/flann/portfile.cmake index ce9bb2d3b..78d4d2769 100644 --- a/external_imported/vcpkg/ports/flann/portfile.cmake +++ b/external_imported/vcpkg/ports/flann/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_cmake_configure( -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + -DUSE_OPENMP=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) diff --git a/external_imported/vcpkg/ports/flann/vcpkg.json b/external_imported/vcpkg/ports/flann/vcpkg.json index 782fb321b..ed0622359 100644 --- a/external_imported/vcpkg/ports/flann/vcpkg.json +++ b/external_imported/vcpkg/ports/flann/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 5, + "port-version": 6, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json b/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json index 98a934d24..03ef5e957 100644 --- a/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json +++ b/external_imported/vcpkg/ports/flashlight-cpu/vcpkg.json @@ -1,9 +1,10 @@ { "name": "flashlight-cpu", "version": "0.3", - "port-version": 2, + "port-version": 3, "description": "A C++ standalone library for machine learning. CPU backend.", "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", "supports": "!(windows | osx)", "default-features": [ "fl" @@ -20,7 +21,13 @@ ] }, "gflags", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "fl": { diff --git a/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json b/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json index c0e0a026f..0f0afd075 100644 --- a/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json +++ b/external_imported/vcpkg/ports/flashlight-cuda/vcpkg.json @@ -1,9 +1,10 @@ { "name": "flashlight-cuda", "version": "0.3", - "port-version": 2, + "port-version": 4, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", + "license": "MIT", "supports": "!(windows | osx)", "default-features": [ "fl" @@ -20,7 +21,13 @@ ] }, "gflags", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "fl": { diff --git a/external_imported/vcpkg/ports/flat/portfile.cmake b/external_imported/vcpkg/ports/flat/portfile.cmake new file mode 100644 index 000000000..3cc80336b --- /dev/null +++ b/external_imported/vcpkg/ports/flat/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pubby/flat + REF 7ddca21388ad45d5b830d836b256d47d1289315f + SHA512 eecb9683c681e46e166140c491536f87ec78c6ed456ad0295f2b53631c377c6356fea6bb8a2d17ca27457807a03f9e188bf27b3ff489d78624ab997957279cf3 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/ + DESTINATION ${CURRENT_PACKAGES_DIR}/include/flat + FILES_MATCHING PATTERN "*.hpp") + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/flat + RENAME copyright) diff --git a/external_imported/vcpkg/ports/flat/vcpkg.json b/external_imported/vcpkg/ports/flat/vcpkg.json new file mode 100644 index 000000000..87ac782b5 --- /dev/null +++ b/external_imported/vcpkg/ports/flat/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "flat", + "version-date": "2022-08-30", + "description": "Flat Containers Library", + "homepage": "https://github.com/pubby/flat", + "license": "BSL-1.0" +} diff --git a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake index 5b879ad03..ce824f022 100644 --- a/external_imported/vcpkg/ports/flatbuffers/portfile.cmake +++ b/external_imported/vcpkg/ports/flatbuffers/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers - REF v2.0.0 - SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89 + REF v2.0.6 + SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6 HEAD_REF master PATCHES ignore_use_of_cmake_toolchain_file.patch diff --git a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json index 8eceb524c..5a5545748 100644 --- a/external_imported/vcpkg/ports/flatbuffers/vcpkg.json +++ b/external_imported/vcpkg/ports/flatbuffers/vcpkg.json @@ -1,12 +1,12 @@ { "name": "flatbuffers", - "version": "2.0.0", - "port-version": 3, + "version": "2.0.6", "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." ], "homepage": "https://google.github.io/flatbuffers/", + "license": "Apache-2.0", "dependencies": [ { "name": "flatbuffers", diff --git a/external_imported/vcpkg/ports/flecs/portfile.cmake b/external_imported/vcpkg/ports/flecs/portfile.cmake new file mode 100644 index 000000000..334b359d8 --- /dev/null +++ b/external_imported/vcpkg/ports/flecs/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SanderMertens/flecs + REF v2.4.8 + SHA512 4d4ee41a457f6e13b5913bbc12f66dc9a3bcab3f39ad398da55892bb80649cf416d82255f17bbcef4fee11992028cbb2972d0e9e435435cb58a7b33ec2ebe526 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLECS_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLECS_STATIC_LIBS=${FLECS_STATIC_LIBS} + -DFLECS_SHARED_LIBS=${FLECS_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(FLECS_STATIC_LIBS) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/${PORT}/bake_config.h" + "#ifndef flecs_STATIC" + "#if 0 // #ifndef flecs_STATIC" + ) +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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..194a66af4 --- /dev/null +++ b/external_imported/vcpkg/ports/flecs/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS}) + +if(TARGET flecs::flecs AND NOT TARGET flecs::flecs_static) + add_library(flecs::flecs_static INTERFACE IMPORTED) + set_target_properties(flecs::flecs_static PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs) +elseif(TARGET flecs::flecs_static AND NOT TARGET flecs::flecs) + add_library(flecs::flecs INTERFACE IMPORTED) + set_target_properties(flecs::flecs PROPERTIES INTERFACE_LINK_LIBRARIES flecs::flecs_static) +endif() diff --git a/external_imported/vcpkg/ports/flecs/vcpkg.json b/external_imported/vcpkg/ports/flecs/vcpkg.json new file mode 100644 index 000000000..1a4caa150 --- /dev/null +++ b/external_imported/vcpkg/ports/flecs/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "flecs", + "version": "2.4.8", + "description": "A fast entity component system (ECS) for C & C++", + "homepage": "https://github.com/SanderMertens/flecs", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/fltk/portfile.cmake b/external_imported/vcpkg/ports/fltk/portfile.cmake index c92446529..d43a8fcb5 100644 --- a/external_imported/vcpkg/ports/fltk/portfile.cmake +++ b/external_imported/vcpkg/ports/fltk/portfile.cmake @@ -19,6 +19,11 @@ else() set(OPTION_USE_GL "-DOPTION_USE_GL=ON") endif() +set(fluid_path_param "") +if(VCPKG_CROSSCOMPILING) + set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -30,6 +35,7 @@ vcpkg_cmake_configure( -DOPTION_USE_SYSTEM_LIBJPEG=ON -DOPTION_BUILD_SHARED_LIBS=OFF -DFLTK_CONFIG_PATH=share/fltk + ${fluid_path_param} ${OPTION_USE_GL} ) @@ -39,7 +45,12 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -if(VCPKG_TARGET_IS_OSX) +# don't install fluid +if(VCPKG_CROSSCOMPILING) + if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN) + endif() +elseif(VCPKG_TARGET_IS_OSX) vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN) elseif(VCPKG_TARGET_IS_WINDOWS) file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config") diff --git a/external_imported/vcpkg/ports/fltk/vcpkg.json b/external_imported/vcpkg/ports/fltk/vcpkg.json index cdcd1134a..ada834120 100644 --- a/external_imported/vcpkg/ports/fltk/vcpkg.json +++ b/external_imported/vcpkg/ports/fltk/vcpkg.json @@ -1,11 +1,15 @@ { "name": "fltk", "version": "1.3.8", - "port-version": 1, + "port-version": 2, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "supports": "!uwp", "dependencies": [ + { + "name": "fltk", + "host": true + }, "libjpeg-turbo", "libpng", { diff --git a/external_imported/vcpkg/ports/fluidsynth/fix-dependencies.patch b/external_imported/vcpkg/ports/fluidsynth/fix-dependencies.patch index fd2e94824..583045c28 100644 --- a/external_imported/vcpkg/ports/fluidsynth/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/fluidsynth/fix-dependencies.patch @@ -9,7 +9,15 @@ index e4ea71c..df37028 100644 - pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) + pkg_check_modules ( GLIB IMPORTED_TARGET REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) list( APPEND PC_REQUIRES_PRIV "glib-2.0" "gthread-2.0") -+ set(GLIB_LIBRARIES PkgConfig::GLIB) ++ set(GLIB_LIBRARIES PkgConfig::GLIB) # To carry libs with absolute paths, https://gitlab.kitware.com/cmake/cmake/-/issues/16154 if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" ) message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" ) +@@ -865,6 +866,7 @@ endif () + if ( CMAKE_VERSION VERSION_EQUAL "3.12.0" OR CMAKE_VERSION VERSION_GREATER "3.12.0" ) + # retrieve all the private libs we depend on + get_target_property ( LIBS_PRIVATE libfluidsynth INTERFACE_LINK_LIBRARIES) ++ list(FILTER LIBS_PRIVATE EXCLUDE REGEX "^PkgConfig::") # already in 'Requires.private' + # make a copy + set ( LIBS_PRIVATE_WITH_PATH ${LIBS_PRIVATE} ) + diff --git a/external_imported/vcpkg/ports/fluidsynth/separate-gentables.patch b/external_imported/vcpkg/ports/fluidsynth/gentables.patch similarity index 55% rename from external_imported/vcpkg/ports/fluidsynth/separate-gentables.patch rename to external_imported/vcpkg/ports/fluidsynth/gentables.patch index 3c018110a..a7adc2ec7 100644 --- a/external_imported/vcpkg/ports/fluidsynth/separate-gentables.patch +++ b/external_imported/vcpkg/ports/fluidsynth/gentables.patch @@ -1,43 +1,51 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e913cb2..570207e 100644 +index 2803ca8..49f3505 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -268,6 +268,9 @@ generate_product_version( - ) - endif ( WIN32 ) - -+find_program(GENTABLES make_tables REQUIRED) -+execute_process(COMMAND ${GENTABLES} "${CMAKE_BINARY_DIR}/") -+ - add_library ( libfluidsynth-OBJ OBJECT - ${config_SOURCES} - ${fluid_alsa_SOURCES} -@@ -413,6 +416,7 @@ else ( MACOSX_FRAMEWORK ) +@@ -419,6 +419,10 @@ else ( MACOSX_FRAMEWORK ) install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) endif ( MACOSX_FRAMEWORK ) -+if (0) ++option(VCPKG_BUILD_MAKE_TABLES "Build `make_tables`" OFF) ++if(VCPKG_BUILD_MAKE_TABLES) ++ add_subdirectory(gentables) ++elseif(0) # ******* Auto Generated Lookup Tables ****** include(ExternalProject) -@@ -435,3 +439,4 @@ ExternalProject_Add(gentables +@@ -440,4 +444,11 @@ ExternalProject_Add(gentables + "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" ) - add_dependencies(libfluidsynth-OBJ gentables) +endif() ++if(TARGET make_tables AND NOT CMAKE_CROSSCOMPILING) ++ set(GENTABLES make_tables) ++else() ++ find_program(GENTABLES make_tables REQUIRED) ++endif() ++add_custom_target(gentables COMMAND "${GENTABLES}" "${CMAKE_BINARY_DIR}/") + add_dependencies(libfluidsynth-OBJ gentables) diff --git a/src/gentables/CMakeLists.txt b/src/gentables/CMakeLists.txt -index 638f299..e834e34 100644 +index 638f299..19dd9e6 100644 --- a/src/gentables/CMakeLists.txt +++ b/src/gentables/CMakeLists.txt -@@ -15,7 +15,6 @@ project (gentables C) +@@ -12,6 +12,7 @@ unset(ENV{LDFLAGS}) + + project (gentables C) + ++if (0) set ( CMAKE_BUILD_TYPE Debug ) # hardcode ".exe" as suffix to the binary, else in case of cross-platform cross-compiling the calling cmake will not know the suffix used here and fail to find the binary --set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) - +@@ -20,6 +21,7 @@ set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}) -@@ -34,3 +33,5 @@ if ( WIN32 ) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}) ++endif() + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) + +@@ -34,3 +36,5 @@ if ( WIN32 ) else ( WIN32 ) target_link_libraries (make_tables "m") endif () diff --git a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake index fd9f48d46..85c526050 100644 --- a/external_imported/vcpkg/ports/fluidsynth/portfile.cmake +++ b/external_imported/vcpkg/ports/fluidsynth/portfile.cmake @@ -1,42 +1,48 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6 - SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec + REF v2.2.8 + SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535 HEAD_REF master PATCHES fix-dependencies.patch - separate-gentables.patch + gentables.patch ) -if ("buildtools" IN_LIST FEATURES) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/src/gentables" - LOGFILE_BASE configure-tools - ) - - vcpkg_cmake_build( - LOGFILE_BASE install-tools - TARGET install - ) - - vcpkg_copy_tools(TOOL_NAMES make_tables AUTO_CLEAN) - - vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + buildtools VCPKG_BUILD_MAKE_TABLES + sndfile enable-libsndfile +) -set(feature_list dbus jack libinstpatch libsndfile midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart) -vcpkg_list(SET FEATURE_OPTIONS) +set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash systemd dart) foreach(_feature IN LISTS feature_list) list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) endforeach() -vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") +# 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}) vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} -DLIB_INSTALL_DIR=lib @@ -53,8 +59,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -# Copy fluidsynth.exe to tools dir -vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN) +set(tools fluidsynth) +if("buildtools" IN_LIST FEATURES) + list(APPEND tools make_tables) +endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) # Remove unnecessary files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json index 0cb01fc4b..edeeda416 100644 --- a/external_imported/vcpkg/ports/fluidsynth/vcpkg.json +++ b/external_imported/vcpkg/ports/fluidsynth/vcpkg.json @@ -1,13 +1,18 @@ { "name": "fluidsynth", - "version": "2.2.6", + "version": "2.2.8", "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", "license": "LGPL-2.1-or-later", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "fluidsynth", "host": true, + "default-features": false, "features": [ "buildtools" ] @@ -21,6 +26,18 @@ "features": { "buildtools": { "description": "Build tools gentables" + }, + "sndfile": { + "description": "Enable rendering to file and SF3 support", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] } } } diff --git a/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch b/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch new file mode 100644 index 000000000..0a2ac6a57 --- /dev/null +++ b/external_imported/vcpkg/ports/fmt/fix-format-conflict.patch @@ -0,0 +1,15 @@ +diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h +index f44df01c..59cc4559 100644 +--- a/include/fmt/format-inl.h ++++ b/include/fmt/format-inl.h +@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, + error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); + auto it = buffer_appender(out); + if (message.size() <= inline_buffer_size - error_code_size) +- format_to(it, FMT_STRING("{}{}"), message, SEP); +- format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); ++ fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); ++ fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); + FMT_ASSERT(out.size() <= inline_buffer_size, ""); + } + diff --git a/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch b/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch deleted file mode 100644 index c554188bd..000000000 --- a/external_imported/vcpkg/ports/fmt/fix-invalid-command.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/include/fmt/locale.h b/include/fmt/locale.h -index 7571b52..0a34eb4 100644 ---- a/include/fmt/locale.h -+++ b/include/fmt/locale.h -@@ -1,2 +1,6 @@ - #include "xchar.h" -+#ifdef _WIN32 -+#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") -+#else - #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead -+#endif diff --git a/external_imported/vcpkg/ports/fmt/portfile.cmake b/external_imported/vcpkg/ports/fmt/portfile.cmake index 10362875e..33558c894 100644 --- a/external_imported/vcpkg/ports/fmt/portfile.cmake +++ b/external_imported/vcpkg/ports/fmt/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 8.1.1 - SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 + REF 9.0.0 + SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 HEAD_REF master PATCHES fix-write-batch.patch - fix-invalid-command.patch + fix-format-conflict.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/fmt/vcpkg.json b/external_imported/vcpkg/ports/fmt/vcpkg.json index 7386b40b6..a98bb9a53 100644 --- a/external_imported/vcpkg/ports/fmt/vcpkg.json +++ b/external_imported/vcpkg/ports/fmt/vcpkg.json @@ -1,9 +1,9 @@ { "name": "fmt", - "version": "8.1.1", - "port-version": 1, + "version": "9.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": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/folly/portfile.cmake b/external_imported/vcpkg/ports/folly/portfile.cmake index 79536aae7..db3bed6de 100644 --- a/external_imported/vcpkg/ports/folly/portfile.cmake +++ b/external_imported/vcpkg/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 v2022.03.21.00 - SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7 + REF 46c03de426e26f4c5a92df37ab233c586fbe369a #v2022.08.15.00 + SHA512 6798878d6892ed79d954fb5754ee102ea04868bce4be9be5dc7c6d6c7ddcbc5573719fe09470d89c385d9e487a75d1a9abc70c29c67698b957fc68b97a8bea32 HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -56,8 +56,6 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON -DLIBAIO_FOUND=OFF - -DLIBURCU_FOUND=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON -DCMAKE_INSTALL_DIR=share/folly ${FEATURE_OPTIONS} ) @@ -66,6 +64,8 @@ vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + vcpkg_cmake_config_fixup() # Release folly-targets.cmake does not link to the right libraries in debug mode. diff --git a/external_imported/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..cce45a2e4 --- /dev/null +++ b/external_imported/vcpkg/ports/folly/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(FOLLY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${FOLLY_PREV_MODULE_PATH}) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/folly/vcpkg.json b/external_imported/vcpkg/ports/folly/vcpkg.json index dd9c35fec..5d9e7dda0 100644 --- a/external_imported/vcpkg/ports/folly/vcpkg.json +++ b/external_imported/vcpkg/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2022.03.21.00", + "version-string": "2022.08.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", diff --git a/external_imported/vcpkg/ports/font-util/build.patch b/external_imported/vcpkg/ports/font-util/build.patch new file mode 100644 index 000000000..72fa5fa65 --- /dev/null +++ b/external_imported/vcpkg/ports/font-util/build.patch @@ -0,0 +1,33 @@ +diff --git a/bdftruncate.c b/bdftruncate.c +index 2b317c0b0..3ab84978f 100644 +--- a/bdftruncate.c ++++ b/bdftruncate.c +@@ -40,7 +40,13 @@ + #include + #include + #include +- ++#if defined(_MSC_VER) ++# if defined(_M_X64) || defined(_M_ARM64) ++# define SSIZE_MAX LLONG_MAX ++# else ++# define SSIZE_MAX LONG_MAX ++# endif ++#endif + #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) + # define ATTR_NORETURN __attribute((noreturn)) +diff --git a/ucs2any.c b/ucs2any.c +index 1f575d14f..75b662b3d 100644 +--- a/ucs2any.c ++++ b/ucs2any.c +@@ -49,7 +49,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + /* global variable for argv[0] */ + static const char *my_name = NULL; diff --git a/external_imported/vcpkg/ports/font-util/portfile.cmake b/external_imported/vcpkg/ports/font-util/portfile.cmake new file mode 100644 index 000000000..026c224c7 --- /dev/null +++ b/external_imported/vcpkg/ports/font-util/portfile.cmake @@ -0,0 +1,56 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO font/util + REF d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2 + SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04 + HEAD_REF master + PATCHES build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND VCPKG_C_FLAGS " /DNEED_BASENAME") + list(APPEND VCPKG_CXX_FLAGS " /DNEED_BASENAME") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/debug") + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +endif() \ No newline at end of file diff --git a/external_imported/vcpkg/ports/font-util/vcpkg.json b/external_imported/vcpkg/ports/font-util/vcpkg.json new file mode 100644 index 000000000..d04e3eb55 --- /dev/null +++ b/external_imported/vcpkg/ports/font-util/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "font-util", + "version": "1.3.2", + "description": "X.Org font package creation/installation utilities", + "homepage": "https://gitlab.freedesktop.org/xorg/font/util", + "license": null, + "dependencies": [ + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch b/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch new file mode 100644 index 000000000..d62e4e6f5 --- /dev/null +++ b/external_imported/vcpkg/ports/fontconfig/fix-mingw-gperf-fallback.patch @@ -0,0 +1,13 @@ +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/external_imported/vcpkg/ports/fontconfig/fix-preprocessor-clang-cl.patch b/external_imported/vcpkg/ports/fontconfig/fix-preprocessor-clang-cl.patch new file mode 100644 index 000000000..f5dd4e777 --- /dev/null +++ b/external_imported/vcpkg/ports/fontconfig/fix-preprocessor-clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index 9a6ba2021..5d04f7360 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -33,7 +33,7 @@ fc_sources = [ + cpp = cc.cmd_array() + if cc.get_id() == 'gcc' + cpp += ['-E', '-P'] +-elif cc.get_id() == 'msvc' ++elif cc.get_argument_syntax() == 'msvc' + cpp += ['/EP'] + elif cc.get_id() == 'clang' + cpp += ['-E', '-P'] diff --git a/external_imported/vcpkg/ports/fontconfig/libgetopt.patch b/external_imported/vcpkg/ports/fontconfig/libgetopt.patch new file mode 100644 index 000000000..d1e8edd39 --- /dev/null +++ b/external_imported/vcpkg/ports/fontconfig/libgetopt.patch @@ -0,0 +1,130 @@ +diff --git a/fc-cache/meson.build b/fc-cache/meson.build +index 5e40fac..3c3e46b 100644 +--- a/fc-cache/meson.build ++++ b/fc-cache/meson.build +@@ -1,6 +1,7 @@ + fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-cat/meson.build b/fc-cat/meson.build +index f26e4b8..476c0f9 100644 +--- a/fc-cat/meson.build ++++ b/fc-cat/meson.build +@@ -1,6 +1,7 @@ + fccat = executable('fc-cat', ['fc-cat.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-conflist/meson.build b/fc-conflist/meson.build +index f543cf9..f06640b 100644 +--- a/fc-conflist/meson.build ++++ b/fc-conflist/meson.build +@@ -1,6 +1,7 @@ + fcconflist = executable('fc-conflist', ['fc-conflist.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-list/meson.build b/fc-list/meson.build +index 2f679d5..4b0fb62 100644 +--- a/fc-list/meson.build ++++ b/fc-list/meson.build +@@ -1,6 +1,7 @@ + fclist = executable('fc-list', ['fc-list.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-match/meson.build b/fc-match/meson.build +index aca8bc8..cab4f09 100644 +--- a/fc-match/meson.build ++++ b/fc-match/meson.build +@@ -1,6 +1,7 @@ + fcmatch = executable('fc-match', ['fc-match.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-pattern/meson.build b/fc-pattern/meson.build +index 07de245..b957c67 100644 +--- a/fc-pattern/meson.build ++++ b/fc-pattern/meson.build +@@ -1,6 +1,7 @@ + fcpattern = executable('fc-pattern', ['fc-pattern.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], ++ dependencies: [getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-query/meson.build b/fc-query/meson.build +index d0f2dd4..940b021 100644 +--- a/fc-query/meson.build ++++ b/fc-query/meson.build +@@ -1,7 +1,7 @@ + fcquery = executable('fc-query', ['fc-query.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-scan/meson.build b/fc-scan/meson.build +index 4de2134..c5b2b67 100644 +--- a/fc-scan/meson.build ++++ b/fc-scan/meson.build +@@ -1,7 +1,7 @@ + fcscan = executable('fc-scan', ['fc-scan.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/fc-validate/meson.build b/fc-validate/meson.build +index e2b956e..8902d59 100644 +--- a/fc-validate/meson.build ++++ b/fc-validate/meson.build +@@ -1,7 +1,7 @@ + fcvalidate = executable('fc-validate', ['fc-validate.c', fcstdint_h, alias_headers, ft_alias_headers], + include_directories: [incbase, incsrc], + link_with: [libfontconfig], +- dependencies: [freetype_dep], ++ dependencies: [freetype_dep, getopt_dep], + c_args: c_args, + install: true, + ) +diff --git a/meson.build b/meson.build +index f616600..6d82a16 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,6 +202,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris + conf.set('HAVE_SOLARIS_ATOMIC_OPS', 1) + endif + ++if host_machine.system() == 'windows' ++ conf.set('HAVE_GETOPT', 1) ++ conf.set('HAVE_GETOPT_LONG', 1) ++ getopt_dep = cc.find_library('getopt', required: false) ++else ++ getopt_dep = dependency('', required: false) ++endif ++ + + prefix = get_option('prefix') + diff --git a/external_imported/vcpkg/ports/fontconfig/portfile.cmake b/external_imported/vcpkg/ports/fontconfig/portfile.cmake index 1ad11bfb2..6959873ae 100644 --- a/external_imported/vcpkg/ports/fontconfig/portfile.cmake +++ b/external_imported/vcpkg/ports/fontconfig/portfile.cmake @@ -9,11 +9,12 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES no-etc-symlinks.patch + libgetopt.patch + fix-mingw-gperf-fallback.patch + fix-preprocessor-clang-cl.patch ) -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) -vcpkg_add_to_path(${GPERF_PATH}) +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/fontconfig/vcpkg.json b/external_imported/vcpkg/ports/fontconfig/vcpkg.json index 0ab7edc10..b6e610074 100644 --- a/external_imported/vcpkg/ports/fontconfig/vcpkg.json +++ b/external_imported/vcpkg/ports/fontconfig/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fontconfig", "version": "2.14.0", + "port-version": 4, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", @@ -8,7 +9,12 @@ "dirent", "expat", "freetype", + "getopt", "gettext", + { + "name": "gperf", + "host": true + }, "libiconv", { "name": "libuuid", diff --git a/external_imported/vcpkg/ports/fplus/portfile.cmake b/external_imported/vcpkg/ports/fplus/portfile.cmake index 5969cd318..efe04fcdb 100644 --- a/external_imported/vcpkg/ports/fplus/portfile.cmake +++ b/external_imported/vcpkg/ports/fplus/portfile.cmake @@ -1,22 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/FunctionalPlus - REF v0.2.14-p0 - SHA512 f6232140fc343521bc484c7fa1a9d4942fbfc078be1cefa7b34c33632ec23d55827d13319f7b7a5535c5eedeb3161e15f84ecb80aa110685dbfc2c932c57284b + REF v0.2.18-p0 + SHA512 119aaef75020ef06818bf5d33db8bce272e89d69699df9be636bc6fdf06b584e1842440896a431ea2a75b88ce01472f3a9886b8dd781f5e5533315e9ad6860ac HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DFPLUS_BUILD_EXAMPLES=OFF -DFunctionalPlus_INSTALL_CMAKEDIR=share/FunctionalPlus ) -vcpkg_install_cmake() +vcpkg_cmake_install() -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") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/fplus/vcpkg.json b/external_imported/vcpkg/ports/fplus/vcpkg.json index 0e4c7ad71..bdf521b10 100644 --- a/external_imported/vcpkg/ports/fplus/vcpkg.json +++ b/external_imported/vcpkg/ports/fplus/vcpkg.json @@ -1,6 +1,13 @@ { "name": "fplus", - "version-semver": "0.2.14-p0", + "version": "0.2.18-p0", "description": "Functional Programming Library for C++. Write concise and readable C++ code", - "homepage": "https://github.com/Dobiasd/FunctionalPlus" + "homepage": "https://github.com/Dobiasd/FunctionalPlus", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/freealut/portfile.cmake b/external_imported/vcpkg/ports/freealut/portfile.cmake index 668b64e3a..429847754 100644 --- a/external_imported/vcpkg/ports/freealut/portfile.cmake +++ b/external_imported/vcpkg/ports/freealut/portfile.cmake @@ -10,8 +10,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF @@ -19,7 +18,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -27,16 +26,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/freealut-config") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/freealut-config") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/freealut-config") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + 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) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/freealut/vcpkg.json b/external_imported/vcpkg/ports/freealut/vcpkg.json index 81739956c..90a8aad4b 100644 --- a/external_imported/vcpkg/ports/freealut/vcpkg.json +++ b/external_imported/vcpkg/ports/freealut/vcpkg.json @@ -1,12 +1,13 @@ { "name": "freealut", "version": "1.1.0", - "port-version": 1, + "port-version": 3, "description": [ "FreeALUT is a free implementation of OpenAL's ALUT standard.", "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " ], "homepage": "https://github.com/vancegroup/freealut", + "license": "LGPL-2.0-only", "supports": "!uwp", "dependencies": [ "openal-soft", diff --git a/external_imported/vcpkg/ports/freeimage/CMakeLists.txt b/external_imported/vcpkg/ports/freeimage/CMakeLists.txt index d31c8aa05..60f9783ac 100644 --- a/external_imported/vcpkg/ports/freeimage/CMakeLists.txt +++ b/external_imported/vcpkg/ports/freeimage/CMakeLists.txt @@ -107,7 +107,8 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES} WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder ${JXR_LIBRARIES} ${LibRaw_LIBRARIES} - OpenEXR::IlmImf) + OpenEXR::OpenEXR + Imath::Imath) target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS}) @@ -153,6 +154,7 @@ find_dependency(WebP CONFIG) find_dependency(JXR) find_dependency(LibRaw) find_dependency(OpenEXR) +find_dependency(Imath) include(\"\${CMAKE_CURRENT_LIST_DIR}/freeimage-targets.cmake\") ") diff --git a/external_imported/vcpkg/ports/freeimage/portfile.cmake b/external_imported/vcpkg/ports/freeimage/portfile.cmake index ce1b86821..cb1fa0e2b 100644 --- a/external_imported/vcpkg/ports/freeimage/portfile.cmake +++ b/external_imported/vcpkg/ports/freeimage/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_sourceforge( fix-function-overload.patch use-typedef-as-already-declared.patch use-functions-to-override-libtiff-warning-error-handlers.patch + remove_auto_ptr.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/external_imported/vcpkg/ports/freeimage/remove_auto_ptr.patch b/external_imported/vcpkg/ports/freeimage/remove_auto_ptr.patch new file mode 100644 index 000000000..65315e2a7 --- /dev/null +++ b/external_imported/vcpkg/ports/freeimage/remove_auto_ptr.patch @@ -0,0 +1,35 @@ +diff --git a/Source/FreeImage/MultiPage.cpp b/Source/FreeImage/MultiPage.cpp +index 4f2605188..8af384aff 100644 +--- a/Source/FreeImage/MultiPage.cpp ++++ b/Source/FreeImage/MultiPage.cpp +@@ -31,6 +31,8 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + ++#include ++ + #include "CacheFile.h" + #include "FreeImageIO.h" + #include "Plugin.h" +@@ -271,8 +273,8 @@ FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL crea + } + } + +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->m_filename = filename; + // io is default + header->node = node; +@@ -337,8 +339,8 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h + PluginNode *node = list->FindNodeFromFIF(fif); + + if (node) { +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->io = *io; + header->node = node; + header->fif = fif; diff --git a/external_imported/vcpkg/ports/freeimage/use-external-openexr.patch b/external_imported/vcpkg/ports/freeimage/use-external-openexr.patch index 08915da72..4f02f7132 100644 --- a/external_imported/vcpkg/ports/freeimage/use-external-openexr.patch +++ b/external_imported/vcpkg/ports/freeimage/use-external-openexr.patch @@ -25,10 +25,38 @@ index b286430..82b3b72 100644 +#include +#include +#include -+#include ++#include // ========================================================== +@@ -66,11 +66,11 @@ public: + return ((unsigned)n != _io->read_proc(c, 1, n, _handle)); + } + +- virtual Imath::Int64 tellg() { ++ virtual uint64_t tellg() { + return _io->tell_proc(_handle); + } + +- virtual void seekg(Imath::Int64 pos) { ++ virtual void seekg(uint64_t pos) { + _io->seek_proc(_handle, (unsigned)pos, SEEK_SET); + } + +@@ -100,11 +100,11 @@ public: + } + } + +- virtual Imath::Int64 tellp() { ++ virtual uint64_t tellp() { + return _io->tell_proc(_handle); + } + +- virtual void seekp(Imath::Int64 pos) { ++ virtual void seekp(uint64_t pos) { + _io->seek_proc(_handle, (unsigned)pos, SEEK_SET); + } + }; diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp index 562fdd7..ce12649 100644 --- a/Source/FreeImage/PluginTIFF.cpp @@ -38,7 +66,7 @@ index 562fdd7..ce12649 100644 #include #include "../Metadata/FreeImageTag.h" -#include "../OpenEXR/Half/half.h" -+#include ++#include #include "FreeImageIO.h" #include "PSDParser.h" diff --git a/external_imported/vcpkg/ports/freeimage/vcpkg.json b/external_imported/vcpkg/ports/freeimage/vcpkg.json index 08fbf28d2..50ea53140 100644 --- a/external_imported/vcpkg/ports/freeimage/vcpkg.json +++ b/external_imported/vcpkg/ports/freeimage/vcpkg.json @@ -1,10 +1,12 @@ { "name": "freeimage", "version": "3.18.0", - "port-version": 22, + "port-version": 24, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", + "license": "GPL-2.0-only OR GPL-3.0-only OR FreeImage", "dependencies": [ + "imath", "jxrlib", "libjpeg-turbo", "libpng", diff --git a/external_imported/vcpkg/ports/freerdp/fix-include-path.patch b/external_imported/vcpkg/ports/freerdp/fix-include-path.patch index dc6523080..f426813a0 100644 --- a/external_imported/vcpkg/ports/freerdp/fix-include-path.patch +++ b/external_imported/vcpkg/ports/freerdp/fix-include-path.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97ba2f9..64a2f33 100644 +index 54df8cf..5232d46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -107,7 +107,7 @@ else() - endif() - message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") +@@ -129,7 +129,7 @@ endif() + + message(STATUS "Git Revision ${GIT_REVISION}") -set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/") +set(FREERDP_INCLUDE_DIR "include/") @@ -25,10 +25,10 @@ index a020dc5..0bc1157 100644 file(GLOB FREERDP_HEADERS "freerdp/*.h") install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers) diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt -index a94090a..08b6b88 100644 +index d8a40da..73ffba4 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt -@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") +@@ -221,7 +221,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") diff --git a/external_imported/vcpkg/ports/freerdp/portfile.cmake b/external_imported/vcpkg/ports/freerdp/portfile.cmake index f9ec5abfa..ac36220ad 100644 --- a/external_imported/vcpkg/ports/freerdp/portfile.cmake +++ b/external_imported/vcpkg/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF 2.5.0 - SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c + REF 40ee5d3bcc70343af6c0300d71968858c1f1948f #v2.7.0 + SHA512 b18fa4830a6b4367e28e92fe91b9ae925d5d4fd517b2f6f8655eae7306f181b98e9e611c0cde576f642987c12af6eb862952179f5d7b60019cd7b024fd2db142 HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch diff --git a/external_imported/vcpkg/ports/freerdp/vcpkg.json b/external_imported/vcpkg/ports/freerdp/vcpkg.json index ef18342f9..1fd40a6f5 100644 --- a/external_imported/vcpkg/ports/freerdp/vcpkg.json +++ b/external_imported/vcpkg/ports/freerdp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "freerdp", - "version": "2.5.0", + "version": "2.7.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/freetds/disable-tests.patch b/external_imported/vcpkg/ports/freetds/disable-tests.patch new file mode 100644 index 000000000..0cf0c6ee0 --- /dev/null +++ b/external_imported/vcpkg/ports/freetds/disable-tests.patch @@ -0,0 +1,94 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ac6cc58..1a6a4f0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,9 +64,9 @@ math(EXPR BUILD_NUMBER "${BUILD_NUMBER}") + + set(FREETDS_TOPDIR ${CMAKE_CURRENT_LIST_DIR}) + +-enable_testing() +-set(CMAKE_CTEST_COMMAND ctest) +-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) ++#enable_testing() ++#set(CMAKE_CTEST_COMMAND ctest) ++#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) + + # TODO depends on configure + add_definitions(-D_REENTRANT -D_THREAD_SAFE) +@@ -459,9 +459,11 @@ add_subdirectory(src/tds) + add_subdirectory(src/ctlib) + add_subdirectory(src/dblib) + add_subdirectory(src/odbc) +-add_subdirectory(src/apps) ++if(WITH_TOOLS) ++ add_subdirectory(src/apps) ++ add_subdirectory(src/pool) ++endif() + add_subdirectory(src/server) +-add_subdirectory(src/pool) + + configure_file(${CMAKE_BINARY_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h) + configure_file(${CMAKE_SOURCE_DIR}/include/tds_sysdep_public.h.in ${CMAKE_BINARY_DIR}/include/tds_sysdep_public.h) +diff --git a/src/ctlib/CMakeLists.txt b/src/ctlib/CMakeLists.txt +index e83b0b1a..017d571a 100644 +--- a/src/ctlib/CMakeLists.txt ++++ b/src/ctlib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + set(static_lib_name ct) + if(WIN32) +diff --git a/src/dblib/CMakeLists.txt b/src/dblib/CMakeLists.txt +index 5f1766f4..c70e87a3 100644 +--- a/src/dblib/CMakeLists.txt ++++ b/src/dblib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(win_SRCS winmain.c dblib.def dbopen.c) +diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt +index ec8eaadd..6f9f32c9 100644 +--- a/src/odbc/CMakeLists.txt ++++ b/src/odbc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + # TODO checks + add_definitions(-DUNIXODBC -DHAVE_SQLGETPRIVATEPROFILESTRING) +diff --git a/src/replacements/CMakeLists.txt b/src/replacements/CMakeLists.txt +index 48d7e536..f7b490f8 100644 +--- a/src/replacements/CMakeLists.txt ++++ b/src/replacements/CMakeLists.txt +@@ -41,7 +41,7 @@ if (NOT WIN32) + set_target_properties(replacements PROPERTIES POSITION_INDEPENDENT_CODE ON) + endif() + +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + + INSTALL(TARGETS replacements +diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt +index 134a30cb..5426571b 100644 +--- a/src/tds/CMakeLists.txt ++++ b/src/tds/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(PERL_FOUND AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tds_willconvert.h") + if (NOT GPERF) +diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt +index 2a1935c9..a46483e0 100644 +--- a/src/utils/CMakeLists.txt ++++ b/src/utils/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(unittests) ++#add_subdirectory(unittests) + + if(WIN32) + set(add_SRCS md5.c) diff --git a/external_imported/vcpkg/ports/freetds/portfile.cmake b/external_imported/vcpkg/ports/freetds/portfile.cmake index 41f2426b0..288f2de31 100644 --- a/external_imported/vcpkg/ports/freetds/portfile.cmake +++ b/external_imported/vcpkg/ports/freetds/portfile.cmake @@ -1,72 +1,53 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO freetds/freetds - REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755 + REF v1.3.10 HEAD_REF master - SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b + SHA512 78b494c04e3436bfdc4997e6f0196baef27246bb7ad825c487a16f247d13c99324a39d52bfe8f5306164ae3f5c7eb43ca83944b24a3ce6b4bcd733849b4064ad + PATCHES + disable-tests.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES openssl WITH_OPENSSL + tools WITH_TOOLS ) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_PATH}) +vcpkg_add_to_path("${PERL_PATH}") -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_find_acquire_program(GPERF) - get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) - vcpkg_add_to_path(${GPERF_PATH}) -else() - if (NOT EXISTS /usr/bin/gperf) - message(FATAL_ERROR "freetds requires gperf, these can be installed on Ubuntu systems via apt-get install gperf.") - endif() +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") + +set(_WCHAR_SUPPORT ON) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(_WCHAR_SUPPORT OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DENABLE_ODBC_WIDE=${_WCHAR_SUPPORT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES bsqldb bsqlodbc datacopy defncopy freebcp tdspool tsql AUTO_CLEAN) + if(EXISTS "${CURRENT_PACKAGES_DIR}/etc") + file(INSTALL "${CURRENT_PACKAGES_DIR}/etc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/etc") + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc") 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(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/freetds/vcpkg.json b/external_imported/vcpkg/ports/freetds/vcpkg.json index 498c5d5dd..5483fdf99 100644 --- a/external_imported/vcpkg/ports/freetds/vcpkg.json +++ b/external_imported/vcpkg/ports/freetds/vcpkg.json @@ -1,10 +1,29 @@ { "name": "freetds", - "version": "1.2.11", - "port-version": 2, + "version": "1.3.10", + "port-version": 1, "description": "Implementation of the Tabular Data Stream protocol", "homepage": "https://www.freetds.org", + "license": "GPL-2.0-only", "supports": "windows & !uwp", + "dependencies": [ + { + "name": "gperf", + "host": true + }, + { + "name": "libmysql", + "platform": "windows" + }, + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [ "openssl" ], @@ -14,6 +33,9 @@ "dependencies": [ "openssl" ] + }, + "tools": { + "description": "Build tools" } } } diff --git a/external_imported/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch b/external_imported/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch new file mode 100644 index 000000000..d81093da3 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype-gl/0001-Link-to-dependencies-also-for-static-build.patch @@ -0,0 +1,43 @@ +From 1ad7d07765445511d51f3888ffdedba2cb282e84 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 21:57:18 +0200 +Subject: [PATCH 1/4] Link to dependencies also for static build + +--- + CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ccbf9a..b5db60a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,12 +185,6 @@ if(freetype-gl_BUILD_SHARED) + PROPERTIES + VERSION 0.3.2 + SOVERSION 0) +- target_link_libraries (freetype-gl +- ${OPENGL_LIBRARY} +- ${FREETYPE_LIBRARIES} +- ${MATH_LIBRARY} +- ${GLEW_LIBRARY} +- ) + else() + add_library(freetype-gl STATIC + ${FREETYPE_GL_SRC} +@@ -198,6 +192,13 @@ else() + ) + endif() + ++target_link_libraries(freetype-gl ++ ${OPENGL_LIBRARY} ++ ${FREETYPE_LIBRARIES} ++ ${MATH_LIBRARY} ++ ${GLEW_LIBRARY} ++) ++ + if(freetype-gl_BUILD_MAKEFONT) + add_executable(makefont makefont.c) + +-- +2.27.0 + diff --git a/external_imported/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch b/external_imported/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch new file mode 100644 index 000000000..2006d4ee3 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype-gl/0002-Remove-duplicate-installs.patch @@ -0,0 +1,31 @@ +From 9af89db45ef951d5fd8e8be5b4029136f59e94a1 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:00:38 +0200 +Subject: [PATCH 2/4] Remove duplicate installs + +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5db60a..09163ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,14 +249,3 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() +- +-set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- +-install(TARGETS freetype-gl +- ARCHIVE DESTINATION ${INSTALL_LIB_DIR} +- LIBRARY DESTINATION ${INSTALL_LIB_DIR} +- COMPONENT library) +-install(FILES ${FREETYPE_GL_HDR} DESTINATION include +- COMPONENT headers) +- +-- +2.27.0 + diff --git a/external_imported/vcpkg/ports/freetype-gl/0003-Add-exports.patch b/external_imported/vcpkg/ports/freetype-gl/0003-Add-exports.patch new file mode 100644 index 000000000..2fdfe8ae6 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype-gl/0003-Add-exports.patch @@ -0,0 +1,34 @@ +From 2c2e7e6cc7cb55eff502889421fe7a207cec932d Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Sun, 1 May 2022 22:01:00 +0200 +Subject: [PATCH 3/4] Add exports + +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09163ec..fd40e68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,7 +217,7 @@ if(freetype-gl_BUILD_MAKEFONT) + endif() + endif() + +-install(TARGETS freetype-gl ++install(TARGETS freetype-gl EXPORT freetype-glConfig + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +@@ -249,3 +249,8 @@ if ("${LIB64}" STREQUAL "TRUE") + else() + set(LIBSUFFIX "") + endif() ++ ++install( ++ EXPORT freetype-glConfig ++ DESTINATION share/freetype-gl ++) +-- +2.27.0 + diff --git a/external_imported/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch b/external_imported/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch new file mode 100644 index 000000000..8938ce606 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype-gl/0004-Change-install-dir-for-pkgconfig.patch @@ -0,0 +1,25 @@ +From ad0c57a370a15e8114447b8170ecddf14f21d352 Mon Sep 17 00:00:00 2001 +From: Stig Hornang +Date: Tue, 3 May 2022 20:27:09 +0200 +Subject: [PATCH 4/4] Change install dir for pkgconfig + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd40e68..4f8d7dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -172,7 +172,7 @@ if(NOT MSVC) + set(PKG_CONFIG_LIBDIR "\${exec_prefix}/lib") + set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include") + configure_file(freetype-gl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/share/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl.pc DESTINATION ${PKG_CONFIG_PREFIX}/lib/pkgconfig) + endif() + + if(freetype-gl_BUILD_SHARED) +-- +2.27.0 + diff --git a/external_imported/vcpkg/ports/freetype-gl/0005-add-version.patch b/external_imported/vcpkg/ports/freetype-gl/0005-add-version.patch new file mode 100644 index 000000000..f23c2e4ca --- /dev/null +++ b/external_imported/vcpkg/ports/freetype-gl/0005-add-version.patch @@ -0,0 +1,11 @@ +diff --git a/freetype-gl.pc.in b/freetype-gl.pc.in +index 3b33096..a5ae350 100644 +--- a/freetype-gl.pc.in ++++ b/freetype-gl.pc.in +@@ -5,5 +5,6 @@ includedir=@PKG_CONFIG_INCLUDEDIR@ + + Name: freetype-gl + Description: OpenGL text using one vertex buffer, one texture and FreeType ++Version: 2022-01-17 + Libs: -L${libdir} -lfreetype-gl + Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/freetype-gl/glew.patch b/external_imported/vcpkg/ports/freetype-gl/glew.patch deleted file mode 100644 index 01b7f616d..000000000 --- a/external_imported/vcpkg/ports/freetype-gl/glew.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c2e89fba..9e2d112c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ include_directories( - ${OPENGL_INCLUDE_DIRS} - ${FREETYPE_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR} -- ${GLEW_INCLUDE_PATH} -+ ${GLEW_INCLUDE_DIRS} - ) - - if(MSVC) diff --git a/external_imported/vcpkg/ports/freetype-gl/portfile.cmake b/external_imported/vcpkg/ports/freetype-gl/portfile.cmake index 59815437b..36c0282bc 100644 --- a/external_imported/vcpkg/ports/freetype-gl/portfile.cmake +++ b/external_imported/vcpkg/ports/freetype-gl/portfile.cmake @@ -3,21 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rougier/freetype-gl - REF 1a8c007f3fe7b1441f9e5616bc23d7455f4b07dd # accessed on 2020-09-14 - SHA512 ce858b5d5e892162daf6f5bff3476938e15cb9f04adbf2dc2b4c538bfda56b023278b3acb62940a9388c46b89edfd22c9c1c99891f8fcf9d926ffedb8af2b38e + REF 85d7850744465ac1dcd00b202787d72a4a3a1f5d + SHA512 4505b2162610500336ab975a5a0ac2c09503f51b2fb52b433018059f628ef6f6add9618c940a80efebc311d82fe96fa813d356acbd858cc2dbac6a1829ab3031 HEAD_REF master - PATCHES glew.patch + PATCHES + 0001-Link-to-dependencies-also-for-static-build.patch + 0002-Remove-duplicate-installs.patch + 0003-Add-exports.patch + 0004-Change-install-dir-for-pkgconfig.patch + 0005-add-version.patch ) -# make sure that no "internal" libraries are used by removing them -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/freetype) -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/AntTweakBar) -file(REMOVE_RECURSE ${SOURCE_PATH}/windows/glew) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindGLEW.cmake) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dfreetype-gl_BUILD_APIDOC=OFF -Dfreetype-gl_BUILD_DEMOS=OFF @@ -25,33 +23,15 @@ vcpkg_configure_cmake( -Dfreetype-gl_BUILD_MAKEFONT=OFF ) -# We may soon install using a modified cmake process with install target - -# Although FreeType-GL uses CMake as its build system, the implementation -# (*.cmake,CMakeLists.txt) doesn't provide for any type of installation. -# Presumably, it has been used as-is, in-tree, without ever needing to install -# itself within a larger system. -vcpkg_build_cmake(LOGFILE_ROOT install) - -file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/freetype-gl) - -# LIB -file(GLOB LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" -) -file(GLOB DEBUG_LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" -) - -file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() +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) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) + diff --git a/external_imported/vcpkg/ports/freetype-gl/vcpkg.json b/external_imported/vcpkg/ports/freetype-gl/vcpkg.json index 6ac62331c..3acfe4cbb 100644 --- a/external_imported/vcpkg/ports/freetype-gl/vcpkg.json +++ b/external_imported/vcpkg/ports/freetype-gl/vcpkg.json @@ -1,11 +1,19 @@ { "name": "freetype-gl", - "version-string": "2020-09-14", + "version-date": "2022-01-17", "port-version": 1, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ "freetype", - "glew" + "glew", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/freetype/bzip2.patch b/external_imported/vcpkg/ports/freetype/bzip2.patch new file mode 100644 index 000000000..c0f9101f7 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype/bzip2.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 469a141a2..eec19c7d0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,7 +517,7 @@ if (BZIP2_FOUND) + if (PC_BZIP2_FOUND) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + else () +- list(APPEND PKGCONFIG_LIBS_PRIVATE "-lbz2") ++ list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2") + endif () + endif () + if (PNG_FOUND) diff --git a/external_imported/vcpkg/ports/freetype/error-strings.patch b/external_imported/vcpkg/ports/freetype/error-strings.patch new file mode 100644 index 000000000..422e7e696 --- /dev/null +++ b/external_imported/vcpkg/ports/freetype/error-strings.patch @@ -0,0 +1,37 @@ +From 5672a353682a68cb76a03179739bdec0a2f5cf0e Mon Sep 17 00:00:00 2001 +From: Sean Farrell +Date: Fri, 19 Aug 2022 15:32:19 +0200 +Subject: [PATCH] Adds config support for error strings. + +--- + CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feb4be39a..4eea860e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,6 +215,8 @@ cmake_dependent_option(FT_REQUIRE_BROTLI + "Require support of compressed WOFF2 fonts." OFF + "NOT FT_DISABLE_BROTLI" OFF) + ++option(FT_ENABLE_ERROR_STRINGS ++ "Enable support for meaningful error descriptions" OFF) + + # Disallow in-source builds + if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") +@@ -353,6 +355,11 @@ if (BROTLIDEC_FOUND) + "/\\* +(#define +FT_CONFIG_OPTION_USE_BROTLI) +\\*/" "\\1" + FTOPTION_H "${FTOPTION_H}") + endif () ++if (FT_ENABLE_ERROR_STRINGS) ++ string(REGEX REPLACE ++ "/\\* +(#define +FT_CONFIG_OPTION_ERROR_STRINGS) +\\*/" "\\1" ++ FTOPTION_H "${FTOPTION_H}") ++endif () + + set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") + if (EXISTS "${FTOPTION_H_NAME}") +-- +2.33.0.windows.2 + diff --git a/external_imported/vcpkg/ports/freetype/fix-bzip2-pc.patch b/external_imported/vcpkg/ports/freetype/fix-bzip2-pc.patch deleted file mode 100644 index dac43924c..000000000 --- a/external_imported/vcpkg/ports/freetype/fix-bzip2-pc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb1b9a0f2..53d0bfc68 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -503,7 +503,7 @@ endif () - if (BZIP2_FOUND) - target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) - target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS -- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") -+ list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2") - endif () - if (PNG_FOUND) - target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/freetype/fix-exports.patch b/external_imported/vcpkg/ports/freetype/fix-exports.patch index 44dea7801..39b1e1581 100644 --- a/external_imported/vcpkg/ports/freetype/fix-exports.patch +++ b/external_imported/vcpkg/ports/freetype/fix-exports.patch @@ -2,14 +2,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cb1b9a0f2..edca5d579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -496,7 +496,7 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") - set(PKG_CONFIG_LIBS_PRIVATE "") +@@ -508,7 +508,6 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") + set(PKGCONFIG_LIBS_PRIVATE "") if (ZLIB_FOUND) -- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) -+ target_link_libraries(freetype PRIVATE ZLIB::ZLIB) - target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) - list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib") +- target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) ++ target_link_libraries(freetype PRIVATE ZLIB::ZLIB) +- target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) + list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib") endif () @@ -596,12 +596,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( diff --git a/external_imported/vcpkg/ports/freetype/portfile.cmake b/external_imported/vcpkg/ports/freetype/portfile.cmake index 92e544fea..f43790ddb 100644 --- a/external_imported/vcpkg/ports/freetype/portfile.cmake +++ b/external_imported/vcpkg/ports/freetype/portfile.cmake @@ -1,29 +1,31 @@ -set(FT_VERSION 2.11.1) +set(FT_VERSION 2.12.1) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 0848678482fbe20603a866f02da82c91122014d6f815ba4f1d9c03601c32e3ceb781f721c2b4427b6117d7c9742018af8dbb26566faf018595c70b50f8db3f08 + SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f PATCHES 0003-Fix-UWP.patch - fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a brotli-static.patch + bzip2.patch fix-exports.patch + error-strings.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib FT_REQUIRE_ZLIB - bzip2 FT_REQUIRE_BZIP2 - png FT_REQUIRE_PNG - brotli FT_REQUIRE_BROTLI + zlib FT_REQUIRE_ZLIB + bzip2 FT_REQUIRE_BZIP2 + error-strings FT_ENABLE_ERROR_STRINGS + png FT_REQUIRE_PNG + brotli FT_REQUIRE_BROTLI INVERTED_FEATURES - zlib FT_DISABLE_ZLIB - bzip2 FT_DISABLE_BZIP2 - png FT_DISABLE_PNG - brotli FT_DISABLE_BROTLI + zlib FT_DISABLE_ZLIB + bzip2 FT_DISABLE_BZIP2 + png FT_DISABLE_PNG + brotli FT_DISABLE_BROTLI ) vcpkg_cmake_configure( @@ -53,7 +55,7 @@ string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec.lib" [[\$<\$", "Arthur Hugeat " @@ -30,6 +29,14 @@ "platform": "!linux" }, "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake b/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake index 212d5ceea..d7962c510 100644 --- a/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake +++ b/external_imported/vcpkg/ports/gamenetworkingsockets/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/GameNetworkingSockets - REF b99aa75ed9b1ec57d5c90ee009f8de8882eeca13 # v1.4.0 - SHA512 1776a6a66d2c6546a8a3d71123544ea9590ab6b123d4a92eebd38c0a195f09a55185b999250c518527e1d8983176732429901a2f781a883715e6695b597229f5 + REF 505c697d0abef5da2ff3be35aa4ea3687597c3e9 # v1.4.1 + SHA512 3e4b4da138f2b356169e6504aa899c9eca4fba5b5fcaed2a0ae8a2f5828976dd00af9f3262c75bd6d820300da87ebe32da152fecddc278a651f3b33eb59142df HEAD_REF master ) set(CRYPTO_BACKEND OpenSSL) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF @@ -21,10 +20,10 @@ vcpkg_configure_cmake( -DUSE_CRYPTO25519=${CRYPTO_BACKEND} ) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/GameNetworkingSockets" TARGET_PATH "share/GameNetworkingSockets") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json b/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json index 433753e0d..69ec30303 100644 --- a/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/gamenetworkingsockets/vcpkg.json @@ -1,12 +1,20 @@ { "name": "gamenetworkingsockets", - "version": "1.4.0", + "version-semver": "1.4.1", "description": "GameNetworkingSockets is a basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", "license": "BSD-3-Clause", "supports": "!(static & windows) & !uwp & !(arm64 & windows)", "dependencies": [ "openssl", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/gamma/vcpkg.json b/external_imported/vcpkg/ports/gamma/vcpkg.json index 9e13ebd52..3fcba5d20 100644 --- a/external_imported/vcpkg/ports/gamma/vcpkg.json +++ b/external_imported/vcpkg/ports/gamma/vcpkg.json @@ -1,11 +1,18 @@ { "name": "gamma", "version-string": "gamma-2018-01-27", - "port-version": 3, + "port-version": 4, "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", "dependencies": [ - "libsndfile", + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + }, "portaudio" ] } diff --git a/external_imported/vcpkg/ports/gazebo/fix-tbb.patch b/external_imported/vcpkg/ports/gazebo/fix-tbb.patch new file mode 100644 index 000000000..b494c93bc --- /dev/null +++ b/external_imported/vcpkg/ports/gazebo/fix-tbb.patch @@ -0,0 +1,443 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index af56ee4..8583740 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -301,7 +301,7 @@ if (PKG_CONFIG_FOUND) + + ################################################# + # Find TBB +- pkg_check_modules(TBB tbb<2021) ++ pkg_check_modules(TBB tbb) + set (TBB_PKG_CONFIG "tbb") + if (NOT TBB_FOUND) + message(STATUS "TBB not found, attempting to detect manually") +@@ -325,6 +325,12 @@ if (PKG_CONFIG_FOUND) + endif(tbb_library) + endif (NOT TBB_FOUND) + endif (NOT TBB_FOUND) ++ set(HAVE_TBB_GREATER_OR_EQUAL_2021 OFF) ++ if (DEFINED TBB_VERSION AND NOT ${TBB_VERSION} STREQUAL "") ++ if (${TBB_VERSION} VERSION_GREATER_EQUAL "2021.0") ++ set(HAVE_TBB_GREATER_OR_EQUAL_2021 ON) ++ endif() ++ endif() + + ################################################# + # Find OGRE +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index 36bb341..6bb8e51 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -223,3 +223,11 @@ list(APPEND @PKG_NAME@_LIBRARIES ${IGNITION-FUEL_TOOLS_LIBRARIES}) + list(APPEND @PKG_NAME@_LDFLAGS -Wl,-rpath,${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) + list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}) + list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) ++ ++set (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021 @HAVE_TBB_GREATER_OR_EQUAL_2021@) ++if (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021) ++ find_package(TBB CONFIG) ++ if (TARGET tbb::tbb) ++ list(APPEND @PKG_NAME@_LIBRARIES TBB::tbb) ++ endif () ++endif () +diff --git a/gazebo/transport/CMakeLists.txt b/gazebo/transport/CMakeLists.txt +index 8e59020..a72d49b 100644 +--- a/gazebo/transport/CMakeLists.txt ++++ b/gazebo/transport/CMakeLists.txt +@@ -29,6 +29,7 @@ set (headers + SubscribeOptions.hh + Subscriber.hh + SubscriptionTransport.hh ++ TaskGroup.hh + TopicManager.hh + TransportIface.hh + TransportTypes.hh +@@ -70,6 +71,12 @@ if (WIN32) + target_link_libraries(gazebo_transport ws2_32 Iphlpapi) + endif() + ++if(${CMAKE_VERSION} VERSION_LESS "3.13.0") ++ link_directories(${TBB_LIBRARY_DIRS}) ++else() ++ target_link_directories(gazebo_transport PUBLIC ${TBB_LIBRARY_DIRS}) ++endif() ++ + if (USE_PCH) + add_pch(gazebo_transport transport_pch.hh ${Boost_PKGCONFIG_CFLAGS} "-I${PROTOBUF_INCLUDE_DIR}" "-I${TBB_INCLUDEDIR}") + endif() +diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh +index 0e7d88a..cbcd7af 100644 +--- a/gazebo/transport/Connection.hh ++++ b/gazebo/transport/Connection.hh +@@ -17,7 +17,16 @@ + #ifndef _CONNECTION_HH_ + #define _CONNECTION_HH_ + ++#undef emit + #include ++#define emit ++ ++// If TBB_VERSION_MAJOR is not defined, this means that ++// tbb >= 2021 and we can include the tbb/version.h header ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif ++ + #include + + #include +@@ -37,6 +46,9 @@ + #include "gazebo/common/Console.hh" + #include "gazebo/common/Exception.hh" + #include "gazebo/common/WeakBind.hh" ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/util/system.hh" + + #define HEADER_LENGTH 8 +@@ -54,7 +66,11 @@ namespace gazebo + /// \cond + /// \brief A task instance that is created when data is read from + /// a socket and used by TBB ++#if TBB_VERSION_MAJOR < 2021 + class GZ_TRANSPORT_VISIBLE ConnectionReadTask : public tbb::task ++#else ++ class GZ_TRANSPORT_VISIBLE ConnectionReadTask ++#endif + { + /// \brief Constructor + /// \param[_in] _func Boost function pointer, which is the function +@@ -68,6 +84,7 @@ namespace gazebo + { + } + ++#if TBB_VERSION_MAJOR < 2021 + /// \bried Overridden function from tbb::task that exectues the data + /// callback. + public: tbb::task *execute() +@@ -75,6 +92,11 @@ namespace gazebo + this->func(this->data); + return NULL; + } ++#else ++ /// \brief Execute the data callback ++ public: void operator()() const ++ { this->func(this->data); } ++#endif + + /// \brief The boost function pointer + private: boost::function func; +@@ -310,12 +332,16 @@ namespace gazebo + + if (!_e && !transport::is_stopped()) + { ++#if TBB_VERSION_MAJOR < 2021 + ConnectionReadTask *task = new(tbb::task::allocate_root()) + ConnectionReadTask(boost::get<0>(_handler), data); + tbb::task::enqueue(*task); + + // Non-tbb version: + // boost::get<0>(_handler)(data); ++#else ++ this->taskGroup.run(boost::get<0>(_handler), data); ++#endif + } + } + +@@ -465,6 +491,11 @@ namespace gazebo + + /// \brief True if the connection is open. + private: bool isOpen; ++ ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif + }; + /// \} + } +diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc +index b0546e5..17016a4 100644 +--- a/gazebo/transport/ConnectionManager.cc ++++ b/gazebo/transport/ConnectionManager.cc +@@ -27,6 +27,7 @@ + using namespace gazebo; + using namespace transport; + ++#if TBB_VERSION_MAJOR < 2021 + /// TBB task to process nodes. + class TopicManagerProcessTask : public tbb::task + { +@@ -37,20 +38,30 @@ class TopicManagerProcessTask : public tbb::task + return NULL; + } + }; ++#endif + + /// TBB task to establish subscriber to publisher connection. ++#if TBB_VERSION_MAJOR < 2021 + class TopicManagerConnectionTask : public tbb::task ++#else ++class TopicManagerConnectionTask ++#endif + { + /// \brief Constructor. + /// \param[in] _pub Publish message + public: explicit TopicManagerConnectionTask(msgs::Publish _pub) : pub(_pub) {} + + /// Implements the necessary execute function ++#if TBB_VERSION_MAJOR < 2021 + public: tbb::task *execute() + { + TopicManager::Instance()->ConnectSubToPub(pub); + return NULL; + } ++#else ++ public: void operator()() const ++ { TopicManager::Instance()->ConnectSubToPub(pub); } ++#endif + + /// \brief Publish message + private: msgs::Publish pub; +@@ -273,11 +284,6 @@ void ConnectionManager::RunUpdate() + if (this->masterConn) + this->masterConn->ProcessWriteQueue(); + +- // Use TBB to process nodes. Need more testing to see if this makes +- // a difference. +- // TopicManagerProcessTask *task = new(tbb::task::allocate_root()) +- // TopicManagerProcessTask(); +- // tbb::task::enqueue(*task); + boost::recursive_mutex::scoped_lock lock(this->connectionMutex); + + TopicManager::Instance()->ProcessNodes(); +@@ -403,9 +409,13 @@ void ConnectionManager::ProcessMessage(const std::string &_data) + if (pub.host() != this->serverConn->GetLocalAddress() || + pub.port() != this->serverConn->GetLocalPort()) + { ++#if TBB_VERSION_MAJOR < 2021 + TopicManagerConnectionTask *task = new(tbb::task::allocate_root()) + TopicManagerConnectionTask(pub); + tbb::task::enqueue(*task); ++#else ++ this->taskGroup.run(pub); ++#endif + } + } + // publisher_subscribe. This occurs when we try to subscribe to a topic, and +diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh +index ef80eaf..6dc212b 100644 +--- a/gazebo/transport/ConnectionManager.hh ++++ b/gazebo/transport/ConnectionManager.hh +@@ -27,8 +27,11 @@ + #include "gazebo/msgs/msgs.hh" + #include "gazebo/common/SingletonT.hh" + +-#include "gazebo/transport/Publisher.hh" + #include "gazebo/transport/Connection.hh" ++#include "gazebo/transport/Publisher.hh" ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/util/system.hh" + + /// \brief Explicit instantiation for typed SingletonT. +@@ -194,6 +197,11 @@ namespace gazebo + /// \brief Condition used for synchronization + private: boost::condition_variable namespaceCondition; + ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif ++ + // Singleton implementation + private: friend class SingletonT; + }; +diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh +index b7d37f7..7248b72 100644 +--- a/gazebo/transport/Node.hh ++++ b/gazebo/transport/Node.hh +@@ -18,7 +18,12 @@ + #ifndef GAZEBO_TRANSPORT_NODE_HH_ + #define GAZEBO_TRANSPORT_NODE_HH_ + ++#undef emit + #include ++#define emit ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif + #include + #include + #include +@@ -26,6 +31,9 @@ + #include + #include + ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/transport/TransportTypes.hh" + #include "gazebo/transport/TopicManager.hh" + #include "gazebo/util/system.hh" +@@ -36,7 +44,11 @@ namespace gazebo + { + /// \cond + /// \brief Task used by Node::Publish to publish on a one-time publisher ++#if TBB_VERSION_MAJOR < 2021 + class GZ_TRANSPORT_VISIBLE PublishTask : public tbb::task ++#else ++ class GZ_TRANSPORT_VISIBLE PublishTask ++#endif + { + /// \brief Constructor + /// \param[in] _pub Publisher to publish the message on. +@@ -49,16 +61,23 @@ namespace gazebo + this->msg->CopyFrom(_message); + } + ++#if TBB_VERSION_MAJOR < 2021 + /// \brief Overridden function from tbb::task that exectues the + /// publish task. + public: tbb::task *execute() ++#else ++ /// \brief Executes the publish task. ++ public: void operator()() const ++#endif + { + this->pub->WaitForConnection(); + this->pub->Publish(*this->msg, true); + this->pub->SendMessage(); + delete this->msg; ++#if TBB_VERSION_MAJOR < 2021 + this->pub.reset(); + return NULL; ++#endif + } + + /// \brief Pointer to the publisher. +@@ -159,11 +178,15 @@ namespace gazebo + const google::protobuf::Message &_message) + { + transport::PublisherPtr pub = this->Advertise(_topic); ++#if TBB_VERSION_MAJOR < 2021 + PublishTask *task = new(tbb::task::allocate_root()) + PublishTask(pub, _message); + + tbb::task::enqueue(*task); + return; ++#else ++ this->taskGroup.run(pub, _message); ++#endif + } + + /// \brief Advertise a topic +@@ -420,6 +443,10 @@ namespace gazebo + + /// \brief List of newly arrive messages + private: std::map > incomingMsgsLocal; ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif + + private: boost::mutex publisherMutex; + private: boost::mutex publisherDeleteMutex; +diff --git a/gazebo/transport/TaskGroup.hh b/gazebo/transport/TaskGroup.hh +new file mode 100644 +index 0000000..b95b5d8 +--- /dev/null ++++ b/gazebo/transport/TaskGroup.hh +@@ -0,0 +1,47 @@ ++/* ++ * Copyright (C) 2021 Open Source Robotics Foundation ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ * ++*/ ++#ifndef GAZEBO_TRANSPORT_TASKGROUP_HH_ ++#define GAZEBO_TRANSPORT_TASKGROUP_HH_ ++ ++#include ++ ++// Emit is both a macro in Qt and a function defined by tbb ++#undef emit ++#include ++#define emit ++ ++namespace gazebo { ++ namespace transport { ++ class TaskGroup ++ { ++ public: ~TaskGroup() noexcept ++ { ++ // Wait for running tasks to finish ++ this->taskGroup.wait(); ++ } ++ ++ public: template void run(Args&&... args) ++ { ++ this->taskGroup.run(Functor(std::forward(args)...)); ++ } ++ ++ private: tbb::task_group taskGroup; ++ }; ++ } ++} ++ ++#endif +diff --git a/gazebo/transport/transport_pch.hh b/gazebo/transport/transport_pch.hh +index 0119d40..f288de2 100644 +--- a/gazebo/transport/transport_pch.hh ++++ b/gazebo/transport/transport_pch.hh +@@ -21,6 +21,7 @@ + * To get a starting list for this file, I use the command: + * grep --include="*.hh" --include="*.cc" --no-filename -r "#include <" | sort -u + */ ++ + #include + #include + #include +@@ -44,8 +45,18 @@ + #include + #include + #include ++#include ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif ++#if TBB_VERSION_MAJOR < 2021 + #include + #include + #include ++#else ++#undef emit ++#include ++#define emit ++#endif + #include + #include +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 5f2c112..6d09a11 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -49,6 +49,7 @@ target_link_libraries(gz + gazebo_gui + gazebo_physics + gazebo_sensors ++ gazebo_transport + ${Qt5Core_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Boost_LIBRARIES} diff --git a/external_imported/vcpkg/ports/gazebo/portfile.cmake b/external_imported/vcpkg/ports/gazebo/portfile.cmake index 603eab88a..bc8559112 100644 --- a/external_imported/vcpkg/ports/gazebo/portfile.cmake +++ b/external_imported/vcpkg/ports/gazebo/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(gazebo3211 + URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff" + FILENAME "gazebo3211.diff" + SHA512 761e254866d4705acc0b81479285f979c436b3b611739a207a575031d8a8daba48de4fc0c8de5edb9a9f89725586c5caeef9e6e1e3d63a2d961ca09df974f7de +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/gazebo @@ -6,6 +12,8 @@ vcpkg_from_github( HEAD_REF gazebo11 PATCHES 0001-Fix-deps.patch + "${gazebo3211}" + fix-tbb.patch # Effectively https://github.com/osrf/gazebo/pull/3174 with merge conflict resolutions ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -22,20 +30,26 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS graphviz NO_GRAPHVIZ_FEATURE ) -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON - -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF # Not enabled by default, but to be sure ) -vcpkg_cmake_install() +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gazebo-11/gazebo/test") + +foreach(postfix "" "-11") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +endforeach() + vcpkg_copy_tools( TOOL_NAMES gazebo gz gzclient gzserver AUTO_CLEAN @@ -48,5 +62,6 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gazebo/vcpkg.json b/external_imported/vcpkg/ports/gazebo/vcpkg.json index 8f4bd5286..6daf4a7a0 100644 --- a/external_imported/vcpkg/ports/gazebo/vcpkg.json +++ b/external_imported/vcpkg/ports/gazebo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", + "port-version": 4, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/gcem/portfile.cmake b/external_imported/vcpkg/ports/gcem/portfile.cmake index 7d7a7124a..86d33636b 100644 --- a/external_imported/vcpkg/ports/gcem/portfile.cmake +++ b/external_imported/vcpkg/ports/gcem/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kthohr/gcem - REF a20b0fc0206ff7d99a96fe4afdfe8205b01c8220 # v1.13.1 - SHA512 baede14856ddcf8f132c7a16b19d4d646a1fc2d5e3a536a46694a8d7c656ce4ffb2fd61f50a1df78ce7ed31528828152b4e881fe10bcead553985b6103018804 + REF v1.14.1 + SHA512 c4d6d50b541d71552ef5c3467bc2abe448a08627964c612abcfacc381b0f07399bdd03643e0914ad3c89116c3eae37ed96ee2cfce35d7ec47e6c0f53bab91f57 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_fixup_cmake_targets(CONFIG_PATH lib/cmake/gcem) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gcem) -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(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/external_imported/vcpkg/ports/gcem/vcpkg.json b/external_imported/vcpkg/ports/gcem/vcpkg.json index ef9aef715..e7a977299 100644 --- a/external_imported/vcpkg/ports/gcem/vcpkg.json +++ b/external_imported/vcpkg/ports/gcem/vcpkg.json @@ -1,6 +1,17 @@ { "name": "gcem", - "version-string": "1.13.1", - "port-version": 1, - "description": "A C++ compile-time math library using generalized constant expressions" + "version": "1.14.1", + "description": "A C++ compile-time math library using generalized constant expressions", + "homepage": "https://www.kthohr.com/gcem.html", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch b/external_imported/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch deleted file mode 100644 index 76af77b90..000000000 --- a/external_imported/vcpkg/ports/gdal/0001-Fix-debug-crt-flags.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/gdal/nmake.opt b/gdal/nmake.opt -index 8253ae2..9456b79 100644 ---- a/gdal/nmake.opt -+++ b/gdal/nmake.opt -@@ -148,16 +148,26 @@ GDAL_PDB = $(GDAL_ROOT)\gdal$(VERSION)$(POSTFIX).pdb - !ENDIF - - !IFDEF WITH_PDB --CXX_PDB_FLAGS=/Zi /Fd$(GDAL_PDB) -+CXX_PDB_FLAGS=/Z7 /Fd$(GDAL_PDB) - !ELSE - CXX_PDB_FLAGS= - !ENDIF - -+# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) -+# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well -+!IFNDEF CXX_CRT_FLAGS -+!IFNDEF DEBUG -+CXX_CRT_FLAGS=/MD -+!ELSE -+CXX_CRT_FLAGS=/MDd -+!ENDIF -+!ENDIF -+ - !IFNDEF OPTFLAGS - !IF "$(DEBUG)" == "0" --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG - !ELSE --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG - !ENDIF - !ENDIF # OPTFLAGS - -@@ -175,7 +185,7 @@ OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EH - # 4351: new behavior: elements of array 'array' will be default initialized (needed for https://trac.osgeo.org/gdal/changeset/35593) - # 4611: interaction between '_setjmp' and C++ object destruction is non-portable - # --WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 -+WARNFLAGS = /W3 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 - - !ENDIF - diff --git a/external_imported/vcpkg/ports/gdal/0002-Fix-build.patch b/external_imported/vcpkg/ports/gdal/0002-Fix-build.patch deleted file mode 100644 index 9b62737d2..000000000 --- a/external_imported/vcpkg/ports/gdal/0002-Fix-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/gdal/makefile.vc b/gdal/makefile.vc -index 9e0bd44..8559f79 100644 ---- a/gdal/makefile.vc -+++ b/gdal/makefile.vc -@@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS) - call < --#include -+#include - - #include - #include diff --git a/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch b/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch deleted file mode 100644 index 517047bc1..000000000 --- a/external_imported/vcpkg/ports/gdal/0005-Fix-configure.patch +++ /dev/null @@ -1,315 +0,0 @@ -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 30cd613..43f1daf 100644 ---- a/gdal/configure.ac -+++ b/gdal/configure.ac -@@ -48,6 +48,8 @@ dnl Compute the canonical host-system (the system we are building for) - dnl type variable $host - AC_CANONICAL_HOST - -+PKG_PROG_PKG_CONFIG([0.21]) -+ - dnl Enable as much warnings as possible - AC_LANG_PUSH([C]) - AX_COMPILER_VENDOR -@@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) - - if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then - -- dnl Only automatically pick up the external libtiff if it is >= 4.0. -- AC_CHECK_LIB(tiff,TIFFScanlineSize64,TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,) -+ PKG_CHECK_MODULES([TIFF],[libtiff-4 > 4.0], [TIFF_SETTING=external], [TIFF_SETTING=internal HAVE_BIGTIFF=yes]) - - if test "$TIFF_SETTING" = "external" ; then -- LIBS="-ltiff $LIBS" - AC_MSG_RESULT([using pre-installed libtiff.]) -+ EXTRA_INCLUDES="$TIFF_CFLAGS $EXTRA_INCLUDES" -+ SAVED_LIBS="$LIBS" -+ LIBS="$TIFF_LIBS" -+ AC_SEARCH_LIBS(TIFFScanlineSize64,[],HAVE_BIGTIFF=yes,HAVE_BIGTIFF=no,) -+ LIBS="$TIFF_LIBS $SAVED_LIBS" - else - AC_MSG_RESULT([using internal TIFF code.]) - fi -@@ -1402,22 +1407,28 @@ AC_ARG_WITH(curl, - dnl Clear some cache variables - unset ac_cv_path_LIBCURL - -+LIBCURL_MODVERSION= - if test "`basename xx/$with_curl`" = "curl-config" ; then - LIBCURL_CONFIG="$with_curl" - elif test "$with_curl" = "no" ; then - LIBCURL_CONFIG=no -+elif test "$with_curl" = "yes" -o "$with_curl" = "" ; then -+ PKG_CHECK_EXISTS([libcurl], [LIBCURL_CONFIG="${PKG_CONFIG} libcurl"], [LIBCURL_CONFIG=false]) -+ LIBCURL_MODVERSION=`$LIBCURL_CONFIG --modversion` - else - AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no) - fi - - if test "$LIBCURL_CONFIG" != "no" ; then - -- CURL_VERNUM=`$LIBCURL_CONFIG --vernum` -- CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'` -+ CURL_VER="`$LIBCURL_CONFIG --version | awk '{print $2}'`$LIBCURL_MODVERSION" - - AC_MSG_RESULT([ found libcurl version $CURL_VER]) - -- AC_CHECK_LIB(curl,curl_global_init,CURL_SETTING=yes,CURL_SETTING=no,`$LIBCURL_CONFIG --libs`) -+ SAVED_LIBS="$LIBS" -+ LIBS=`$LIBCURL_CONFIG --libs` -+ AC_SEARCH_LIBS(curl_global_init,[],CURL_SETTING=yes,CURL_SETTING=no,) -+ LIBS="$SAVED_LIBS" - - fi - -@@ -1431,7 +1442,9 @@ dnl Proj depends on it so it must appear before. - dnl --------------------------------------------------------------------------- - - SQLITE3_REQ_VERSION="3.0.0" --AX_LIB_SQLITE3($SQLITE3_REQ_VERSION) -+AC_CHECK_LIB(sqlite3,sqlite3_open,HAVE_SQLITE3=yes,AC_MSG_ERROR([vcpkg sqlite3 not found]),) -+SQLITE3_CFLAGS= -+SQLITE3_LDFLAGS=-lsqlite3 - - if test "$HAVE_SQLITE3" = "yes"; then - LIBS="$SQLITE3_LDFLAGS $LIBS" -@@ -1571,6 +1584,11 @@ HAVE_SPATIALITE=no - if test -z "$with_spatialite" -o "$with_spatialite" = "no"; then - AC_MSG_RESULT(disabled) - elif test "$with_spatialite" = "yes"; then -+ PKG_CHECK_MODULES([SPATIALITE],[spatialite >= 5],[HAVE_SPATIALITE=yes],AC_MSG_ERROR([vcpkg libspatialite not found])) -+ SPATIALITE_INC="$SPATIALITE_CFLAGS" -+ LIBS="$LIBS $SPATIALITE_LIBS" -+ ac_cv_lib_spatialite_spatialite_target_cpu=yes -+elif false; then - AC_CHECK_HEADERS(sqlite3.h) - if test "$ac_cv_header_sqlite3_h" = "yes"; then - AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include]) -@@ -1639,6 +1652,19 @@ dnl --------------------------------------------------------------------------- - AC_ARG_WITH(liblzma,[ --with-liblzma[=ARG] Include liblzma support (ARG=yes/no)],,) - - if test "$with_liblzma" = "yes" ; then -+ PKG_CHECK_MODULES([LIBLZMA],[liblzma],[HAVE_LIBLZMA_PC=yes],[HAVE_LIBLZMA_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$LIBLZMA_LIBS" -+ AC_SEARCH_LIBS(lzma_code,[],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) -+ if test "$LIBLZMA_SETTING" = "yes" ; then -+ LIBS="$LIBLZMA_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBLZMA_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg liblzma broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false; then - AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) - AC_CHECK_HEADERS(lzma.h) - -@@ -1661,6 +1687,19 @@ dnl --------------------------------------------------------------------------- - AC_ARG_WITH(zstd,[ --with-zstd[=ARG] Include zstd support (ARG=yes/no/installation_prefix)],,) - - if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then -+ PKG_CHECK_MODULES([ZSTD],[libzstd],[HAVE_LIBZSTD_PC=yes],[HAVE_LIBZSTD_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$ZSTD_LIBS" -+ AC_SEARCH_LIBS(ZSTD_decompressStream,[],ZSTD_SETTING=yes,ZSTD_SETTING=no,) -+ if test "$ZSTD_SETTING" = "yes" ; then -+ LIBS="$ZSTD_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBZSTD_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libzstd broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false; then - AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,) - - if test "$ZSTD_SETTING" = "yes" ; then -@@ -1962,6 +2001,12 @@ else - SAVED_LIBS="${LIBS}" - LIBS="${PG_LIB}" - AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no) -+ if test "${HAVE_PG}" = "no" ; then -+ unset ac_cv_lib_pq_PQconnectdb -+ PG_LIB="${PG_LIB} -lpgcommon -lpgport" -+ LIBS="${PG_LIB} ${SAVED_LIBS}" -+ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,[-lpgcommon -lpgport]) -+ fi - LIBS="${SAVED_LIBS}" - if test "${HAVE_PG}" = "yes" ; then - LIBS="${PG_LIB} ${LIBS}" -@@ -2322,6 +2367,15 @@ AC_ARG_WITH(geotiff,[ --with-geotiff=ARG Libgeotiff library to use (ARG=inte - - if test "$with_geotiff" = "yes" -o "$with_geotiff" = "" ; then - -+ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=internal) -+ if test $GEOTIFF_SETTING = "external" ; then -+ LIBS="-lgeotiff $LIBS" -+ else -+ AC_MSG_ERROR([vcpkg geotiff broken]) -+ fi -+ -+elif false; then -+ - if test "$TIFF_SETTING" = "internal" ; then - GEOTIFF_SETTING=internal - else -@@ -3005,7 +3059,7 @@ elif test "$with_hdf5" = "yes" -o "$with_hdf5" = "" ; then - # Test that the package found is for the right architecture - saved_LIBS="$LIBS" - LIBS="$HDF5_LIBS" -- AC_CHECK_LIB(hdf5,H5Fopen, [HAVE_HDF5=yes], [HAVE_HDF5=no]) -+ AC_SEARCH_LIBS(H5Fopen,[],[HAVE_HDF5=yes],[HAVE_HDF5=no],) - LIBS="$saved_LIBS" - - if test "$HAVE_HDF5" = "yes"; then -@@ -3135,6 +3189,24 @@ if test "$with_netcdf" = "no" ; then - - echo "netCDF support disabled." - -+elif true ; then -+ -+ PKG_CHECK_MODULES([NETCDF],[netcdf],[HAVE_NETCDF_PC=yes],[HAVE_NETCDF_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$NETCDF_LIBS" -+ AC_SEARCH_LIBS(nc_open,[],NETCDF_SETTING=yes,NETCDF_SETTING=no,) -+ if test "$NETCDF_SETTING" = "yes" ; then -+ LIBS="$NETCDF_LIBS $SAVED_LIBS" -+ EXTRA_INCLUDES="$NETCDF_CFLAGS $EXTRA_INCLUDES" -+ PKG_CHECK_VAR([NETCDF_ROOT],[netcdf],[prefix],,) -+ PKG_CHECK_VAR([NETCDF_INCLUDEDIR],[netcdf],[includedir],,) -+ NETCDF_NCCONFIG= -+ elif test "$HAVE_NETCDF_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg netcdf-c broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ - else - - dnl find nc-config location -@@ -3355,6 +3427,21 @@ if test "$with_openjpeg" = "no" ; then - - AC_MSG_NOTICE([OpenJPEG (JPEG2000) support disabled.]) - -+elif true ; then -+ -+ PKG_CHECK_MODULES([OPENJPEG],[libopenjp2 >= 2.1.0],[HAVE_LIBOPENJP2_PC=yes],[HAVE_LIBOPENJP2_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$OPENJPEG_LIBS" -+ AC_SEARCH_LIBS(opj_setup_decoder,[],HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) -+ if test "$HAVE_OPENJPEG" = "yes" ; then -+ EXTRA_INCLUDES="$OPENJPEG_CFLAGS $EXTRA_INCLUDES" -+ LIBS="$OPENJPEG_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBOPENJP2_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libopenjpeg broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ - else - - PKG_PROG_PKG_CONFIG([0.21]) -@@ -4046,7 +4133,9 @@ dnl --------------------------------------------------------------------------- - - dnl Expat 1.95.0 released in 2000-09-28 - EXPAT_REQ_VERSION="1.95.0" --AX_LIB_EXPAT($EXPAT_REQ_VERSION) -+PKG_CHECK_MODULES([EXPAT],[expat],[HAVE_EXPAT=yes],[AC_MSG_ERROR([vcpkg expat not found])]) -+EXPAT_LDFLAGS="$EXPAT_LIBS" -+EXPAT_INCLUDE="" - - if test "$HAVE_EXPAT" = "yes"; then - LIBS="$EXPAT_LDFLAGS $LIBS" -@@ -4069,7 +4158,13 @@ dnl Check for Google libkml support. - dnl --------------------------------------------------------------------------- - - LIBKML_REQ_VERSION="1.3.0" -+if test "x${with_libkml}" = "xno"; then -+ echo "libkml support disabled." -+ HAVE_LIBKML="no" -+ LIBKML_CFLAGS= -+else - AX_LIB_LIBKML($LIBKML_REQ_VERSION) -+fi - - if test "$HAVE_LIBKML" = "yes"; then - LIBS="$LIBKML_LDFLAGS $LIBS" -@@ -4252,8 +4347,8 @@ else - dnl Add curl to LIBS; it might be local to DODS or generally installed - if test -x $DODS_BIN/curl-config; then - LIBS="$LIBS `$DODS_BIN/curl-config --libs`" -- elif which curl-config > /dev/null 2>&1; then -- LIBS="$LIBS `curl-config --libs`" -+ elif test "$CURL_SETTING" = "yes"; then -+ LIBS="$LIBS $CURL_LIB" - else - AC_MSG_ERROR([You gave a dods root, but I can't find curl!]) - fi -@@ -4295,7 +4390,7 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then - if test "${HAVE_LIBXML2}" = "yes"; then - SAVED_LIBS="${LIBS}" - LIBS="${LIBXML2_LIBS}" -- AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no) -+ AC_SEARCH_LIBS(xmlParseDoc,[],HAVE_LIBXML2=yes,HAVE_LIBXML2=no,) - LIBS="${SAVED_LIBS}" - fi - -@@ -4509,6 +4604,22 @@ WEBP_SETTING=no - - if test "$with_webp" = "yes" -o "$with_webp" = "" ; then - -+ PKG_CHECK_MODULES([WEBP],[libwebp],[HAVE_LIBWEBP_PC=yes],[HAVE_LIBWEBP_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$WEBP_LIBS" -+ AC_SEARCH_LIBS(WebPDecodeRGB,[],WEBP_SETTING=yes,WEBP_SETTING=no,) -+ -+ if test "$WEBP_SETTING" = "yes" ; then -+ LIBS="$WEBP_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBWEBP_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libwebp broken]) -+ else -+ echo "libwebp not found - WEBP support disabled" -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false ; then -+ - AC_CHECK_LIB(webp,WebPDecodeRGB,WEBP_SETTING=yes,WEBP_SETTING=no,) - - if test "$WEBP_SETTING" = "yes" ; then -@@ -4540,7 +4651,7 @@ dnl --------------------------------------------------------------------------- - dnl Check if geos library is available. - dnl --------------------------------------------------------------------------- - --GEOS_INIT(3.1.0) -+PKG_CHECK_MODULES(GEOS,geos >= 3.1.0,HAVE_GEOS=yes,AC_MSG_ERROR([vcpkg geos not found])) - if test "${HAVE_GEOS}" = "yes" ; then - AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION]) - STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}") -@@ -4779,6 +4890,16 @@ dnl --------------------------------------------------------------------------- - - AC_ARG_WITH(libjson-c,[ --with-libjson-c[=ARG] Include libjson-c support (ARG=internal or libjson-c directory)],,) - -+PKG_CHECK_MODULES([JSONC],[json-c],[HAVE_JSONC=yes],[HAVE_JSONC=no]) -+SAVED_LIBS="$LIBS" -+LIBS="$JSONC_LIBS" -+AC_SEARCH_LIBS(json_object_set_serializer,[],LIBJSONC_SETTING=external,LIBJSONC_SETTING=,) -+if test "$LIBJSONC_SETTING" = "external" ; then -+ LIBS="$JSONC_LIBS $SAVED_LIBS" -+ JSON_INCLUDE="$JSONC_CFLAGS" -+else -+ LIBS="$SAVED_LIBS" -+ - if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjson_c" = "yes" ; then - AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) - elif test "$with_libjson_c" = "internal" ; then -@@ -4807,6 +4928,8 @@ else - AC_MSG_RESULT([using internal libjson-c code]) - fi - -+fi # json-c.pc -+ - AC_SUBST(LIBJSONC_SETTING,$LIBJSONC_SETTING) - AC_SUBST(JSON_INCLUDE,$JSON_INCLUDE) - diff --git a/external_imported/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch b/external_imported/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch deleted file mode 100644 index a07dc0ec3..000000000 --- a/external_imported/vcpkg/ports/gdal/0006-Fix-mingw-dllexport.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/port/cpl_port.h b/gdal/port/cpl_port.h -index 98805cf..a6a1846 100644 ---- a/gdal/port/cpl_port.h -+++ b/gdal/port/cpl_port.h -@@ -343,7 +343,7 @@ typedef unsigned int GUIntptr_t; - #endif - - #ifndef CPL_DLL --#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL) -+#if defined(WIN32) && !defined(CPL_DISABLE_DLL) - # ifdef GDAL_COMPILATION - # define CPL_DLL __declspec(dllexport) - # else diff --git a/external_imported/vcpkg/ports/gdal/0007-Control-tools.patch b/external_imported/vcpkg/ports/gdal/0007-Control-tools.patch deleted file mode 100644 index fd1f5c9a3..000000000 --- a/external_imported/vcpkg/ports/gdal/0007-Control-tools.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in -index e8d2b05..1f19a4b 100644 ---- a/gdal/GDALmake.opt.in -+++ b/gdal/GDALmake.opt.in -@@ -662,3 +662,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) - - %-clean: - $(MAKE) -C $* clean -+ -+ -+BUILD_TOOLS = @BUILD_TOOLS@ -\ No newline at end of file -diff --git a/gdal/apps/GNUmakefile b/gdal/apps/GNUmakefile -index 9624cf7..f91403d 100644 ---- a/gdal/apps/GNUmakefile -+++ b/gdal/apps/GNUmakefile -@@ -43,6 +43,11 @@ NON_DEFAULT_LIST = multireadtest$(EXE) dumpoverviews$(EXE) \ - gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \ - gdalasyncread$(EXE) testreprojmulti$(EXE) - -+ifeq ($(BUILD_TOOLS),no) -+BIN_LIST = -+NON_DEFAULT_LIST = -+endif -+ - default: gdal-config-inst gdal-config $(BIN_LIST) - - all: default $(NON_DEFAULT_LIST) -diff --git a/gdal/apps/makefile.vc b/gdal/apps/makefile.vc -index 6e1fc9b..66f9b29 100644 ---- a/gdal/apps/makefile.vc -+++ b/gdal/apps/makefile.vc -@@ -20,6 +20,7 @@ GNM_PROGRAMS = gnmmanage.exe gnmanalyse.exe - !ENDIF - - -+!IF "$(BUILD_TOOLS)" == "1" - default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ - nearblack.exe gdalmanage.exe gdalenhance.exe gdaltransform.exe\ - gdaldem.exe gdallocationinfo.exe gdalsrsinfo.exe gdalmdiminfo.exe \ -@@ -28,6 +29,10 @@ default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ - all: default multireadtest.exe \ - dumpoverviews.exe gdalwarpsimple.exe gdalflattenmask.exe \ - gdaltorture.exe gdal2ogr.exe test_ogrsf.exe -+!ELSE -+default: -+all: -+!ENDIF - OBJ = commonutils.obj gdalinfo_lib.obj gdal_translate_lib.obj gdalwarp_lib.obj ogr2ogr_lib.obj \ - gdaldem_lib.obj nearblack_lib.obj gdal_grid_lib.obj gdal_rasterize_lib.obj gdalbuildvrt_lib.obj \ - gdalmdiminfo_lib.obj gdalmdimtranslate_lib.obj -@@ -223,5 +228,9 @@ clean: - -del *.manifest - -del *.exp - -+!IF "$(BUILD_TOOLS)" == "1" - install: default - copy *.exe $(BINDIR) -+!ELSE -+install: -+!ENDIF -\ No newline at end of file -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 1098b39..e4d985e 100644 ---- a/gdal/configure.ac -+++ b/gdal/configure.ac -@@ -6165,6 +6165,16 @@ case "${host_os}" in - ;; - esac - -+BUILD_TOOLS=yes -+AC_ARG_WITH([tools], AS_HELP_STRING([--with-tools], [Build the tools]),,) -+if test "$with_tools" = "yes"; then -+ AC_MSG_RESULT([enabled]) -+else -+ BUILD_TOOLS=no -+ AC_MSG_RESULT([disabled by user]) -+fi -+AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) -+ - AC_CONFIG_FILES([GDALmake.opt]) - AC_OUTPUT - diff --git a/external_imported/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch b/external_imported/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch deleted file mode 100644 index ff5af90f6..000000000 --- a/external_imported/vcpkg/ports/gdal/0008-Fix-absl-string_view.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -index 9557380..17edcf8 100644 ---- a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -+++ b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -@@ -213,7 +213,7 @@ namespace flatbuffers { - } - #define FLATBUFFERS_HAS_STRING_VIEW 1 - // Check for absl::string_view -- #elif __has_include("absl/strings/string_view.h") -+ #elif __has_include("absl/strings/string_view.h") && 0 - #include "absl/strings/string_view.h" - namespace flatbuffers { - typedef absl::string_view string_view; diff --git a/external_imported/vcpkg/ports/gdal/0009-atlbase.patch b/external_imported/vcpkg/ports/gdal/0009-atlbase.patch deleted file mode 100644 index b2c423e1c..000000000 --- a/external_imported/vcpkg/ports/gdal/0009-atlbase.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/gdal/nmake.opt b/gdal/nmake.opt -index 7e7871e..ac01bf2 100644 ---- a/gdal/nmake.opt -+++ b/gdal/nmake.opt -@@ -239,6 +239,11 @@ STDCALL=YES - VERSION = 304 - !ENDIF - -+# Set HAVE_ATLBASE_H=NO if atlbase.h header is not available -+!IFNDEF HAVE_ATLBASE_H -+HAVE_ATLBASE_H=YES -+!ENDIF -+ - # Comment the following out if you want PAM supported disabled - # by default. - !IFNDEF PAM_SETTING -diff --git a/gdal/port/cpl_aws.cpp b/gdal/port/cpl_aws.cpp -index eed23f9..e3a1578 100644 ---- a/gdal/port/cpl_aws.cpp -+++ b/gdal/port/cpl_aws.cpp -@@ -43,7 +43,7 @@ CPL_CVSID("$Id$") - // #define DEBUG_VERBOSE 1 - - #ifdef WIN32 --#if defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - bool CPLFetchWindowsProductUUID(CPLString &osStr); // defined in cpl_aws_win32.cpp - #endif - const char* CPLGetWineVersion(); // defined in cpl_vsil_win32.cpp -@@ -688,7 +688,7 @@ static bool IsMachinePotentiallyEC2Instance() - } - else - { --#if defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - CPLString osMachineUUID; - if( CPLFetchWindowsProductUUID(osMachineUUID) ) - { -diff --git a/gdal/port/cpl_aws_win32.cpp b/gdal/port/cpl_aws_win32.cpp -index 7742a35..98be522 100644 ---- a/gdal/port/cpl_aws_win32.cpp -+++ b/gdal/port/cpl_aws_win32.cpp -@@ -28,7 +28,7 @@ - - #include "cpl_port.h" - --#if defined(WIN32) && defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - - #define _WIN32_DCOM - #include -@@ -140,4 +140,4 @@ bool CPLFetchWindowsProductUUID(CPLString &osStr) - return !osWindowsProductUUID.empty(); - } - --#endif /* defined(WIN32) && defined(_MSC_VER) */ -+#endif /* defined(HAVE_ATLBASE_H) */ -diff --git a/gdal/port/makefile.vc b/gdal/port/makefile.vc -index a8b0e02..68da2dd 100644 ---- a/gdal/port/makefile.vc -+++ b/gdal/port/makefile.vc -@@ -141,6 +141,10 @@ EXTRAFLAGS = $(EXTRAFLAGS) $(LZ4_CFLAGS) -DHAVE_LZ4 - ODBC_OBJ = cpl_odbc.obj - !ENDIF - -+!IF "$(HAVE_ATLBASE_H)" == "YES" -+EXTRAFLAGS = $(EXTRAFLAGS) -DHAVE_ATLBASE_H -+!ENDIF -+ - default: prev_dllbuild cpl_config.h $(LIB) - - $(LIB): $(OBJ) diff --git a/external_imported/vcpkg/ports/gdal/0010-symprefix.patch b/external_imported/vcpkg/ports/gdal/0010-symprefix.patch deleted file mode 100644 index e21fb8d77..000000000 --- a/external_imported/vcpkg/ports/gdal/0010-symprefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/makefile.vc b/gdal/makefile.vc -index 9de546c..56f617d 100644 ---- a/gdal/makefile.vc -+++ b/gdal/makefile.vc -@@ -27,7 +27,7 @@ OGR_INCLUDE = $(OGR_BASE_INCLUDE) \ - CPPFLAGS = $(CPPFLAGS) -DGNM_ENABLED - !ENDIF - --!IF DEFINED(STDCALL) && !DEFINED(WIN64) -+!IF DEFINED(STDCALL) && !DEFINED(WIN64) && "$(SYM_PREFIX)" == "_" - - BASE_INCLUDE = /INCLUDE:_GDALSimpleImageWarp@36 \ - /INCLUDE:_GDALReprojectImage@48 \ diff --git a/external_imported/vcpkg/ports/gdal/dependency_win.cmake b/external_imported/vcpkg/ports/gdal/dependency_win.cmake deleted file mode 100644 index b31ed3546..000000000 --- a/external_imported/vcpkg/ports/gdal/dependency_win.cmake +++ /dev/null @@ -1,219 +0,0 @@ -macro(find_dependency_win) - # curl - x_vcpkg_pkgconfig_get_modules(PREFIX CURL MODULES --msvc-syntax libcurl INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "CURL_INC=${CURL_INCLUDE_DIRS_RELEASE}" "CURL_LIB=${CURL_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "CURL_INC=${CURL_INCLUDE_DIRS_DEBUG}" "CURL_LIB=${CURL_LIBS_DEBUG}") - - # expat - list(APPEND NMAKE_OPTIONS "EXPAT_DIR=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX EXPAT MODULES --msvc-syntax expat INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_DEBUG}") - - # geos - x_vcpkg_pkgconfig_get_modules(PREFIX GEOS MODULES --msvc-syntax geos INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_RELEASE} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_DEBUG} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_DEBUG}") - - # libgeotiff - list(APPEND NMAKE_OPTIONS "GEOTIFF_INC=-I${CURRENT_INSTALLED_DIR}/include") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") - list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib") - else() - # libgeotiff may need tiff and proj4, but these are added separately, with all transitive deps. - list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff.lib") - list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d.lib") - endif() - - # libiconv - # There is no pc file, and CMake added the Find module in version 3.11. - list(APPEND extra_exports ICONV) - set(ICONV_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib") - set(ICONV_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib") - list(APPEND NMAKE_OPTIONS "LIBICONV_INCLUDE=-I${CURRENT_INSTALLED_DIR}/include" "LIBICONV_CFLAGS=-DICONV_CONST=") - list(APPEND NMAKE_OPTIONS_REL "LIBICONV_LIBRARY=${ICONV_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LIBICONV_LIBRARY=${ICONV_LIBS_DEBUG}") - - # libjpeg-turbo - list(APPEND NMAKE_OPTIONS "JPEG_EXTERNAL_LIB=1" "JPEGDIR=${CURRENT_INSTALLED_DIR}/include") - x_vcpkg_pkgconfig_get_modules(PREFIX JPEG MODULES --msvc-syntax libjpeg LIBS) - list(APPEND NMAKE_OPTIONS_REL "JPEG_LIB=${JPEG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "JPEG_LIB=${JPEG_LIBS_DEBUG}") - - # liblzma - x_vcpkg_pkgconfig_get_modules(PREFIX LZMA MODULES --msvc-syntax liblzma INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_RELEASE}" "LZMA_LIBS=${LZMA_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_DEBUG}" "LZMA_LIBS=${LZMA_LIBS_DEBUG}") - - # libpng - list(APPEND NMAKE_OPTIONS "PNG_EXTERNAL_LIB=1" "PNGDIR=${CURRENT_INSTALLED_DIR}/include") - x_vcpkg_pkgconfig_get_modules(PREFIX PNG MODULES --msvc-syntax libpng LIBS) - list(APPEND NMAKE_OPTIONS_REL "PNG_LIB=${PNG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "PNG_LIB=${PNG_LIBS_DEBUG}") - - # libwebp - list(APPEND NMAKE_OPTIONS "WEBP_ENABLED=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX WEBP MODULES --msvc-syntax libwebp INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_RELEASE}" "WEBP_LIBS=${WEBP_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_DEBUG}" "WEBP_LIBS=${WEBP_LIBS_DEBUG}") - - # libxml2 - x_vcpkg_pkgconfig_get_modules(PREFIX LIBXML2 MODULES --msvc-syntax libxml-2.0 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_RELEASE}" "LIBXML2_LIB=${LIBXML2_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_DEBUG}" "LIBXML2_LIB=${LIBXML2_LIBS_DEBUG}") - - # openjpeg - list(APPEND NMAKE_OPTIONS "OPENJPEG_ENABLED=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX OPENJPEG MODULES --msvc-syntax libopenjp2 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_RELEASE}" "OPENJPEG_LIB=${OPENJPEG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_DEBUG}" "OPENJPEG_LIB=${OPENJPEG_LIBS_DEBUG}") - - # proj - x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES --msvc-syntax proj INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_RELEASE}" "PROJ_LIBRARY=${PROJ_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_DEBUG}" "PROJ_LIBRARY=${PROJ_LIBS_DEBUG}") - - # sqlite3 and spatialite - if ("libspatialite" IN_LIST FEATURES) - list(APPEND extra_exports SPATIALITE) - list(APPEND NMAKE_OPTIONS "SPATIALITE_412_OR_LATER=yes") - x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax spatialite sqlite3 INCLUDE_DIRS LIBS) - string(APPEND SQLITE_INCLUDE_DIRS_RELEASE " -DHAVE_SPATIALITE") - string(APPEND SQLITE_INCLUDE_DIRS_DEBUG " -DHAVE_SPATIALITE") - else() - x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax sqlite3 INCLUDE_DIRS LIBS) - endif() - list(APPEND NMAKE_OPTIONS_REL "SQLITE_INC=${SQLITE_INCLUDE_DIRS_RELEASE}" "SQLITE_LIB=${SQLITE_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "SQLITE_INC=${SQLITE_INCLUDE_DIRS_DEBUG}" "SQLITE_LIB=${SQLITE_LIBS_DEBUG}") - - # tiff - x_vcpkg_pkgconfig_get_modules(PREFIX TIFF MODULES --msvc-syntax libtiff-4 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "TIFF_INC=${TIFF_INCLUDE_DIRS_RELEASE} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "TIFF_INC=${TIFF_INCLUDE_DIRS_DEBUG} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_DEBUG}") - - # zlib - list(APPEND NMAKE_OPTIONS "ZLIB_EXTERNAL_LIB=1") - x_vcpkg_pkgconfig_get_modules(PREFIX ZLIB MODULES --msvc-syntax zlib INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "ZLIB_INC=${ZLIB_INCLUDE_DIRS_RELEASE}" "ZLIB_LIB=${ZLIB_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "ZLIB_INC=${ZLIB_INCLUDE_DIRS_DEBUG}" "ZLIB_LIB=${ZLIB_LIBS_DEBUG}") - - # zstd - x_vcpkg_pkgconfig_get_modules(PREFIX ZSTD MODULES --msvc-syntax libzstd INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_RELEASE}" "ZSTD_LIBS=${ZSTD_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_DEBUG}" "ZSTD_LIBS=${ZSTD_LIBS_DEBUG}") - - # Features - - if ("cfitsio" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "FITS_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "FITS_PLUGIN=NO") - list(APPEND NMAKE_OPTIONS_REL "FITS_LIB=${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib") - list(APPEND NMAKE_OPTIONS_DBG "FITS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib") - endif() - - if("hdf5" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) - x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS) - list(APPEND NMAKE_OPTIONS "HDF5_DIR=${CURRENT_INSTALLED_DIR}" "HDF5_PLUGIN=NO") - list(APPEND NMAKE_OPTIONS_REL "HDF5_LIB=${HDF5_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "HDF5_LIB=${HDF5_LIBS_DEBUG}") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND NMAKE_OPTIONS "HDF5_H5_IS_DLL=YES") - endif() - endif() - - if("mysql-libmariadb" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${CURRENT_INSTALLED_DIR}/include/mysql") - list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib") - list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib") - endif() - - if("netcdf" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "NETCDF_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "NETCDF_SETTING=yes" "NETCDF_PLUGIN=NO") - x_vcpkg_pkgconfig_get_modules(PREFIX NETCDF MODULES --msvc-syntax netcdf LIBS) - list(APPEND NMAKE_OPTIONS_REL "NETCDF_LIB=${NETCDF_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "NETCDF_LIB=${NETCDF_LIBS_DEBUG}") - endif() - - if("poppler" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES") - list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=1") # Bump as needed - list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17") - x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS) - list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "POPPLER_LIBS=${POPPLER_LIBS_DEBUG}") - endif() - - if("postgresql" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "PG_INC_DIR=${CURRENT_INSTALLED_DIR}/include") - x_vcpkg_pkgconfig_get_modules(PREFIX OPENSSL MODULES --msvc-syntax openssl LIBS) - set(PGSQL_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/lib/libpgport.lib") - list(APPEND NMAKE_OPTIONS_REL "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_RELEASE}") - set(PGSQL_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libpq.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgcommon.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libpgport.lib") - list(APPEND NMAKE_OPTIONS_DBG "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBS_DEBUG}") - endif() - - # Dependencies which are not in vpckg.json - - # cryptopp - if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CRYPTOPP_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cryptopp-static.lib" CRYPTOPP_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS CRYPTOPP_INC=-I${CRYPTOPP_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG CRYPTOPP_LIB=${CRYPTOPP_LIBRARY_DBG}) - endif() - - # freexl - if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/freexl.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FREEXL_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/freexl.lib" FREEXL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib" FREEXL_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS FREEXL_CFLAGS=-I${FREEXL_INCLUDE}) - list(APPEND NMAKE_OPTIONS_REL FREEXL_LIBS=${FREEXL_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG FREEXL_LIBS=${FREEXL_LIBRARY_DBG}) - endif() - - # libkml - if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" LIBKML_DIR) - list(APPEND NMAKE_OPTIONS LIBKML_DIR=${LIBKML_DIR}) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LIBKML_INCLUDE) - list(APPEND NMAKE_OPTIONS LIBKML_INCLUDE=-I${LIBKML_INCLUDE}) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib" KMLBASE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlbase.lib" KMLBASE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlconvenience.lib" KMLCONVENIENCE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlconvenience.lib" KMLCONVENIENCE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmldom.lib" KMLDOM_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmldom.lib" KMLDOM_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlengine.lib" KMLENGINE_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlengine.lib" KMLENGINE_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlregionator.lib" KMLREGIONATOR_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlregionator.lib" KMLREGIONATOR_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/kmlxsd.lib" KMLXSD_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/kmlxsd.lib" KMLXSD_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/bz2.lib" BZIP2_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/bz2d.lib" BZIP2_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/minizip.lib" MINIZIP_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/minizip.lib" MINIZIP_DBG) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/uriparser.lib" URIPARSER_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/uriparser.lib" URIPARSER_DBG) - list(APPEND NMAKE_OPTIONS_REL "LIBKML_LIBS=${KMLBASE_REL} ${KMLCONVENIENCE_REL} ${KMLDOM_REL} ${KMLENGINE_REL} ${KMLREGIONATOR_REL} ${KMLXSD_REL} ${BZIP2_REL} ${MINIZIP_REL} ${URIPARSER_REL} ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL}") - list(APPEND NMAKE_OPTIONS_DBG "LIBKML_LIBS=${KMLBASE_DBG} ${KMLCONVENIENCE_DBG} ${KMLDOM_DBG} ${KMLENGINE_DBG} ${KMLREGIONATOR_DBG} ${KMLXSD_DBG} ${BZIP2_DBG} ${MINIZIP_DBG} ${URIPARSER_DBG} ${EXPAT_LIBRARY_DBG} ${ZLIB_LIBRARY_DBG}") - endif() - - # xerces-c - if("system-libraries" IN_LIST FEATURES AND EXISTS "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" XERCES_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XERCES_INCLUDE) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/xerces-c_3.lib" XERCES_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/xerces-c_3D.lib" XERCES_LIBRARY_DBG) - list(APPEND NMAKE_OPTIONS ILI_ENABLED=YES) - list(APPEND NMAKE_OPTIONS XERCES_DIR=${XERCES_DIR}) - list(APPEND NMAKE_OPTIONS "XERCES_INCLUDE=-I${XERCES_INCLUDE} -I${XERCES_INCLUDE}/xercesc") - list(APPEND NMAKE_OPTIONS_REL XERCES_LIB=${XERCES_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG XERCES_LIB=${XERCES_LIBRARY_DBG}) - endif() - -endmacro() diff --git a/external_imported/vcpkg/ports/gdal/find-link-libraries.patch b/external_imported/vcpkg/ports/gdal/find-link-libraries.patch new file mode 100644 index 000000000..8ee81f4d5 --- /dev/null +++ b/external_imported/vcpkg/ports/gdal/find-link-libraries.patch @@ -0,0 +1,109 @@ +diff --git a/cmake/modules/packages/FindFreeXL.cmake b/cmake/modules/packages/FindFreeXL.cmake +index 6c86fb8..0634412 100644 +--- a/cmake/modules/packages/FindFreeXL.cmake ++++ b/cmake/modules/packages/FindFreeXL.cmake +@@ -37,7 +37,15 @@ include(SelectLibraryConfigurations) + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_FREEXL QUIET freexl) ++ pkg_check_modules(PC_FREEXL QUIET IMPORTED_TARGET freexl) ++endif() ++if(PC_FREEXL_FOUND) ++ set(FREEXL_INCLUDE_DIR "${PC_FREEXL_INCLUDE_DIRS}" CACHE STRING "") ++ set(FREEXL_LIBRARY "${PC_FREEXL_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET FREEXL::freexl) ++ add_library(FREEXL::freexl INTERFACE IMPORTED) ++ set_target_properties(FREEXL::freexl PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_FREEXL) ++ endif() + endif() + + find_path(FREEXL_INCLUDE_DIR +diff --git a/cmake/modules/packages/FindOpenJPEG.cmake b/cmake/modules/packages/FindOpenJPEG.cmake +index c697484..6e83222 100644 +--- a/cmake/modules/packages/FindOpenJPEG.cmake ++++ b/cmake/modules/packages/FindOpenJPEG.cmake +@@ -32,9 +32,18 @@ endfunction() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_OPENJPEG QUIET libopenjp2) ++ pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2) + set(OPENJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION}) + endif() ++if(PC_OPENJPEG_FOUND) ++ set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "") ++ set(OPENJPEG_LIBRARY "${PC_OPENJPEG_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET OPENJPEG::OpenJPEG) ++ add_library(OPENJPEG::OpenJPEG INTERFACE IMPORTED) ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PC_OPENJPEG_INCLUDE_DIRS}") ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_OPENJPEG) ++ endif() ++endif() + + + find_path(OPENJPEG_INCLUDE_DIR opj_config.h +diff --git a/cmake/modules/packages/FindPoppler.cmake b/cmake/modules/packages/FindPoppler.cmake +index 3807ec0..8059eb4 100644 +--- a/cmake/modules/packages/FindPoppler.cmake ++++ b/cmake/modules/packages/FindPoppler.cmake +@@ -42,11 +42,19 @@ This module defines the following variables: + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_Poppler QUIET poppler) ++ pkg_check_modules(PC_Poppler QUIET IMPORTED_TARGET poppler) + if(PC_Poppler_VERSION) + set(Poppler_VERSION_STRING ${PC_Poppler_VERSION}) + endif() + endif() ++if(PC_Poppler_FOUND) ++ set(Poppler_INCLUDE_DIR "${PC_Poppler_INCLUDE_DIRS}" CACHE STRING "") ++ set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler) ++ add_library(Poppler::Poppler INTERFACE IMPORTED) ++ set_target_properties(Poppler::Poppler PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler) ++ endif() ++endif() + find_path(Poppler_INCLUDE_DIR NAMES "poppler-config.h" "cpp/poppler-version.h" "qt5/poppler-qt5.h" "qt4/poppler-qt4.h" + "glib/poppler.h" + HINTS ${PC_Poppler_INCLUDE_DIRS} +@@ -77,6 +85,15 @@ endforeach() + foreach(_comp IN LISTS Poppler_known_components) + list(FIND Poppler_FIND_COMPONENTS "${_comp}" _nextcomp) + if(_nextcomp GREATER -1) ++ pkg_check_modules(PC_Poppler_${_comp} QUIET IMPORTED_TARGET ${Poppler_${_comp}_pkg_config}) ++ if(PC_Poppler_${_comp}_FOUND) ++ set(Poppler_${_comp}_INCLUDE_DIR "${PC_Poppler_${_comp}_INCLUDE_DIRS}" CACHE STRING "") ++ set(Poppler_${_comp}_LIBRARY "${PC_Poppler_${_comp}_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler_${_comp}) ++ add_library(Poppler::${_comp} INTERFACE IMPORTED) ++ set_target_properties(Poppler::${_comp} PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler_${_comp}) ++ endif() ++ endif() + find_path(Poppler_${_comp}_INCLUDE_DIR + NAMES ${Poppler_${_comp}_header} + PATH_SUFFIXES poppler +diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake +index 00612b0..6388719 100644 +--- a/cmake/modules/packages/FindSPATIALITE.cmake ++++ b/cmake/modules/packages/FindSPATIALITE.cmake +@@ -38,9 +38,17 @@ endif() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_SPATIALITE QUIET spatialite) ++ pkg_check_modules(PC_SPATIALITE QUIET IMPORTED_TARGET spatialite) + set(SPATIALITE_VERSION_STRING ${PC_SPATIALITE_VERSION}) + endif() ++if(PC_SPATIALITE_FOUND) ++ set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "") ++ set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET SPATIALITE::SPATIALITE) ++ add_library(SPATIALITE::SPATIALITE INTERFACE IMPORTED) ++ set_target_properties(SPATIALITE::SPATIALITE PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE) ++ endif() ++endif() + + find_path(SPATIALITE_INCLUDE_DIR + NAMES spatialite.h diff --git a/external_imported/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch b/external_imported/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch new file mode 100644 index 000000000..bf159fce5 --- /dev/null +++ b/external_imported/vcpkg/ports/gdal/fix-gdal-target-interfaces.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake +index 838f0fd..380e20d 100644 +--- a/cmake/helpers/GdalDriverHelper.cmake ++++ b/cmake/helpers/GdalDriverHelper.cmake +@@ -248,6 +248,10 @@ function(gdal_target_interfaces _TARGET) + if (_res) + target_compile_options(${_TARGET} PRIVATE ${_res}) + endif () ++ get_property(_res TARGET ${_LIB} PROPERTY INTERFACE_LINK_LIBRARIES) ++ if (_res) ++ gdal_target_interfaces(${_TARGET} ${_res}) ++ endif () + endif () + endforeach () + endfunction() diff --git a/external_imported/vcpkg/ports/gdal/portfile.cmake b/external_imported/vcpkg/ports/gdal/portfile.cmake index 5d75c1421..114c42cfd 100644 --- a/external_imported/vcpkg/ports/gdal/portfile.cmake +++ b/external_imported/vcpkg/ports/gdal/portfile.cmake @@ -1,376 +1,160 @@ -set(GDAL_PATCHES - 0001-Fix-debug-crt-flags.patch - 0002-Fix-build.patch - 0004-Fix-cfitsio.patch - 0005-Fix-configure.patch - 0007-Control-tools.patch - 0008-Fix-absl-string_view.patch - 0009-atlbase.patch - 0010-symprefix.patch -) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF v3.4.2 - SHA512 4dadfaefb4924e17395b2d8b695e185e91e9ad28b4b8666b64f11f40164411974f8ade747592060b515907ee73bf335610698c5e53e56a8937a89ddfffc3d66b + REF v3.5.2 + SHA512 fece50709090e21200298cf0d5c0dd10418bb800a3c92fb77eedab42c3942169bf69abcad9a6d61d3368ac5265e053e8c2aeb361d297ed0ace92ffba3b21dbca HEAD_REF master - PATCHES ${GDAL_PATCHES} + PATCHES + find-link-libraries.patch + fix-gdal-target-interfaces.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") -set(extra_exports "") -if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if (VCPKG_CRT_LINKAGE STREQUAL "static") - set(LINKAGE_FLAGS "/MT") - else() - set(LINKAGE_FLAGS "/MD") - endif() - - set(NMAKE_OPTIONS - "DATADIR=${CURRENT_PACKAGES_DIR}/share/gdal" - "HTMLDIR=${CURRENT_PACKAGES_DIR}/share/gdal/html" - "MSVC_VER=1900" - ) - set(NMAKE_OPTIONS_REL - "GDAL_HOME=${CURRENT_PACKAGES_DIR}" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" - ) - set(NMAKE_OPTIONS_DBG - "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" - DEBUG=1 - ) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND NMAKE_OPTIONS "WIN64=YES") - endif() - - if(VCPKG_TARGET_IS_UWP) - list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") - endif() - - if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO") - endif() - - if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") - list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND NMAKE_OPTIONS "DLLBUILD=0") - else() - list(APPEND NMAKE_OPTIONS "DLLBUILD=1" "WITH_PDB=1") - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() +# Cf. cmake/helpers/CheckDependentLibraries.cmake +# The default for all `GDAL_USE_` dependencies is `OFF`. +# Here, we explicitly control dependencies provided via vpcpkg. +# "core" is used for a dependency which must be enabled to avoid vendored lib. +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cfitsio GDAL_USE_CFITSIO + curl GDAL_USE_CURL + recommended-features GDAL_USE_EXPAT + freexl GDAL_USE_FREEXL + geos GDAL_USE_GEOS + core GDAL_USE_GEOTIFF + default-features GDAL_USE_GIF + hdf5 GDAL_USE_HDF5 + default-features GDAL_USE_ICONV + default-features GDAL_USE_JPEG + core GDAL_USE_JSONC + lerc GDAL_USE_LERC + libkml GDAL_USE_LIBKML # TODO, needs policy patches to FindLibKML.cmake + default-features GDAL_USE_LIBLZMA + default-features GDAL_USE_LIBXML2 + mysql-libmariadb GDAL_USE_MYSQL + netcdf GDAL_USE_NETCDF + odbc GDAL_USE_ODBC + default-features GDAL_USE_OPENJPEG + default-features GDAL_USE_OPENSSL + default-features GDAL_USE_PCRE2 + default-features GDAL_USE_PNG + poppler GDAL_USE_POPPLER + postgresql GDAL_USE_POSTGRESQL + default-features GDAL_USE_QHULL + #core GDAL_USE_SHAPELIB # https://github.com/OSGeo/gdal/issues/5711, https://github.com/microsoft/vcpkg/issues/16041 + core GDAL_USE_SHAPELIB_INTERNAL + libspatialite GDAL_USE_SPATIALITE + recommended-features GDAL_USE_SQLITE3 + core GDAL_USE_TIFF + default-features GDAL_USE_WEBP + core GDAL_USE_ZLIB + default-features GDAL_USE_ZSTD + tools BUILD_APPS +) +if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON) +endif() - if("tools" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") - else() - list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=0") - endif() - list(APPEND NMAKE_OPTIONS_DBG "BUILD_TOOLS=0") +# Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941 +if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON) +endif() - # Begin build process - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}/gdal" - TARGET devinstall - OPTIONS - ${NMAKE_OPTIONS} - OPTIONS_RELEASE - ${NMAKE_OPTIONS_REL} - OPTIONS_DEBUG - ${NMAKE_OPTIONS_DBG} - ) +string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH + ${FEATURE_OPTIONS} + -DBUILD_DOCS=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_CSharp=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Java=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON + -DGDAL_USE_INTERNAL_LIBS=OFF + -DGDAL_USE_EXTERNAL_LIBS=OFF + -DGDAL_BUILD_OPTIONAL_DRIVERS=ON + -DOGR_BUILD_OPTIONAL_DRIVERS=ON + -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb + -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb + -DMYSQL_LIBRARIES=unofficial::libmariadb + -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF + -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf + -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull + "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" + "-DQHULL_LIBRARY=${qhull_target}" + OPTIONS_DEBUG + -DBUILD_APPS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gdal) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdal/GDALConfig.cmake" + "include(CMakeFindDependencyMacro)" + "include(CMakeFindDependencyMacro) +# gdal needs a pkg-config tool. A host dependency provides pkgconf. +get_filename_component(vcpkg_host_prefix \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}\" ABSOLUTE) +list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")" +) - if("tools" IN_LIST FEATURES) - set(GDAL_EXES - gdal_contour - gdal_create +if (BUILD_APPS) + vcpkg_copy_tools( + TOOL_NAMES + gdalinfo + gdalbuildvrt + gdaladdo gdal_grid - gdal_rasterize gdal_translate - gdal_viewshed - gdaladdo - gdalbuildvrt - gdaldem + gdal_rasterize + gdalsrsinfo gdalenhance - gdalinfo - gdallocationinfo gdalmanage - gdalmdiminfo - gdalmdimtranslate - gdalsrsinfo - gdaltindex gdaltransform - gdalwarp - gnmanalyse - gnmmanage + gdaltindex + gdaldem + gdal_create + gdal_viewshed nearblack - ogr2ogr - ogrinfo ogrlineref ogrtindex - ) - # vcpkg_copy_tools removes the bin directories for us so no need to remove again - vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) - elseif(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" "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - vcpkg_copy_pdbs() - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb") - endif() - -else() - # See https://github.com/microsoft/vcpkg/issues/16990 - file(TOUCH "${SOURCE_PATH}/gdal/config.rpath") - - set(CONF_OPTS - --with-gnm=yes - --with-hide-internal-symbols=yes - --with-java=no - --with-perl=no - --with-python=no - ) - set(CONF_CHECKS "") - function(add_config option check) - list(APPEND CONF_OPTS "${option}") - set(CONF_OPTS "${CONF_OPTS}" PARENT_SCOPE) - list(APPEND CONF_CHECKS "${check}") - set(CONF_CHECKS "${CONF_CHECKS}" PARENT_SCOPE) - endfunction() - # parameters in the same order as the dependencies in vcpkg.json - add_config("--with-curl=yes" "cURL support .wms/wcs/....:yes") - add_config("--with-expat=yes" "Expat support: yes") - add_config("--with-geos=yes" "GEOS support: yes") - add_config("--with-gif=yes" "LIBGIF support: external") - add_config("--with-libjson=yes" "checking for JSONC... yes") - add_config("--with-geotiff=yes" "LIBGEOTIFF support: external") - add_config("--with-jpeg=yes" "LIBJPEG support: external") - add_config("--with-liblzma=yes" "LIBLZMA support: yes") - add_config("--with-png=yes" "LIBPNG support: external") - add_config("--with-webp=yes" "WebP support: yes") - add_config("--with-xml2=yes" "libxml2 support: yes") - add_config("--with-openjpeg=yes" "OpenJPEG support: yes") - add_config("--with-proj=yes" "PROJ >= 6: yes") - add_config("--with-sqlite3=yes" "SQLite support: yes") - add_config("--with-libtiff=yes" "LIBTIFF support: external") - add_config("--with-libz=yes" "LIBZ support: external") - add_config("--with-zstd=yes" "ZSTD support: yes") - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND CONF_OPTS --without-libtool --without-ld-shared) - endif() - - if("system-libraries" IN_LIST FEATURES) - set(DISABLE_SYSTEM_LIBRARIES OFF) - else() - set(DISABLE_SYSTEM_LIBRARIES ON) - endif() - - if ("libspatialite" IN_LIST FEATURES) - add_config("--with-spatialite=yes" "SpatiaLite support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-spatialite=no" "SpatiaLite support: no") - endif() - - if ("poppler" IN_LIST FEATURES) - add_config("--with-poppler=yes" "Poppler support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-poppler=no" "Poppler support: no") - endif() - if ("postgresql" IN_LIST FEATURES) - add_config("--with-pg=yes" "PostgreSQL support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-pg=no" "PostgreSQL support: no") - endif() - - if ("mysql-libmariadb" IN_LIST FEATURES) - add_config("--with-mysql=yes" "MySQL support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-mysql=no" "MySQL support: no") - endif() - - if ("cfitsio" IN_LIST FEATURES) - add_config("--with-cfitsio=yes" "CFITSIO support: external") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-cfitsio=no" "CFITSIO support: no") - endif() - - if ("hdf5" IN_LIST FEATURES) - add_config("--with-hdf5=yes" "HDF5 support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-hdf5=no" "HDF5 support: no") - endif() - - if ("netcdf" IN_LIST FEATURES) - add_config("--with-netcdf=yes" "NetCDF support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-netcdf=no" "NetCDF support: no") - endif() - - if(DISABLE_SYSTEM_LIBRARIES) - list(APPEND CONF_OPTS - # Too much: --disable-all-optional-drivers - # alphabetical order - --with-armadillo=no - --with-blosc=no - --with-brunsli=no - --with-charls=no - --with-crypto=no - --with-cryptopp=no - --with-dds=no - --with-dods-root=no - --with-ecw=no - --with-epsilon=no - --with-exr=no - --with-fgdb=no - --with-fme=no - --with-freexl=no - --with-grass=no - --with-gta=no - --with-hdf4=no - --with-hdfs=no - --with-heif=no - --with-idb=no - --with-ingres=no - --with-jp2lura=no - --with-jp2mrsid=no - --with-jasper=no - --with-jxl=no - --with-kakadu=no - --with-kea=no - --with-lerc=no - --with-libdeflate=no - --with-libgrass=no - --with-libkml=no - --with-lz4=no - --with-mdb=no - --with-mongocxx=no - --with-mongocxxv3=no - --with-mrsid=no - --with-mrsid_lidar=no - --with-msg=no - --with-null=no - --with-oci=no - --with-odbc=no - --with-ogdi=no - --with-opencl=no - --with-pcidsk=no - --with-pcraster=no - --with-pcre=no - --with-pcre2=no - --with-pdfium=no - --with-podofo=no - --with-qhull=no - --with-rasdaman=no - --with-rasterlite2=no - --with-rdb=no - --with-sfcgal=no - --with-sosi=no - --with-teigha=no - --with-tiledb=no - --with-xerces=no - ) - endif() - - x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES proj LIBS) - - if("tools" IN_LIST FEATURES) - list(APPEND CONF_OPTS "--with-tools=yes") - else() - list(APPEND CONF_OPTS "--with-tools=no") - endif() - - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}/gdal" - AUTOCONFIG - COPY_SOURCE - OPTIONS - ${CONF_OPTS} - OPTIONS_RELEASE - "--with-proj-extra-lib-for-test=${PROJ_LIBS_RELEASE}" - OPTIONS_DEBUG - --enable-debug - --with-tools=no - "--with-proj-extra-lib-for-test=${PROJ_LIBS_DEBUG}" - ) + gdalwarp + gdal_contour + gdallocationinfo + ogrinfo + ogr2ogr + ogrlineref + nearblack + gdalmdiminfo + gdalmdimtranslate + gnmanalyse + gnmmanage + AUTO_CLEAN + ) +endif() - # Verify configuration results (tightly coupled to vcpkg_configure_make) - function(check_config logfile) - set(failed_checks "") - file(READ "${logfile}" log) - foreach(check IN LISTS CONF_CHECKS) - if(NOT log MATCHES "${check}") - string(APPEND failed_checks "\n ${check}") - endif() - endforeach() - if(failed_checks) - get_filename_component(file "${logfile}" NAME_WE) - message(FATAL_ERROR "${file}: Configuration failed for ${failed_checks}") - endif() - endfunction() - foreach(suffix IN ITEMS rel dbg) - set(log "${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-${suffix}-out.log") - if(EXISTS "${log}") - check_config("${log}") - endif() - endforeach() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) - vcpkg_install_make(MAKEFILE GNUmakefile) +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/gdal-config" "${CURRENT_PACKAGES_DIR}/debug/bin/gdal-config") +file(GLOB bin_files "${CURRENT_PACKAGES_DIR}/bin/*") +if(NOT bin_files) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/share" - ) - - vcpkg_fixup_pkgconfig() - set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") - if(EXISTS "${pc_file_debug}") - vcpkg_replace_string("${pc_file_debug}" "\${prefix}/../../include" "\${prefix}/../include") - vcpkg_replace_string("${pc_file_debug}" "\${exec_prefix}/include" "\${prefix}/../include") - endif() - - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/debug/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") - - if("libspatialite" IN_LIST FEATURES) - list(APPEND extra_exports SPATIALITE) - x_vcpkg_pkgconfig_get_modules( - PREFIX SPATIALITE - MODULES spatialite - LIBS - ) - endif() + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) endif() -string(COMPARE NOTEQUAL "${NMAKE_OPTIONS}" "" NMAKE_BUILD) -set(GDAL_EXTRA_LIBS_DEBUG "") -set(GDAL_EXTRA_LIBS_RELEASE "") -foreach(prefix IN LISTS extra_exports) - string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_DEBUG}") - string(APPEND GDAL_EXTRA_LIBS_DEBUG " ${libs}") - string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_RELEASE}") - string(APPEND GDAL_EXTRA_LIBS_RELEASE " ${libs}") -endforeach() -string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_DEBUG "${GDAL_EXTRA_LIBS_DEBUG}") -string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_RELEASE "${GDAL_EXTRA_LIBS_RELEASE}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") +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}/gdal/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/external_imported/vcpkg/ports/gdal/usage b/external_imported/vcpkg/ports/gdal/usage index 63a67bc07..6982a9a24 100644 --- a/external_imported/vcpkg/ports/gdal/usage +++ b/external_imported/vcpkg/ports/gdal/usage @@ -1,5 +1,4 @@ The package GDAL provides CMake targets: - find_package(GDAL REQUIRED) - target_include_directories(main PRIVATE ${GDAL_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${GDAL_LIBRARIES}) + find_package(GDAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE GDAL::GDAL) diff --git a/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake index 305de834e..5b70b673b 100644 --- a/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -1,151 +1,23 @@ -include(SelectLibraryConfigurations) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) -find_path(GDAL_INCLUDE_DIR - NAMES gdal.h - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include" - NO_DEFAULT_PATH -) -find_library(GDAL_LIBRARY_DEBUG - NAMES gdal_d gdal_i_d gdal - NAMES_PER_DIR - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" - NO_DEFAULT_PATH -) -find_library(GDAL_LIBRARY_RELEASE - NAMES gdal_i gdal - NAMES_PER_DIR - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" - NO_DEFAULT_PATH -) -select_library_configurations(GDAL) - -if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) - message(FATAL_ERROR "Installation of vcpkg port gdal is broken.") +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +list(APPEND ARGS "CONFIG") +# The current port version should satisfy GDAL 3.0 ... 3.5 +list(GET ARGS 1 vcpkg_gdal_maybe_version) +if(vcpkg_gdal_maybe_version MATCHES "(^3\$|^3[.][0-5])") + list(REMOVE_AT ARGS "1") endif() - -set(GDAL_LIBRARY "${GDAL_LIBRARY}" CACHE STRING "") - -set(FindGDAL_SKIP_GDAL_CONFIG TRUE) - -_find_package(${ARGS}) - -set(_gdal_dep_find_args "") -if(";${ARGS};" MATCHES ";REQUIRED;") - list(APPEND _gdal_dep_find_args "REQUIRED") -endif() -function(_gdal_add_dependency target package) - find_package(${package} ${ARGN} ${_gdal_dep_find_args}) - if(${package}_FOUND) - foreach(suffix IN ITEMS "" "-shared" "_shared" "-static" "_static" "-NOTFOUND") - set(dependency "${target}${suffix}") - if(TARGET ${dependency}) - break() - endif() - endforeach() - if(NOT TARGET ${dependency}) - string(TOUPPER ${package} _gdal_deps_package) - if(DEFINED ${_gdal_deps_package}_LIBRARIES) - set(dependency ${${_gdal_deps_package}_LIBRARIES}) - elseif(DEFINED ${package}_LIBRARIES) - set(dependency ${${package}_LIBRARIES}) - elseif(DEFINED ${_gdal_deps_package}_LIBRARY) - set(dependency ${${_gdal_deps_package}_LIBRARY}) - elseif(DEFINED ${package}_LIBRARY) - set(dependency ${${package}_LIBRARY}) - endif() - endif() - if(dependency) - if(TARGET GDAL::GDAL) # CMake 3.14 - set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${dependency}) - endif() - if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") - set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE) - endif() - else() - message(WARNING "Did not find which libraries are exported by ${package}") - set(GDAL_FOUND false PARENT_SCOPE) - endif() - else() - message(WARNING "Could not find package ${package}") - set(GDAL_FOUND false PARENT_SCOPE) - endif() -endfunction() -function(z_vcpkg_gdal_add_libs keyword config) - set(gdal_deps_target "unofficial::gdal::deps::${keyword}") - if(NOT TARGET "${gdal_deps_target}") - add_library("${gdal_deps_target}" INTERFACE IMPORTED) - if(TARGET GDAL::GDAL) # CMake 3.14 - set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${gdal_deps_target}>") - endif() - if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") - set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${keyword};${gdal_deps_target}" PARENT_SCOPE) - endif() - endif() - # The Ninja build system stumbles over '/libpath:` in INTERFACE_LINK_LIBRARIES. - set(lib_paths "${ARGN}") - list(REMOVE_DUPLICATES lib_paths) # For lib paths, late duplicates are redundant. - foreach(item IN LISTS lib_paths) - # INTERFACE_LINK_OPTIONS needs CMake 3.13. There is no direct alternative for older versions. - if(item MATCHES "^/libpath:(.*)|^-L") - set_property(TARGET "${gdal_deps_target}" APPEND PROPERTY INTERFACE_LINK_OPTIONS "${item}") - list(REMOVE_ITEM ARGN "${item}") - endif() - endforeach() - foreach(item IN LISTS ARGN) - get_property(libs TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES) - if(item MATCHES "^-l|-pthread") - list(REMOVE_ITEM libs "${item}") # For libs, early duplicates are normally redundant. - endif() - list(APPEND libs "${item}") - set_property(TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES "${libs}") - endforeach() -endfunction() +unset(vcpkg_gdal_maybe_version) +_find_package(${ARGS} CONFIG) if(GDAL_FOUND) - cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) - set(Z_VCPKG_PORT_FEATURES "@FEATURES@") - if("cfitsio" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) - endif() - _gdal_add_dependency(CURL::libcurl CURL CONFIG) - _gdal_add_dependency(expat::expat expat CONFIG) - _gdal_add_dependency(GEOS::geos_c geos CONFIG) - if(NOT "@NMAKE_BUILD@") - _gdal_add_dependency(GIF::GIF GIF) - endif() - if("hdf5" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) - endif() - if(NOT "@NMAKE_BUILD@") - _gdal_add_dependency(json-c::json-c json-c CONFIG) - endif() - _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) - _gdal_add_dependency(JPEG::JPEG JPEG) - _gdal_add_dependency(LibLZMA::LibLZMA LibLZMA) - _gdal_add_dependency(png libpng CONFIG) - if("poppler" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(unofficial::poppler::poppler-private unofficial-poppler) - endif() - if("postgresql" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) - endif() - _gdal_add_dependency(WebP::webp WebP CONFIG) - _gdal_add_dependency(LibXml2::LibXml2 LibXml2) - if("netcdf" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) - endif() - _gdal_add_dependency(openjp2 OpenJPEG CONFIG) - _gdal_add_dependency(PROJ::proj PROJ4 CONFIG) - _gdal_add_dependency(unofficial::sqlite3::sqlite3 unofficial-sqlite3 CONFIG) - _gdal_add_dependency(TIFF::TIFF TIFF) - _gdal_add_dependency(ZLIB::ZLIB ZLIB) - _gdal_add_dependency(zstd::libzstd zstd CONFIG) - z_vcpkg_gdal_add_libs(optimized Release @GDAL_EXTRA_LIBS_RELEASE@) - z_vcpkg_gdal_add_libs(debug Debug @GDAL_EXTRA_LIBS_DEBUG@) - list(FIND ARGS "REQUIRED" required) - if(NOT GDAL_FOUND AND NOT required EQUAL "-1") - message(FATAL_ERROR "Failed to find dependencies of GDAL") - endif() - unset(Z_VCPKG_PORT_FEATURES) - cmake_policy(POP) + get_filename_component(vcpkg_gdal_prefix "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + set(GDAL_INCLUDE_DIR "${vcpkg_gdal_prefix}/include" CACHE INTERNAL "") + set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}") + set(GDAL_LIBRARY GDAL::GDAL CACHE INTERNAL "") + set(GDAL_LIBRARIES "${GDAL_LIBRARY}") + unset(vcpkg_gdal_prefix) endif() + +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/gdal/vcpkg.json b/external_imported/vcpkg/ports/gdal/vcpkg.json index 766fe35a8..e041dc507 100644 --- a/external_imported/vcpkg/ports/gdal/vcpkg.json +++ b/external_imported/vcpkg/ports/gdal/vcpkg.json @@ -1,60 +1,131 @@ { "name": "gdal", - "version-semver": "3.4.2", + "version-semver": "3.5.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, + "supports": "!uwp", "dependencies": [ + "json-c", + "libgeotiff", { - "name": "atlmfc", - "platform": "windows & !uwp" + "name": "pkgconf", + "host": true }, - "curl", - "expat", - "geos", + "proj", + "tiff", { - "name": "giflib", - "platform": "!windows | mingw" + "name": "vcpkg-cmake", + "host": true }, { - "name": "json-c", - "platform": "!windows | mingw" + "name": "vcpkg-cmake-config", + "host": true }, - "libgeotiff", - { - "name": "libiconv", - "platform": "windows & !mingw" - }, - "libjpeg-turbo", - "liblzma", - "libpng", - "libwebp", - "libxml2", - "openjpeg", - "proj", - "sqlite3", - "tiff", { "name": "vcpkg-pkgconfig-get-modules", "host": true }, - "zlib", - "zstd" + "zlib" ], "default-features": [ - "supported-default-features" + "default-features" ], "features": { + "aws-ec2-windows": { + "description": "Optimized detection of AWS EC2 Windows hosts", + "dependencies": [ + "atlmfc" + ] + }, "cfitsio": { "description": "Enable cfitsio support", "dependencies": [ "cfitsio" ] }, + "curl": { + "description": "Enable CURL network support", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "default-features": { + "description": "Default set of features, including recommended features", + "dependencies": [ + "expat", + { + "name": "gdal", + "default-features": false, + "features": [ + "curl", + "geos", + "recommended-features" + ] + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "libspatialite", + "postgresql" + ], + "platform": "!uwp" + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5", + "netcdf" + ], + "platform": "!uwp & !(windows & arm64) & !android" + }, + "giflib", + "libiconv", + "libjpeg-turbo", + "liblzma", + "libpng", + "libwebp", + "libxml2", + "openjpeg", + "openssl", + "pcre2", + "qhull", + "zstd" + ] + }, + "freexl": { + "description": "Enable FREEXL support", + "dependencies": [ + "freexl" + ] + }, + "geos": { + "description": "Enable GEOS support", + "dependencies": [ + "geos" + ] + }, "hdf5": { "description": "Enable HDF5 support", "dependencies": [ - "hdf5" + { + "name": "hdf5", + "default-features": false, + "features": [ + "cpp" + ] + } + ] + }, + "lerc": { + "description": "Enable LERC support", + "dependencies": [ + "lerc" ] }, "libspatialite": { @@ -72,11 +143,14 @@ "netcdf": { "description": "Enable NetCDF support", "dependencies": [ - "netcdf-c" + { + "name": "netcdf-c", + "default-features": false + } ] }, "poppler": { - "description": "Enable poppler support", + "description": "Enable PDF reading support via poppler", "dependencies": [ { "name": "poppler", @@ -93,30 +167,32 @@ "libpq" ] }, - "supported-default-features": { - "description": "Default set of features, dependent on platform", + "recommended-features": { + "description": "Features that are explicity marked as recommended by GDAL.", "dependencies": [ + "expat", { - "name": "gdal", - "default-features": false, + "name": "sqlite3", "features": [ - "postgresql" - ], - "platform": "!uwp" - }, + "rtree" + ] + } + ] + }, + "supported-default-features": { + "description": "This feature is an alias for default-features. It is retained for compatibility.", + "dependencies": [ { "name": "gdal", - "default-features": false, "features": [ - "hdf5", - "netcdf" - ], - "platform": "!uwp & !(windows & arm64)" + "default-features" + ] } ] }, "system-libraries": { - "description": "Include drivers which need additional libraries" + "$supports": "!windows", + "description": "This feature does nothing. It is retained for compatibility." }, "tools": { "description": "Builds gdal and ogr executables" diff --git a/external_imported/vcpkg/ports/gdcm/portfile.cmake b/external_imported/vcpkg/ports/gdcm/portfile.cmake index 99abfc8a6..3055b1a42 100644 --- a/external_imported/vcpkg/ports/gdcm/portfile.cmake +++ b/external_imported/vcpkg/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 c0824c0ae66e9f9e3c8bddba8b65238c1c28481d # v3.0.7 - SHA512 1889f18f7164e1395e2cf5fe29b6ccd615f9a31433d1a7bda19cac472b20bc52018ef45bd9d9ca72ecb248c9fd5d895b94bfd111157693f70e0b90cf7b582edd + REF 1f94bafc929db3648612848836f7899f101d6641 # v3.0.12 + SHA512 cec050c61d9880880b8b72234f8b0824a1f1fa8f9b2419fec85a0f27fe3bca4f9f80aa735b35775ac098f5827fde454aba700ebea17f5f8657894d26f5140f4a HEAD_REF master PATCHES use-openjpeg-config.patch diff --git a/external_imported/vcpkg/ports/gdcm/vcpkg.json b/external_imported/vcpkg/ports/gdcm/vcpkg.json index 8583fbda2..e0dedd842 100644 --- a/external_imported/vcpkg/ports/gdcm/vcpkg.json +++ b/external_imported/vcpkg/ports/gdcm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "gdcm", - "version": "3.0.7", - "port-version": 4, + "version": "3.0.12", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", + "license": "BSD-3-Clause", "supports": "!uwp & !(windows & arm)", "dependencies": [ "expat", diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/fix_build.patch b/external_imported/vcpkg/ports/gdk-pixbuf/fix_build.patch deleted file mode 100644 index 2afdd9c86..000000000 --- a/external_imported/vcpkg/ports/gdk-pixbuf/fix_build.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat -index 6994d49e1..b4789dd62 100644 ---- a/build-aux/post-install.bat -+++ b/build-aux/post-install.bat -@@ -7,8 +7,8 @@ set binary_version=%3 - set libdir_windows=%libdir:/=\% - - if not "%DESTDIR%" == "" goto warn_msg --if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\gdk-pixbuf-2.0\%binary_version% --%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache -+if not exist %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\ mkdir %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version% -+%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache - - goto end - -@@ -18,7 +18,7 @@ echo *** Warning: loaders.cache not built - echo *** - echo *** You should generate this file manually on the host system - echo *** using: --echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache -+echo *** gdk-pixbuf-query-loaders ^> %libdir_windows%\..\gdk-pixbuf-2.0\%binary_version%\loaders.cache - echo *** - - :end -diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh -index 661bceeef..0b1a46527 100644 ---- a/build-aux/post-install.sh -+++ b/build-aux/post-install.sh -@@ -5,14 +5,14 @@ libdir="$2" - binary_version="$3" - - if [ -z "$DESTDIR" ]; then -- mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version" -- $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" -+ mkdir -p "$libdir/../gdk-pixbuf-2.0/$binary_version" -+ $bindir/gdk-pixbuf-query-loaders > "$libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" - else - echo "***" - echo "*** Warning: loaders.cache not built" - echo "***" - echo "*** You should generate this file manually on the host system" - echo "*** using:" -- echo "*** gdk-pixbuf-query-loaders > $libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache" -+ echo "*** gdk-pixbuf-query-loaders > $libdir/../gdk-pixbuf-2.0/$binary_version/loaders.cache" - echo "***" - fi -diff --git a/meson.build b/meson.build -index c38607029..4b5df91ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -308,12 +310,12 @@ endif - # Don't check and build the jpeg loader if native_windows_loaders is true - if get_option('jpeg') and not native_windows_loaders - if cc.has_header('jpeglib.h') -- jpeg_dep = cc.find_library('jpeg', required: false) -- if cc.get_id() == 'msvc' and not jpeg_dep.found() -+ jpeg_dep = dependency('libjpeg', required: false) -+ #if cc.get_id() == 'msvc' and not jpeg_dep.found() - # The IJG JPEG library builds the .lib file as libjpeg.lib in its MSVC build system, - # so look for it as well when jpeg.lib cannot be found -- jpeg_dep = cc.find_library('libjpeg', required: false) -- endif -+ # jpeg_dep = cc.find_library('libjpeg', required: false) -+ #endif - if jpeg_dep.found() and cc.has_function('jpeg_destroy_decompress', dependencies: jpeg_dep) - enabled_loaders += 'jpeg' - loaders_deps += jpeg_dep diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch b/external_imported/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch index b6f6332da..b213ac865 100644 --- a/external_imported/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch +++ b/external_imported/vcpkg/ports/gdk-pixbuf/fix_build_error_windows.patch @@ -1,8 +1,6 @@ -diff --git a/meson.build b/meson.build -index b39c55d..4b050c7 100644 --- a/meson.build +++ b/meson.build -@@ -89,8 +89,14 @@ if cc.has_function('round', dependencies: mathlib_dep) +@@ -90,8 +90,14 @@ gdk_pixbuf_conf.set('HAVE_ROUND', 1) endif @@ -18,4 +16,4 @@ index b39c55d..4b050c7 100644 + endif endif - if cc.has_function('bind_textdomain_codeset', prefix: '#include ') + intl_dep = cc.find_library('intl', required: false) diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake b/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake index bf16064f8..5cc405a8d 100644 --- a/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake +++ b/external_imported/vcpkg/ports/gdk-pixbuf/portfile.cmake @@ -1,57 +1,56 @@ set(GDK_PIXBUF_VERSION 2.42) -set(GDK_PIXBUF_PATCH 2) +set(GDK_PIXBUF_PATCH 9) -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz" - SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO GNOME/gdk-pixbuf + REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}" + SHA512 3406f47b413fe3860df410a0cc0076ce47d10605b39347105690c85616739e67e5dfd0804efcad758614b0c8d1369e410b9efaa704a234bfd19686b82595b9e1 + HEAD_REF master PATCHES - fix_build.patch fix_build_error_windows.patch ) + if(VCPKG_TARGET_IS_WINDOWS) #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dman=false # Whether to generate man pages (requires xlstproc) -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) -Ddocs=false - -Dpng=true # Enable PNG loader (requires libpng) - -Dtiff=true # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used - -Djpeg=true # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used + -Dpng=enabled # Enable PNG loader (requires libpng) + -Dtiff=enabled # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used + -Djpeg=enabled # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used -Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection) -Drelocatable=true # Whether to enable application bundle relocation support + -Dtests=false -Dinstalled_tests=false -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) - -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; + -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf - ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + 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' + ADDITIONAL_CROSS_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' ) vcpkg_install_meson(ADD_BIN_TO_PATH) -# Fix paths in pc file. +# Fix paths in pc file. set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) - string(REPLACE [[${bindir}]] "\${bindir}/../../tools/${PORT}" _contents "${_contents}") - string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + string(REPLACE [[${bindir}]] "\${prefix}/../tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endif() set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) - string(REPLACE [[${bindir}]] "\${bindir}/../tools/${PORT}" _contents "${_contents}") - string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + string(REPLACE [[${bindir}]] "\${prefix}/tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endif() @@ -59,13 +58,21 @@ vcpkg_fixup_pkgconfig() set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer) -if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_TARGET_IS_WINDOWS) +# gdk-pixbuf-thumbnailer is not compiled for cross-compiling +set(IS_NEED_REMOVE_THUMBNAILER ${VCPKG_CROSSCOMPILING}) +# This adjusting logic might be place in vcpkg_common_definitions.cmake. +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") + set(IS_NEED_REMOVE_THUMBNAILER false) + endif() +endif() +if(IS_NEED_REMOVE_THUMBNAILER) list(REMOVE_ITEM TOOL_NAMES gdk-pixbuf-thumbnailer) endif() vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json b/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json index 45a085d52..f4cb210a7 100644 --- a/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json +++ b/external_imported/vcpkg/ports/gdk-pixbuf/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gdk-pixbuf", - "version": "2.42.2", - "port-version": 2, + "version": "2.42.9", + "port-version": 1, "description": "Image loading library.", - "homepage": "https://developer.gnome.org/gdk-pixbuf/", + "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", + "license": "LGPL-2.1-only", "dependencies": [ "gettext", "glib", diff --git a/external_imported/vcpkg/ports/geographiclib/cxx-library-only.patch b/external_imported/vcpkg/ports/geographiclib/cxx-library-only.patch deleted file mode 100644 index d1201794b..000000000 --- a/external_imported/vcpkg/ports/geographiclib/cxx-library-only.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb08bd48..88552153 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -196,6 +196,11 @@ else () - set (DEVELOPER OFF) - endif () - -+set (INSTALL_TOOL_DIR "tools/geographiclib") -+file (RELATIVE_PATH PROJECT_LIB_DIR -+ "${CMAKE_INSTALL_PREFIX}/${INSTALL_TOOL_DIR}" -+ "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+ - if (NOT MSVC) - # Set the run time path for shared libraries for non-Windows machines. - # (1) include link path for external packages (not needed with -@@ -207,7 +212,7 @@ if (NOT MSVC) - # (2) include installed path for GeographicLib. - if (NOT APPLE) - # Use relative path so that package is relocatable -- set (CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LIB_SUFFIX}") -+ set (CMAKE_INSTALL_RPATH "\$ORIGIN/${PROJECT_LIB_DIR}") - else () - # cmake 2.8.12 introduced a way to make the package relocatable. - # See also INSTALL_RPATH property on the tools. -@@ -434,12 +439,12 @@ endif () - # documentation files into the source tree. Skip Apple here because - # man/makeusage.sh uses "head --lines -4" to drop the last 4 lines of a - # file and there's no simple equivalent for MacOSX --if (NOT WIN32 AND NOT APPLE) -+if (NOT WIN32 AND NOT APPLE AND FALSE) - find_program (HAVE_POD2MAN pod2man) - find_program (HAVE_POD2HTML pod2html) - find_program (HAVE_COL col) - endif () --if (HAVE_POD2MAN AND HAVE_POD2HTML AND HAVE_COL) -+if (HAVE_POD2MAN AND HAVE_POD2HTML AND HAVE_COL AND FALSE) - set (MAINTAINER ON) - else () - set (MAINTAINER OFF) -@@ -466,25 +471,34 @@ if (WIN32) - set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") - endif () - -+if (SKIP_TOOLS) -+ set (TOOLS) -+ set (SCRIPTS) -+else () - # The list of tools (to be installed into, e.g., /usr/local/bin) - set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve - GeoidEval Gravity MagneticField Planimeter RhumbSolve TransverseMercatorProj) - # The list of scripts (to be installed into, e.g., /usr/local/sbin) - set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity - geographiclib-get-magnetic) -+endif () - - set_property (GLOBAL PROPERTY USE_FOLDERS ON) - - # The list of subdirectories to process - add_subdirectory (src) - add_subdirectory (include/GeographicLib) -+if (NOT SKIP_TOOLS) - add_subdirectory (tools) -+endif () -+if (FALSE) - add_subdirectory (man) - add_subdirectory (doc) - add_subdirectory (js) - add_subdirectory (matlab) - add_subdirectory (python/geographiclib) - add_subdirectory (examples) -+endif () - if (MSVC AND BUILD_NETGEOGRAPHICLIB) - if (GEOGRAPHICLIB_PRECISION EQUAL 2) - set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index fd0669f2..4744e08d 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -56,13 +56,7 @@ export (TARGETS - # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative - # path to the root from there. (Note that the whole install tree can - # be relocated.) --if (COMMON_INSTALL_PATH) -- # Install under lib${LIB_SUFFIX} so that 32-bit and 64-bit packages -- # can be installed on a single machine. -- set (INSTALL_CMAKE_DIR "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") --else () -- set (INSTALL_CMAKE_DIR "cmake") --endif () -+set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}") - # Find root of install tree relative to INSTALL_CMAKE_DIR - file (RELATIVE_PATH PROJECT_ROOT_DIR - "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}") -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 3fa8ec6a..92c73946 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Build the tools... - - # Where to find the *.usage files for the --help option. --include_directories (${PROJECT_BINARY_DIR}/man) -+include_directories (${PROJECT_SOURCE_DIR}/man) - # Only needed if target_compile_definitions is not supported - add_definitions (${PROJECT_DEFINITIONS}) - -@@ -16,7 +16,7 @@ foreach (TOOL ${TOOLS}) - add_dependencies (tools ${TOOL}) - - set_source_files_properties (${TOOL}.cpp PROPERTIES -- OBJECT_DEPENDS ${PROJECT_BINARY_DIR}/man/${TOOL}.usage) -+ OBJECT_DEPENDS ${PROJECT_SOURCE_DIR}/man/${TOOL}.usage) - - target_link_libraries (${TOOL} ${PROJECT_LIBRARIES} ${HIGHPREC_LIBRARIES}) - -@@ -31,11 +31,11 @@ endif () - if (APPLE) - # Ensure that the package is relocatable - set_target_properties (${TOOLS} PROPERTIES -- INSTALL_RPATH "@loader_path/../lib${LIB_SUFFIX}") -+ INSTALL_RPATH "@loader_path/${PROJECT_LIB_DIR}") - endif () - - # Specify where the tools are installed, adding them to the export targets --install (TARGETS ${TOOLS} EXPORT targets DESTINATION bin) -+install (TARGETS ${TOOLS} DESTINATION "${INSTALL_TOOL_DIR}") - - if (MSVC AND PACKAGE_DEBUG_LIBS) - # Possibly don't EXPORT the debug versions of the tools and then this -@@ -55,7 +55,7 @@ set_property (TARGET tools ${TOOLS} PROPERTY FOLDER tools) - # systems. This needs to substitute ${GEOGRAPHICLIB_DATA} as the - # default data directory. These are installed under sbin, because it is - # expected to be run with write access to /usr/local. --if (NOT WIN32) -+if (NOT WIN32 AND FALSE) - foreach (SCRIPT ${SCRIPTS}) - configure_file (${SCRIPT}.sh scripts/${SCRIPT} @ONLY) - add_custom_command (OUTPUT ${SCRIPT} diff --git a/external_imported/vcpkg/ports/geographiclib/portfile.cmake b/external_imported/vcpkg/ports/geographiclib/portfile.cmake index 592d0dc63..5870368b0 100644 --- a/external_imported/vcpkg/ports/geographiclib/portfile.cmake +++ b/external_imported/vcpkg/ports/geographiclib/portfile.cmake @@ -1,49 +1,55 @@ -vcpkg_from_sourceforge ( +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib - REF distrib - FILENAME "GeographicLib-1.52.tar.gz" - SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 - PATCHES cxx-library-only.patch + REF distrib-C++ + FILENAME "GeographicLib-2.1.1.tar.gz" + SHA512 52b01ad4147686ae83d799c1ab7de2452f7288d2f9d1ce12f5daeee88b24484a7aad129a04a3273148221613aaf7d1ea8f07083abb5fd3fc2b4a55cc5dd79951 + ) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" TOOLS ) -vcpkg_check_features ( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "tools" SKIP_TOOLS +# GeographicLib's CMakeLists.txt allows the installation directories for +# all the components to be set independently. A "false" value, e.g., an +# empty string or OFF (-DBINDIR=OFF), indicates that the corresponding +# component should not be installed. +if(TOOLS) + set(TOOL_OPTION "-DBINDIR=tools/${PORT}") +else() + set(TOOL_OPTION -DBINDIR=OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${TOOL_OPTION} + "-DCMAKEDIR=share/${PORT}" + -DDOCDIR=OFF + -DEXAMPLEDIR=OFF + -DMANDIR=OFF + -DSBINDIR=OFF ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LIB_TYPE "SHARED") -else () - set (LIB_TYPE "STATIC") -endif () - -vcpkg_configure_cmake ( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - "-DGEOGRAPHICLIB_LIB_TYPE=${LIB_TYPE}" - ${FEATURE_OPTIONS} - PREFER_NINJA # Disable this option if project cannot be built with Ninja -) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() -vcpkg_install_cmake () -vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib) -vcpkg_copy_pdbs () +vcpkg_fixup_pkgconfig() -if (tools IN_LIST FEATURES) - vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif () +if(tools IN_LIST FEATURES) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) -file (INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -# Install usage -configure_file (${CMAKE_CURRENT_LIST_DIR}/usage - ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) -vcpkg_fixup_pkgconfig() +# Install usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/external_imported/vcpkg/ports/geographiclib/vcpkg.json b/external_imported/vcpkg/ports/geographiclib/vcpkg.json index 321cd04ec..ef939c3f7 100644 --- a/external_imported/vcpkg/ports/geographiclib/vcpkg.json +++ b/external_imported/vcpkg/ports/geographiclib/vcpkg.json @@ -1,9 +1,19 @@ { "name": "geographiclib", - "version": "1.52", - "port-version": 2, + "version": "2.1.1", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "The GeographicLib tools", diff --git a/external_imported/vcpkg/ports/geos/disable-warning-4996.patch b/external_imported/vcpkg/ports/geos/disable-warning-4996.patch index af39e2ed6..d10e8df8a 100644 --- a/external_imported/vcpkg/ports/geos/disable-warning-4996.patch +++ b/external_imported/vcpkg/ports/geos/disable-warning-4996.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index accc1a2..34d2055 100644 +index e758b5dc8..074986f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) +@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) target_compile_options(geos_cxx_flags INTERFACE "$<$,$>:-ffp-contract=off>" "$<$:-ffp-contract=off>" diff --git a/external_imported/vcpkg/ports/geos/fix-exported-config.patch b/external_imported/vcpkg/ports/geos/fix-exported-config.patch index 40aa835e0..46af90efd 100644 --- a/external_imported/vcpkg/ports/geos/fix-exported-config.patch +++ b/external_imported/vcpkg/ports/geos/fix-exported-config.patch @@ -1,10 +1,10 @@ diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index bc0e774..e3ca0bd 100644 +index a8c034fb2..a5cd14c13 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt -@@ -45,11 +45,18 @@ function(configure_install_geos_pc) - set(includedir "$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") - set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") +@@ -61,11 +61,18 @@ function(configure_install_geos_pc) + set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") + endif() set(VERSION ${GEOS_VERSION}) - set(EXTRA_LIBS "-lstdc++") + if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+") @@ -22,7 +22,7 @@ index bc0e774..e3ca0bd 100644 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in -@@ -61,9 +68,9 @@ function(configure_install_geos_pc) +@@ -77,9 +84,9 @@ function(configure_install_geos_pc) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endfunction() @@ -34,7 +34,7 @@ index bc0e774..e3ca0bd 100644 option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF) diff --git a/tools/geos-config.in b/tools/geos-config.in -index 6eff1eb..8827f6a 100644 +index 6eff1eb14..8827f6ac6 100644 --- a/tools/geos-config.in +++ b/tools/geos-config.in @@ -1,9 +1,11 @@ diff --git a/external_imported/vcpkg/ports/geos/fix_clang-cl.patch b/external_imported/vcpkg/ports/geos/fix_clang-cl.patch new file mode 100644 index 000000000..550f464cf --- /dev/null +++ b/external_imported/vcpkg/ports/geos/fix_clang-cl.patch @@ -0,0 +1,97 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 074986f38..bb092ed13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,12 +184,16 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98207 + #----------------------------------------------------------------------------- + ++if(MSVC) ++target_compile_options(geos_cxx_flags INTERFACE ++ /fp:precise /wd4996 ++ ) ++else() + target_compile_options(geos_cxx_flags INTERFACE + "$<$,$>:-ffp-contract=off>" + "$<$:-ffp-contract=off>" +- $<$:/fp:precise /wd4996> + ) +- ++endif() + # Use -ffloat-store for 32-bit builds (needed to make some tests pass) + target_compile_options(geos_cxx_flags INTERFACE + $<$,$>:-ffloat-store> +@@ -225,13 +229,14 @@ target_compile_definitions(geos_cxx_flags + INTERFACE + USE_UNSTABLE_GEOS_CPP_API) + ++if(MSVC) + target_compile_definitions(geos_developer_cxx_flags + INTERFACE +- $<$:_CRT_NONSTDC_NO_DEPRECATE> +- $<$:_SCL_SECURE_NO_DEPRECATE> +- $<$:_CRT_SECURE_NO_WARNINGS> +- $<$:NOMINMAX>) +- ++ _CRT_NONSTDC_NO_DEPRECATE ++ _SCL_SECURE_NO_DEPRECATE ++ _CRT_SECURE_NO_WARNINGS ++ NOMINMAX) ++endif() + target_compile_options(geos_developer_cxx_flags + INTERFACE + $<$:-W4> +@@ -268,9 +273,10 @@ add_subdirectory(src) + option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries" OFF) + + if(BUILD_SHARED_LIBS) +- target_compile_definitions(geos +- PRIVATE $,GEOS_DLL_EXPORT,DLL_EXPORT>) +- ++ if(MSVC) ++ target_compile_definitions(geos ++ PRIVATE GEOS_DLL_EXPORT DLL_EXPORT) ++ endif() + set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH}) + set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH}) + if(MINGW AND VERSION_MINGW_SHARED_LIBS) +@@ -286,8 +292,10 @@ add_library(GEOS::geos_c ALIAS geos_c) + target_link_libraries(geos_c PRIVATE geos) + + if(BUILD_SHARED_LIBS) ++ if(MSVC) + target_compile_definitions(geos_c +- PRIVATE $,GEOS_DLL_EXPORT,DLL_EXPORT>) ++ PRIVATE GEOS_DLL_EXPORT DLL_EXPORT) ++ endif() + + set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION}) + if(NOT WIN32 OR MINGW) +diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h +index 7a647e461..73da77942 100644 +--- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h ++++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h +@@ -119,7 +119,7 @@ public: + * @param p the point to test + * @return the location of the point in the geometry + */ +- geom::Location locate(const geom::Coordinate* /*const*/ p) override; ++ GEOS_DLL geom::Location locate(const geom::Coordinate* /*const*/ p) override; + + }; + +diff --git a/include/geos/export.h b/include/geos/export.h +index 1a26f8c7a..ba89e0f82 100644 +--- a/include/geos/export.h ++++ b/include/geos/export.h +@@ -19,9 +19,9 @@ + # if defined(GEOS_DLL_EXPORT) + # define GEOS_DLL __declspec(dllexport) + # elif defined(GEOS_DLL_IMPORT) +-# define GEOS_DLL __declspec(dllimport) ++# define GEOS_DLL extern __declspec(dllimport) + # else + # define GEOS_DLL + # endif + #else + # define GEOS_DLL diff --git a/external_imported/vcpkg/ports/geos/install-hpp-files.patch b/external_imported/vcpkg/ports/geos/install-hpp-files.patch deleted file mode 100644 index c5d4b21e7..000000000 --- a/external_imported/vcpkg/ports/geos/install-hpp-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20c8907..accc1a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -367,7 +367,7 @@ install(DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/include/geos" - "${CMAKE_CURRENT_BINARY_DIR}/include/geos" - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- FILES_MATCHING PATTERN "*.h") -+ FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") - if(NOT DISABLE_GEOS_INLINE) - install(DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/include/geos" diff --git a/external_imported/vcpkg/ports/geos/portfile.cmake b/external_imported/vcpkg/ports/geos/portfile.cmake index 7be171ac2..18b5ff23e 100644 --- a/external_imported/vcpkg/ports/geos/portfile.cmake +++ b/external_imported/vcpkg/ports/geos/portfile.cmake @@ -1,24 +1,23 @@ -set(GEOS_VERSION 3.10.0) +set(GEOS_VERSION 3.11.0) vcpkg_download_distfile(ARCHIVE URLS "https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" FILENAME "geos-${GEOS_VERSION}.tar.bz2" - SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e + SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF ${GEOS_VERSION} + REF "${GEOS_VERSION}" PATCHES disable-warning-4996.patch fix-exported-config.patch - install-hpp-files.patch + fix_clang-cl.patch ) +vcpkg_list(SET EXTRA_OPTIONS) if(VCPKG_TARGET_IS_MINGW) - set(_CMAKE_EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") -else() - set(_CMAKE_EXTRA_OPTIONS "") + vcpkg_list(APPEND EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") endif() vcpkg_cmake_configure( @@ -29,36 +28,23 @@ vcpkg_cmake_configure( -DBUILD_GEOSOP=OFF -DBUILD_TESTING=OFF -DBUILD_BENCHMARKS=OFF - ${_CMAKE_EXTRA_OPTIONS} - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports + ${EXTRA_OPTIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS) vcpkg_fixup_pkgconfig() -function(geos_add_debug_postfix config_file) - file(READ "${config_file}" contents) - string(REGEX REPLACE "(-lgeos(_c)?)d?([^-_d])" "\\1d\\3" fixed_contents "${contents}") - file(WRITE "${config_file}" "${fixed_contents}") -endfunction() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") - file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) - endif() -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/geos.pc") - if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config" FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE @@ -72,8 +58,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -# Handle copyright -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/geos/copyright" COPYONLY) - vcpkg_copy_pdbs() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/geos/vcpkg.json b/external_imported/vcpkg/ports/geos/vcpkg.json index 3a55c6442..664133a3a 100644 --- a/external_imported/vcpkg/ports/geos/vcpkg.json +++ b/external_imported/vcpkg/ports/geos/vcpkg.json @@ -1,8 +1,10 @@ { "name": "geos", - "version": "3.10.0", + "version": "3.11.0", + "port-version": 1, "description": "Geometry Engine Open Source", - "homepage": "https://www.osgeo.org/projects/geos/", + "homepage": "https://libgeos.org/", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/getopt-win32/CMakeLists.txt b/external_imported/vcpkg/ports/getopt-win32/CMakeLists.txt new file mode 100644 index 000000000..ffa02c808 --- /dev/null +++ b/external_imported/vcpkg/ports/getopt-win32/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.14) + +project(getopt-win32 C) + +if(BUILD_SHARED_LIBS) + add_definitions(-DEXPORTS_GETOPT) +else() + add_definitions(-DSTATIC_GETOPT) +endif() +add_library(getopt getopt.c) +install(TARGETS getopt) diff --git a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake index 041c8ad30..6528e442d 100644 --- a/external_imported/vcpkg/ports/getopt-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/getopt-win32/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME) - message(FATAL_ERROR "getopt-win32 only supports building on Windows Desktop") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/getopt @@ -11,38 +7,17 @@ vcpkg_from_github( PATCHES getopt.h.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - list(APPEND OPTIONS "/p:ConfigurationType=StaticLibrary") -else() - list(APPEND OPTIONS "/p:ConfigurationType=DynamicLibrary") -endif() - -set(_file "${SOURCE_PATH}/getopt.vcxproj") -file(READ "${_file}" _contents) -if(VCPKG_CRT_LINKAGE STREQUAL static) - string(REPLACE "MultiThreadedDLL" "MultiThreaded" _contents "${_contents}") - string(REPLACE "MultiThreadedDebugDLL" "MultiThreadedDebug" _contents "${_contents}") -else() - string(REPLACE "MultiThreaded" "MultiThreadedDLL" _contents "${_contents}") - string(REPLACE "MultiThreadedDebug" "MultiThreadedDebugDLL" _contents "${_contents}") -endif() -file(WRITE "${_file}" "${_contents}") - +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH getopt.vcxproj - LICENSE_SUBPATH LICENSE - OPTIONS ${OPTIONS} -) - -# Copy header file(COPY "${SOURCE_PATH}/getopt.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/") -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/getopt.h" " #define __GETOPT_H_" " #define __GETOPT_H_\n #define STATIC_GETOPT" ) endif() +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json index a53db8ae7..81213e0d4 100644 --- a/external_imported/vcpkg/ports/getopt-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/getopt-win32/vcpkg.json @@ -1,9 +1,15 @@ { "name": "getopt-win32", - "version-string": "0.1", - "port-version": 2, + "version": "0.1", + "port-version": 4, "description": "An implementation of getopt.", - "homepage": "https://github.com/libimobiledevice-win32", + "homepage": "https://github.com/libimobiledevice-win32/getopt", "license": "LGPL-3.0-only", - "supports": "windows" + "supports": "windows & !mingw", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/getopt/vcpkg.json b/external_imported/vcpkg/ports/getopt/vcpkg.json index cd31a2441..4626df727 100644 --- a/external_imported/vcpkg/ports/getopt/vcpkg.json +++ b/external_imported/vcpkg/ports/getopt/vcpkg.json @@ -1,13 +1,13 @@ { "name": "getopt", "version-string": "0", - "port-version": 1, + "port-version": 2, "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.", "supports": "!uwp", "dependencies": [ { "name": "getopt-win32", - "platform": "windows" + "platform": "windows & !mingw" } ] } diff --git a/external_imported/vcpkg/ports/gklib/build-fixes.patch b/external_imported/vcpkg/ports/gklib/build-fixes.patch new file mode 100644 index 000000000..dc78c3711 --- /dev/null +++ b/external_imported/vcpkg/ports/gklib/build-fixes.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cd1b4b..a6b629e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(GKlib C) + + option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) +@@ -22,10 +22,12 @@ if(UNIX) + target_link_libraries(GKlib m) + endif(UNIX) + +-include_directories("test") +-add_subdirectory("test") +- +-install(TARGETS GKlib +- ARCHIVE DESTINATION lib/${LINSTALL_PATH} +- LIBRARY DESTINATION lib/${LINSTALL_PATH}) +-install(FILES ${GKlib_includes} DESTINATION include/${HINSTALL_PATH}) ++install(TARGETS GKlib EXPORT GKlibTargets ++ INCLUDES DESTINATION "include/GKlib" ++ ) ++install(FILES ${GKlib_includes} DESTINATION "include/GKlib") ++install(FILES "win32/adapt.h" DESTINATION "include/GKlib/win32") ++install(EXPORT GKlibTargets FILE "GKlibTargets.cmake" DESTINATION "share/gklib") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/gklib/GKlibConfig.cmake" [=[ ++include("${CMAKE_CURRENT_LIST_DIR}/GKlibTargets.cmake") ++]=]) +diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake +index d83b208..8019067 100644 +--- a/GKlibSystem.cmake ++++ b/GKlibSystem.cmake +@@ -16,7 +16,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GKlib_COPTS "/Ox") + set(GKlib_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GKlib_COPTS "-DUSE_GKREGEX") +@@ -34,7 +33,7 @@ if(CMAKE_COMPILER_IS_GNUCC) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GKlib_COPTIONS "${GKlib_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99") +@@ -60,7 +59,7 @@ endif(OPENMP) + if(GDB) + set(GKlib_COPTS "${GKlib_COPTS} -g") + set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror") +-else() ++elseif(0) + set(GKlib_COPTS "-O3") + endif(GDB) + +diff --git a/gk_arch.h b/gk_arch.h +index 8c8ac50..122e087 100644 +--- a/gk_arch.h ++++ b/gk_arch.h +@@ -31,9 +31,9 @@ + #endif + + +-#ifdef __MSC__ +- #include "ms_stdint.h" +- #include "ms_inttypes.h" ++#ifdef __MSC__ ++ #include ++ #include + #include "ms_stat.h" + #include "win32/adapt.h" + #else +@@ -60,9 +60,4 @@ typedef ptrdiff_t ssize_t; + #define PTRDIFF_MAX INT64_MAX + #endif + +-/* MSC does not have INFINITY defined */ +-#ifndef INFINITY +-#define INFINITY FLT_MAX +-#endif +- + #endif diff --git a/external_imported/vcpkg/ports/gklib/fix-mingw.patch b/external_imported/vcpkg/ports/gklib/fix-mingw.patch new file mode 100644 index 000000000..6cb6136df --- /dev/null +++ b/external_imported/vcpkg/ports/gklib/fix-mingw.patch @@ -0,0 +1,32 @@ +diff --git a/gk_arch.h b/gk_arch.h +index 122e087..c8a322f 100644 +--- a/gk_arch.h ++++ b/gk_arch.h +@@ -42,7 +42,9 @@ + #endif + #include + #include ++#ifndef _WIN32 # MinGW + #include ++#endif + #include + #include + #endif +diff --git a/gk_getopt.h b/gk_getopt.h +index 4bb8611..cc416ab 100644 +--- a/gk_getopt.h ++++ b/gk_getopt.h +@@ -52,10 +52,10 @@ struct gk_option { + + + /* Function prototypes */ +-extern int gk_getopt(int __argc, char **__argv, char *__shortopts); +-extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts, ++extern int gk_getopt(int argc, char ** argv, char *__shortopts); ++extern int gk_getopt_long(int argc, char ** argv, char *__shortopts, + struct gk_option *__longopts, int *__longind); +-extern int gk_getopt_long_only (int __argc, char **__argv, ++extern int gk_getopt_long_only (int argc, char ** argv, + char *__shortopts, struct gk_option *__longopts, int *__longind); + + diff --git a/external_imported/vcpkg/ports/gklib/portfile.cmake b/external_imported/vcpkg/ports/gklib/portfile.cmake new file mode 100644 index 000000000..9eb486732 --- /dev/null +++ b/external_imported/vcpkg/ports/gklib/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KarypisLab/GKlib + REF b1cb3bd7f6bf4da641af901c8d455c0f858c816f + SHA512 e906c7af8b40ce1c4c4ea43cbfca3e3970e5595686333ac9ac80c6cbc558feb0e833f530f034161927030edac5272234c6ac9cad5287cb6edab0c0671ba3644c + PATCHES + build-fixes.patch + fix-mingw.patch +) + +# Delete files that are workarounds for very old copies of msvc. +file(REMOVE "${SOURCE_PATH}/ms_inttypes.h" "${SOURCE_PATH}/ms_stdint.h") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +gklib provides CMake targets: + find_package(GKlib CONFIG REQUIRED) + target_link_libraries(main PRIVATE GKlib) +]=]) diff --git a/external_imported/vcpkg/ports/gklib/vcpkg.json b/external_imported/vcpkg/ports/gklib/vcpkg.json new file mode 100644 index 000000000..c31e6f6e4 --- /dev/null +++ b/external_imported/vcpkg/ports/gklib/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gklib", + "version-date": "2022-07-27", + "port-version": 2, + "description": "General helper libraries for KarypisLab.", + "homepage": "https://github.com/KarypisLab/GKlib/", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/glad/portfile.cmake b/external_imported/vcpkg/ports/glad/portfile.cmake index f37f873c8..a64bb5411 100644 --- a/external_imported/vcpkg/ports/glad/portfile.cmake +++ b/external_imported/vcpkg/ports/glad/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dav1dde/glad - REF 7ece538856bf124d798ab323c8e1e64ebb83cb50 - SHA512 f6a8ba7d0d09b89c23b6f76962d3e6eef1babc8e1a659e238d30e143eb33ccba424957e5a6d46d99a714bfa2967523b193586d0ff24e29ad8d86c92c9faf9c02 + REF 1ecd45775d96f35170458e6b148eb0708967e402 # 0.1.36 + SHA512 f6292e9dbce503a95b6eca927a90cf8a06f5e3de39b84f9a47e0d9273a6ea3f6591a64d35f2e33b5ea353e0c784f15c38579fc15aa6c5b180154e241ccbb16fe HEAD_REF master - PATCHES encoding.patch find_python.patch + PATCHES + encoding.patch + find_python.patch ) if(NOT GLAD_PROFILE) diff --git a/external_imported/vcpkg/ports/glad/vcpkg.json b/external_imported/vcpkg/ports/glad/vcpkg.json index 2be2bd2a1..dec813399 100644 --- a/external_imported/vcpkg/ports/glad/vcpkg.json +++ b/external_imported/vcpkg/ports/glad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glad", - "version": "0.1.34", - "port-version": 3, + "version": "0.1.36", "description": "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.", "homepage": "https://github.com/Dav1dde/glad", "documentation": "https://github.com/Dav1dde/glad/wiki", @@ -341,13 +340,15 @@ ] }, "glx": { - "description": "Use `glx` spec instead of `gl`. Only available with the X Window System." + "description": "Use `glx` spec instead of `gl`. Only available with the X Window System.", + "supports": "!(windows | uwp)" }, "loader": { "description": "Generate loader logic." }, "wgl": { - "description": "Use `wgl` spec instead of `gl`. Only available for Windows and UWP platforms." + "description": "Use `wgl` spec instead of `gl`. Only available for Windows and UWP platforms.", + "supports": "!(linux | osx)" } } } diff --git a/external_imported/vcpkg/ports/glfw3/portfile.cmake b/external_imported/vcpkg/ports/glfw3/portfile.cmake index c95a6d6b3..ac85f54fb 100644 --- a/external_imported/vcpkg/ports/glfw3/portfile.cmake +++ b/external_imported/vcpkg/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 45ce5ddd197d5c58f50fdd3296a5131c894e5527 #v3.3.7 - SHA512 0802b499cb56f5c4f575304279aafe7d812443fcf3dbfa75178cfba7a3693fb88731ae5dd29c6937598ba977de156d92af1ea99929b70ff72ed8429693f301c7 + REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8 + SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/glfw3/vcpkg.json b/external_imported/vcpkg/ports/glfw3/vcpkg.json index ef22ea545..b10ace797 100644 --- a/external_imported/vcpkg/ports/glfw3/vcpkg.json +++ b/external_imported/vcpkg/ports/glfw3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glfw3", - "version-semver": "3.3.7", + "version-semver": "3.3.8", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", "homepage": "https://github.com/glfw/glfw", "license": "Zlib", diff --git a/external_imported/vcpkg/ports/glib/libintl.patch b/external_imported/vcpkg/ports/glib/libintl.patch index c21c27942..8462893d5 100644 --- a/external_imported/vcpkg/ports/glib/libintl.patch +++ b/external_imported/vcpkg/ports/glib/libintl.patch @@ -1,18 +1,18 @@ diff --git a/meson.build b/meson.build -index c418f50b1..e7158c036 100644 +index 7773f56..171d193 100644 --- a/meson.build +++ b/meson.build -@@ -2048,42 +2048,10 @@ endif +@@ -2089,42 +2089,10 @@ endif # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. libintl_deps = [] --if cc.has_function('ngettext', args : osx_ldflags) +-if cc.has_function('ngettext') - have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') -else - # First just find the bare library. - libintl = cc.find_library('intl', required : false) - # The bare library probably won't link without help if it's static. -- if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl) +- if libintl.found() and not cc.has_function('ngettext', dependencies : libintl) - libintl_iconv = cc.find_library('iconv', required : false) - # libintl supports different threading APIs, which may not - # require additional flags, but it defaults to using pthreads if @@ -22,10 +22,10 @@ index c418f50b1..e7158c036 100644 - # also defining the macros with the -pthread flag. - libintl_pthread = cc.find_library('pthread', required : false) - # Try linking with just libiconv. -- if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv]) +- if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) - libintl_deps += [libintl_iconv] - # Then also try linking with pthreads. -- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread]) +- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv, libintl_pthread]) - libintl_deps += [libintl_iconv, libintl_pthread] - else - libintl = disabler() @@ -37,14 +37,15 @@ index c418f50b1..e7158c036 100644 - have_bind_textdomain_codeset = true # proxy-libintl supports it - else - libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, -+libintl = dependency('Intl', method:'cmake', required : true) -+libintl_deps += [libintl] -+have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, - dependencies : libintl_deps) +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', +- dependencies : libintl_deps) - endif -endif - ++libintl = dependency('Intl', method:'cmake', required : true) ++libintl_deps += [libintl] ++have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', ++ dependencies : libintl_deps) glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) # We require gettext to always be present diff --git a/external_imported/vcpkg/ports/glib/portfile.cmake b/external_imported/vcpkg/ports/glib/portfile.cmake index 8ef135df7..5e4f6454e 100644 --- a/external_imported/vcpkg/ports/glib/portfile.cmake +++ b/external_imported/vcpkg/ports/glib/portfile.cmake @@ -1,26 +1,16 @@ -# Glib relies on DllMain on Windows -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - #remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655 -endif() - -set(GLIB_MAJOR_MINOR 2.70) -set(GLIB_PATCH 5) -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" - FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" - SHA512 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8) - -vcpkg_extract_source_archive_ex( +set(GLIB_MAJOR_MINOR 2.72) +set(GLIB_PATCH 3) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${GLIB_VERSION} + REPO GNOME/glib + REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}" + SHA512 805100bdd240122e1a74b432d7be7458af5b3b0507d46ed9cb0ce2ed6facf6e7d927b1d869831c9ba21b4a40a6667989ff69fc4f661bd044cb08932184804e79 PATCHES use-libiconv-on-windows.patch libintl.patch ) - if (selinux IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") @@ -41,7 +31,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dinstalled_tests=false ${OPTIONS} @@ -54,15 +44,15 @@ vcpkg_install_meson(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -set(GLIB_TOOLS gdbus - gio - gio-querymodules - glib-compile-resources - glib-compile-schemas - gobject-query - gresource - gsettings - ) +set(GLIB_TOOLS gdbus + gio + gio-querymodules + glib-compile-resources + glib-compile-schemas + gobject-query + gresource + gsettings + ) if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_OSX) @@ -88,7 +78,7 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() @@ -98,20 +88,20 @@ else() set(SYSTEM_LIBRARIES resolv mount blkid selinux) endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}") endif() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Fix python scripts set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") diff --git a/external_imported/vcpkg/ports/glib/vcpkg.json b/external_imported/vcpkg/ports/glib/vcpkg.json index 6ad02e28c..93148fd12 100644 --- a/external_imported/vcpkg/ports/glib/vcpkg.json +++ b/external_imported/vcpkg/ports/glib/vcpkg.json @@ -1,9 +1,11 @@ { "name": "glib", - "version": "2.70.5", + "version": "2.72.3", + "port-version": 3, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", - "supports": "!uwp & !(windows & static)", + "license": "LGPL-2.1-only", + "supports": "!uwp", "dependencies": [ "dirent", "gettext", diff --git a/external_imported/vcpkg/ports/glog/fix_cplusplus_macro.patch b/external_imported/vcpkg/ports/glog/fix_cplusplus_macro.patch new file mode 100644 index 000000000..c949089e5 --- /dev/null +++ b/external_imported/vcpkg/ports/glog/fix_cplusplus_macro.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d145517..681b791 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -669,6 +669,10 @@ if (CYGWIN OR WIN32) + target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) + endif (CYGWIN OR WIN32) + ++if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914)) ++ target_compile_options(glog INTERFACE "/Zc:__cplusplus") ++endif() ++ + if (WITH_CUSTOM_PREFIX) + target_compile_definitions (glog PUBLIC GLOG_CUSTOM_PREFIX_SUPPORT) + endif (WITH_CUSTOM_PREFIX) diff --git a/external_imported/vcpkg/ports/glog/fix_crosscompile_symbolize.patch b/external_imported/vcpkg/ports/glog/fix_crosscompile_symbolize.patch new file mode 100644 index 000000000..13ffe77cd --- /dev/null +++ b/external_imported/vcpkg/ports/glog/fix_crosscompile_symbolize.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d314abe..d145517 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -450,6 +450,9 @@ endif (HAVE_CXX11_ATOMIC) + + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) ++ if(CMAKE_CROSSCOMPILING) ++ set(HAVE_SYMBOLIZE 0) ++ else() + cmake_push_check_state (RESET) + set (CMAKE_REQUIRED_LIBRARIES DbgHelp) + +@@ -480,6 +483,7 @@ if (WITH_SYMBOLIZE) + ]=] HAVE_SYMBOLIZE) + + cmake_pop_check_state () ++ endif() + + if (HAVE_SYMBOLIZE) + set (HAVE_STACKTRACE 1) diff --git a/external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch index 31219437b..8727ebe0f 100644 --- a/external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch +++ b/external_imported/vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -1,44 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28e2688..cf87798 100644 +index 846b444..20441d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -843,36 +843,6 @@ write_basic_package_version_file ( +@@ -1027,7 +1027,7 @@ write_basic_package_version_file ( + export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) export (PACKAGE glog) - --get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) -- --# Directory containing the find modules relative to the config install --# directory. --file (RELATIVE_PATH glog_REL_CMake_MODULES -- ${_PREFIX}/${_glog_CMake_INSTALLDIR} -- ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake) -- --get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES} -- DIRECTORY) -- --set (glog_FULL_CMake_DATADIR -- ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR}) -- --configure_file (glog-modules.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY) -- --install (CODE --" --set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") --configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" -- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) --file (INSTALL -- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" -- DESTINATION -- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") --" -- COMPONENT Development --) - ++if(0) + get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) + + # Directory containing the find modules relative to the config install +@@ -1063,6 +1063,7 @@ file (INSTALL + " + COMPONENT Development + ) ++endif() + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake diff --git a/glog-config.cmake.in b/glog-config.cmake.in index 5c5c9c0..31fac52 100644 --- a/glog-config.cmake.in @@ -51,27 +31,3 @@ index 5c5c9c0..31fac52 100644 @gflags_DEPENDENCY@ @Unwind_DEPENDENCY@ -diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in -deleted file mode 100644 -index 71c5160..0000000 ---- a/glog-modules.cmake.in -+++ /dev/null -@@ -1,18 +0,0 @@ --cmake_policy (PUSH) --cmake_policy (SET CMP0057 NEW) -- --if (CMAKE_VERSION VERSION_LESS 3.3) -- message (FATAL_ERROR "glog-modules.cmake requires the consumer " -- "to use CMake 3.3 (or newer)") --endif (CMAKE_VERSION VERSION_LESS 3.3) -- --set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") --list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) -- --if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " -- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " -- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") --endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- --cmake_policy (POP) diff --git a/external_imported/vcpkg/ports/glog/fix_log_every_n.patch b/external_imported/vcpkg/ports/glog/fix_log_every_n.patch deleted file mode 100644 index 529715ff0..000000000 --- a/external_imported/vcpkg/ports/glog/fix_log_every_n.patch +++ /dev/null @@ -1,848 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61e5f6c..889df87 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --#set (CMAKE_DEBUG_POSTFIX d) -+#set (CMAKE_DEBUG_POSTFIX d) - set (CMAKE_THREAD_PREFER_PTHREAD 1) - - find_package (GTest) -@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H - ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h - ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h - src/glog/log_severity.h -+ src/glog/platform.h - ) - - set (GLOG_SRCS -diff --git a/src/demangle.cc b/src/demangle.cc -index f3e6ad7..8c0bdc7 100644 ---- a/src/demangle.cc -+++ b/src/demangle.cc -@@ -38,14 +38,14 @@ - #include "utilities.h" - #include "demangle.h" - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #pragma comment(lib, "dbghelp") - #endif - - _START_GOOGLE_NAMESPACE_ - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - typedef struct { - const char *abbrev; - const char *real_name; -@@ -1324,7 +1324,7 @@ static bool ParseTopLevelMangledName(State *state) { - - // The demangler entry point. - bool Demangle(const char *mangled, char *out, int out_size) { --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // When built with incremental linking, the Windows debugger - // library provides a more complicated `Symbol->Name` with the - // Incremental Linking Table offset, which looks like -diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc -index be48341..c65adc4 100644 ---- a/src/demangle_unittest.cc -+++ b/src/demangle_unittest.cc -@@ -62,7 +62,7 @@ static const char *DemangleIt(const char * const mangled) { - } - } - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - - TEST(Demangle, Windows) { - EXPECT_STREQ( -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 421f1e0..3ecacfb 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -35,7 +35,6 @@ - // - #ifndef _LOGGING_H_ - #define _LOGGING_H_ -- - #include - #include - #include -@@ -58,6 +57,8 @@ - #define GLOG_MSVC_POP_WARNING() - #endif - -+#include -+ - #if @ac_cv_have_glog_export@ - #include "glog/export.h" - #endif -@@ -101,7 +102,7 @@ - - #ifdef HAVE_CXX11_ATOMIC - #include --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - #include - #endif - -@@ -1057,7 +1058,7 @@ namespace google { - __FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - - #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -diff --git a/src/glog/platform.h b/src/glog/platform.h -new file mode 100644 -index 0000000..e614411 ---- /dev/null -+++ b/src/glog/platform.h -@@ -0,0 +1,58 @@ -+// Copyright (c) 2008, Google Inc. -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions are -+// met: -+// -+// * Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// * Redistributions in binary form must reproduce the above -+// copyright notice, this list of conditions and the following disclaimer -+// in the documentation and/or other materials provided with the -+// distribution. -+// * Neither the name of Google Inc. nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+// -+// Author: Shinichiro Hamaji -+// -+// Detect supported platforms. -+ -+#ifndef GLOG_PLATFORM_H -+#define GLOG_PLATFORM_H -+ -+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -+#define GLOG_OS_WINDOWS -+#elif defined(__CYGWIN__) || defined(__CYGWIN32__) -+#define GLOG_OS_CYGWIN -+#elif defined(linux) || defined(__linux) || defined(__linux__) -+#ifndef GLOG_OS_LINUX -+#define GLOG_OS_LINUX -+#endif -+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -+#define GLOG_OS_MACOSX -+#elif defined(__FreeBSD__) -+#define GLOG_OS_FREEBSD -+#elif defined(__NetBSD__) -+#define GLOG_OS_NETBSD -+#elif defined(__OpenBSD__) -+#define GLOG_OS_OPENBSD -+#else -+// TODO(hamaji): Add other platforms. -+#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. -+#endif -+ -+#endif // GLOG_PLATFORM_H -diff --git a/src/googletest.h b/src/googletest.h -index 7230606..a7ce3c2 100644 ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -72,7 +72,7 @@ _END_GOOGLE_NAMESPACE_ - #define GOOGLE_GLOG_DLL_DECL - - static inline string GetTempDir() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - return "/tmp"; - #else - char tmp[MAX_PATH]; -@@ -81,7 +81,7 @@ static inline string GetTempDir() { - #endif - } - --#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) -+#if defined(GLOG_OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) - // The test will run in glog/vsproject/ - // (e.g., glog/vsproject/logging_unittest). - static const char TEST_SRC_DIR[] = "../.."; -@@ -207,7 +207,7 @@ static inline void CalledAbort() { - longjmp(g_jmp_buf, 1); - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // TODO(hamaji): Death test somehow doesn't work in Windows. - #define ASSERT_DEATH(fn, msg) - #else -@@ -490,7 +490,7 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { - WriteToFile(golden, munged_golden); - string munged_captured = cap->filename() + ".munged"; - WriteToFile(captured, munged_captured); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - string diffcmd("fc " + munged_golden + " " + munged_captured); - #else - string diffcmd("diff -u " + munged_golden + " " + munged_captured); -@@ -532,7 +532,7 @@ class Thread { - virtual ~Thread() {} - - void SetJoinable(bool) {} --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - void Start() { - handle_ = CreateThread(NULL, - 0, -@@ -565,7 +565,7 @@ class Thread { - return NULL; - } - --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - HANDLE handle_; - DWORD th_; - #else -@@ -574,7 +574,7 @@ class Thread { - }; - - static inline void SleepForMilliseconds(int t) { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L - const struct timespec req = {0, t * 1000 * 1000}; - nanosleep(&req, NULL); -diff --git a/src/logging.cc b/src/logging.cc -index 71de91d..f251d67 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -59,7 +59,7 @@ - #include - #include // for errno - #include --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - #include "windows/dirent.h" - #else - #include // for automatic removal of old logs -@@ -122,7 +122,7 @@ GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false), - "log messages go to stderr in addition to logfiles"); - GLOG_DEFINE_bool(colorlogtostderr, false, - "color messages logged to stderr (if supported by terminal)"); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. " - "Logs can grow very quickly and they are rarely read before they " - "need to be evicted from memory. Instead, drop them from memory " -@@ -198,7 +198,7 @@ GLOG_DEFINE_bool(log_utc_time, false, - #define PATH_SEPARATOR '/' - - #ifndef HAVE_PREAD --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #define ssize_t SSIZE_T - #endif -@@ -241,7 +241,7 @@ static void GetHostName(string* hostname) { - *buf.nodename = '\0'; - } - *hostname = buf.nodename; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - char buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameA(buf, &len)) { -@@ -258,7 +258,7 @@ static void GetHostName(string* hostname) { - // Returns true iff terminal supports using colors in output. - static bool TerminalSupportsColor() { - bool term_supports_color = false; --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // on Windows TERM variable is usually not set, but the console does - // support colors. - term_supports_color = true; -@@ -312,7 +312,7 @@ static GLogColor SeverityToColor(LogSeverity severity) { - return color; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - - // Returns the character attribute for the given color. - static WORD GetColorAttribute(GLogColor color) { -@@ -337,7 +337,7 @@ static const char* GetAnsiColorCode(GLogColor color) { - return NULL; // stop warning about return type. - } - --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - - // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 - static int32 MaxLogSize() { -@@ -753,7 +753,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fwrite(message, len, 1, stderr); - return; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - const HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); - - // Gets the current text color. -@@ -775,7 +775,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color)); - fwrite(message, len, 1, stderr); - fprintf(stderr, "\033[m"); // Resets the terminal to default. --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - } - - static void WriteToStderr(const char* message, size_t len) { -@@ -788,7 +788,7 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, - const char* message, size_t message_len, size_t prefix_len) { - if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { - ColoredWriteToStderr(severity, message, message_len); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On Windows, also output to the debugger - ::OutputDebugStringA(message); - #elif defined(__ANDROID__) -@@ -1056,7 +1056,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - } - return false; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // https://github.com/golang/go/issues/27638 - make sure we seek to the end to append - // empirically replicated with wine over mingw build - if (!FLAGS_timestamp_in_logfile_name) { -@@ -1080,7 +1080,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - linkpath += linkname; - unlink(linkpath.c_str()); // delete old one if it exists - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // TODO(hamaji): Create lnk file on Windows? - #elif defined(HAVE_UNISTD_H) - // We must have unistd.h. -@@ -1270,7 +1270,7 @@ void LogFileObject::Write(bool force_flush, - (bytes_since_flush_ >= 1000000) || - (CycleClock_Now() >= next_flush_time_) ) { - FlushUnlocked(); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - // Only consider files >= 3MiB - if (FLAGS_drop_log_memory && file_length_ >= (3 << 20)) { - // Don't evict the most recent 1-2MiB so as not to impact a tailer -@@ -1305,7 +1305,7 @@ void LogFileObject::Write(bool force_flush, - - - LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7), dir_delim_('/') { --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - dir_delim_ = '\\'; - #endif - } -@@ -1898,7 +1898,7 @@ void LogMessage::RecordCrashReason( - # define ATTRIBUTE_NORETURN - #endif - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - __declspec(noreturn) - #endif - static void logging_fail() ATTRIBUTE_NORETURN; -@@ -2223,7 +2223,7 @@ bool SendEmail(const char*dest, const char *subject, const char*body){ - - static void GetTempDirectories(vector* list) { - list->clear(); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On windows we'll try to find a directory in this order: - // C:/Documents & Settings/whomever/TEMP (or whatever GetTempPath() is) - // C:/TMP/ -@@ -2282,7 +2282,7 @@ const vector& GetLoggingDirectories() { - logging_directories_list->push_back(FLAGS_log_dir.c_str()); - } else { - GetTempDirectories(logging_directories_list); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - char tmp[MAX_PATH]; - if (GetWindowsDirectoryA(tmp, MAX_PATH)) - logging_directories_list->push_back(tmp); -@@ -2325,7 +2325,7 @@ void TruncateLogFile(const char *path, int64 limit, int64 keep) { - // Don't follow symlinks unless they're our own fd symlinks in /proc - int flags = O_RDWR; - // TODO(hamaji): Support other environments. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - const char *procfd_prefix = "/proc/self/fd/"; - if (strncmp(procfd_prefix, path, strlen(procfd_prefix))) flags |= O_NOFOLLOW; - #endif -@@ -2464,7 +2464,7 @@ int posix_strerror_r(int err, char *buf, size_t len) { - return 0; - } else { - buf[0] = '\000'; --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - if (reinterpret_cast(rc) < sys_nerr) { - // This means an error on MacOSX or FreeBSD. - return -1; -diff --git a/src/logging_custom_prefix_unittest.cc b/src/logging_custom_prefix_unittest.cc -index c9fb5b8..8740fad 100644 ---- a/src/logging_custom_prefix_unittest.cc -+++ b/src/logging_custom_prefix_unittest.cc -@@ -588,7 +588,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -670,7 +670,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -799,7 +799,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -942,7 +942,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -951,7 +951,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1205,7 +1205,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc -index edc7d35..ce3c483 100644 ---- a/src/logging_unittest.cc -+++ b/src/logging_unittest.cc -@@ -561,7 +561,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -643,7 +643,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -772,7 +772,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -915,7 +915,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -924,7 +924,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1178,7 +1178,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/signalhandler.cc b/src/signalhandler.cc -index b6d6e25..ababf86 100644 ---- a/src/signalhandler.cc -+++ b/src/signalhandler.cc -@@ -63,7 +63,7 @@ const struct { - { SIGILL, "SIGILL" }, - { SIGFPE, "SIGFPE" }, - { SIGABRT, "SIGABRT" }, --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - { SIGBUS, "SIGBUS" }, - #endif - { SIGTERM, "SIGTERM" }, -@@ -208,7 +208,7 @@ void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { - formatter.AppendUint64((uintptr_t)pthread_self(), 16); - formatter.AppendString(") "); - // Only linux has the PID of the signal sender in si_pid. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - formatter.AppendString("from PID "); - formatter.AppendUint64(siginfo->si_pid, 10); - formatter.AppendString("; "); -@@ -253,7 +253,7 @@ void InvokeDefaultSignalHandler(int signal_number) { - sig_action.sa_handler = SIG_DFL; - sigaction(signal_number, &sig_action, NULL); - kill(getpid(), signal_number); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(signal_number, SIG_DFL); - raise(signal_number); - #endif -@@ -267,7 +267,7 @@ static pthread_t* g_entered_thread_id_pointer = NULL; - - // Dumps signal and stack frame information, and invokes the default - // signal handler once our job is done. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - void FailureSignalHandler(int signal_number) - #else - void FailureSignalHandler(int signal_number, -@@ -314,7 +314,7 @@ void FailureSignalHandler(int signal_number, - // First dump time info. - DumpTimeInfo(); - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - // Get the program counter from ucontext. - void *pc = GetPC(ucontext); - DumpStackFrameInfo("PC: ", pc); -@@ -364,7 +364,7 @@ bool IsFailureSignalHandlerInstalled() { - sigaction(SIGABRT, NULL, &sig_action); - if (sig_action.sa_sigaction == &FailureSignalHandler) - return true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - return kFailureSignalHandlerInstalled; - #endif // HAVE_SIGACTION - return false; -@@ -385,7 +385,7 @@ void InstallFailureSignalHandler() { - CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); - } - kFailureSignalHandlerInstalled = true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - for (size_t i = 0; i < ARRAYSIZE(kFailureSignals); ++i) { - CHECK_NE(signal(kFailureSignals[i].number, &FailureSignalHandler), - SIG_ERR); -@@ -395,7 +395,7 @@ void InstallFailureSignalHandler() { - } - - void InstallFailureWriter(void (*writer)(const char* data, int size)) { --#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS) -+#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS) - g_failure_writer = writer; - #endif // HAVE_SIGACTION - } -diff --git a/src/stacktrace_x86-inl.h b/src/stacktrace_x86-inl.h -index af2783d..99c5de7 100644 ---- a/src/stacktrace_x86-inl.h -+++ b/src/stacktrace_x86-inl.h -@@ -31,9 +31,9 @@ - - #include // for uintptr_t - --#include "utilities.h" // for OS_* macros -+#include "utilities.h" // for GLOG_OS_* macros - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - #include - #include - #endif -@@ -74,7 +74,7 @@ static void **NextStackFrame(void **old_sp) { - // last two pages in the address space - if ((uintptr_t)new_sp >= 0xffffe000) return NULL; - #endif --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - if (!STRICT_UNWINDING) { - // Lax sanity checks cause a crash in 32-bit tcmalloc/crash_reason_test - // on AMD-based machines with VDSO-enabled kernels. -diff --git a/src/symbolize.cc b/src/symbolize.cc -index f7fbc53..8688ca2 100644 ---- a/src/symbolize.cc -+++ b/src/symbolize.cc -@@ -46,7 +46,7 @@ - // and memmove(). We assume they are async-signal-safe. - // - // Additional header can be specified by the GLOG_BUILD_CONFIG_INCLUDE --// macro to add platform specific defines (e.g. OS_OPENBSD). -+// macro to add platform specific defines (e.g. GLOG_OS_OPENBSD). - - #ifdef GLOG_BUILD_CONFIG_INCLUDE - #include GLOG_BUILD_CONFIG_INCLUDE -@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ - #if defined(HAVE_DLFCN_H) - #include - #endif --#if defined(OS_OPENBSD) -+#if defined(GLOG_OS_OPENBSD) - #include - #else - #include -@@ -846,7 +846,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - - #include - #include -@@ -871,7 +871,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+#elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #include - #include -diff --git a/src/symbolize_unittest.cc b/src/symbolize_unittest.cc -index 0b53230..7e8f6d4 100644 ---- a/src/symbolize_unittest.cc -+++ b/src/symbolize_unittest.cc -@@ -359,7 +359,7 @@ static void ATTRIBUTE_NOINLINE TestWithReturnAddress() { - #endif - } - --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #ifdef _MSC_VER - #include -@@ -411,10 +411,10 @@ int main(int argc, char **argv) { - TestWithPCInsideNonInlineFunction(); - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# else // OS_WINDOWS -+# else // GLOG_OS_WINDOWS - printf("PASS (no symbolize_unittest support)\n"); - return 0; - # endif // __ELF__ -diff --git a/src/utilities.cc b/src/utilities.cc -index 6b9a69e..ecda730 100644 ---- a/src/utilities.cc -+++ b/src/utilities.cc -@@ -151,7 +151,7 @@ static void DumpStackTraceAndExit() { - sigemptyset(&sig_action.sa_mask); - sig_action.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sig_action, NULL); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(SIGABRT, SIG_DFL); - #endif // HAVE_SIGACTION - } -@@ -180,7 +180,7 @@ bool IsGoogleLoggingInitialized() { - return g_program_invocation_short_name != NULL; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - struct timeval { - long tv_sec, tv_usec; - }; -@@ -236,9 +236,9 @@ bool PidHasChanged() { - - pid_t GetTID() { - // On Linux and MacOSX, we try to use gettid(). --#if defined OS_LINUX || defined OS_MACOSX -+#if defined GLOG_OS_LINUX || defined GLOG_OS_MACOSX - #ifndef __NR_gettid --#ifdef OS_MACOSX -+#ifdef GLOG_OS_MACOSX - #define __NR_gettid SYS_gettid - #elif ! defined __i386__ - #error "Must define __NR_gettid for non-x86 platforms" -@@ -258,12 +258,12 @@ pid_t GetTID() { - // the value change to "true". - lacks_gettid = true; - } --#endif // OS_LINUX || OS_MACOSX -+#endif // GLOG_OS_LINUX || GLOG_OS_MACOSX - - // If gettid() could not be used, we use one of the following. --#if defined OS_LINUX -+#if defined GLOG_OS_LINUX - return getpid(); // Linux: getpid returns thread ID when gettid is absent --#elif defined OS_WINDOWS && !defined OS_CYGWIN -+#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN - return GetCurrentThreadId(); - #elif defined(HAVE_PTHREAD) - // If none of the techniques above worked, we use pthread_self(). -@@ -275,7 +275,7 @@ pid_t GetTID() { - - const char* const_basename(const char* filepath) { - const char* base = strrchr(filepath, '/'); --#ifdef OS_WINDOWS // Look for either path separator in Windows -+#ifdef GLOG_OS_WINDOWS // Look for either path separator in Windows - if (!base) - base = strrchr(filepath, '\\'); - #endif -@@ -288,7 +288,7 @@ const string& MyUserName() { - } - static void MyUserNameInitializer() { - // TODO(hamaji): Probably this is not portable. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - const char* user = getenv("USERNAME"); - #else - const char* user = getenv("USER"); -@@ -337,7 +337,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { - CHECK(!IsGoogleLoggingInitialized()) - << "You called InitGoogleLogging() twice!"; - const char* slash = strrchr(argv0, '/'); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - if (!slash) slash = strrchr(argv0, '\\'); - #endif - g_program_invocation_short_name = slash ? slash + 1 : argv0; -diff --git a/src/utilities.h b/src/utilities.h -index e4115ad..86bc296 100644 ---- a/src/utilities.h -+++ b/src/utilities.h -@@ -34,25 +34,6 @@ - #ifndef UTILITIES_H__ - #define UTILITIES_H__ - --#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) --# define OS_WINDOWS --#elif defined(__CYGWIN__) || defined(__CYGWIN32__) --# define OS_CYGWIN --#elif defined(linux) || defined(__linux) || defined(__linux__) --# ifndef OS_LINUX --# define OS_LINUX --# endif --#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) --# define OS_MACOSX --#elif defined(__FreeBSD__) --# define OS_FREEBSD --#elif defined(__NetBSD__) --# define OS_NETBSD --#elif defined(__OpenBSD__) --# define OS_OPENBSD --#else --// TODO(hamaji): Add other platforms. --#endif - - // printf macros for size_t, in the style of inttypes.h - #ifdef _LP64 -@@ -76,12 +57,12 @@ - - #include - --#if defined(OS_WINDOWS) -+#include "glog/logging.h" -+#if defined(GLOG_OS_WINDOWS) - # include "port.h" - #endif - - #include "config.h" --#include "glog/logging.h" - - // There are three different ways we can try to get the stack trace: - // -@@ -114,7 +95,7 @@ - # define STACKTRACE_H "stacktrace_x86_64-inl.h" - # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 - # define STACKTRACE_H "stacktrace_powerpc-inl.h" --# elif defined(OS_WINDOWS) -+# elif defined(GLOG_OS_WINDOWS) - # define STACKTRACE_H "stacktrace_windows-inl.h" - # endif - #endif -@@ -130,12 +111,12 @@ - #ifndef GLOG_NO_SYMBOLIZE_DETECTION - #ifndef HAVE_SYMBOLIZE - // defined by gcc --#if defined(__ELF__) && defined(OS_LINUX) -+#if defined(__ELF__) && defined(GLOG_OS_LINUX) - # define HAVE_SYMBOLIZE --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - // Use dladdr to symbolize. - # define HAVE_SYMBOLIZE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - // Use DbgHelp to symbolize - # define HAVE_SYMBOLIZE - #endif -@@ -154,7 +135,7 @@ namespace glog_internal_namespace_ { - #ifdef HAVE___ATTRIBUTE__ - # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) - # define HAVE_ATTRIBUTE_NOINLINE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - # define ATTRIBUTE_NOINLINE __declspec(noinline) - # define HAVE_ATTRIBUTE_NOINLINE - #else diff --git a/external_imported/vcpkg/ports/glog/glog_disable_debug_postfix.patch b/external_imported/vcpkg/ports/glog/glog_disable_debug_postfix.patch index 9f62ec379..e8e8cbe20 100644 --- a/external_imported/vcpkg/ports/glog/glog_disable_debug_postfix.patch +++ b/external_imported/vcpkg/ports/glog/glog_disable_debug_postfix.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62ebbcc..28e2688 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --set (CMAKE_DEBUG_POSTFIX d) -+#set (CMAKE_DEBUG_POSTFIX d) - set (CMAKE_THREAD_PREFER_PTHREAD 1) - - find_package (GTest) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20441d1..d314abe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden) + set (CMAKE_POSITION_INDEPENDENT_CODE ON) + set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) + +-set (CMAKE_DEBUG_POSTFIX d) ++#set (CMAKE_DEBUG_POSTFIX d) + set (CMAKE_THREAD_PREFER_PTHREAD 1) + + find_package (GTest NO_MODULE) diff --git a/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch b/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch deleted file mode 100644 index 83ee58cb5..000000000 --- a/external_imported/vcpkg/ports/glog/nogdi-nominmax.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..42cc9b1 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -103,6 +103,18 @@ - #ifdef HAVE_CXX11_ATOMIC - #include - #elif defined(GLOG_OS_WINDOWS) -+# ifndef WIN32_LEAN_AND_MEAN -+# define WIN32_LEAN_AND_MEAN // We only need minimal includes -+# endif -+// To avoid macro definition of ERROR. -+# ifndef NOGDI -+# define NOGDI -+# endif -+// To avoid macro definition of min/max. -+# ifndef NOMINMAX -+# define NOMINMAX -+# endif -+ - #include - #endif - -@@ -1061,7 +1073,7 @@ namespace google { - #elif defined(GLOG_OS_WINDOWS) - - #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ -- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -+ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1071,7 +1083,7 @@ namespace google { - &what_to_do).stream() - - #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ -- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -+ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (condition && \ - (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ -@@ -1082,7 +1094,7 @@ namespace google { - &what_to_do).stream() - - #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ -- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -+ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ - InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1092,7 +1104,7 @@ namespace google { - &what_to_do).stream() - - #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ -- static int LOG_OCCURRENCES = 0; \ -+ static volatile unsigned LOG_OCCURRENCES = 0; \ - if (LOG_OCCURRENCES <= n) \ - InterlockedIncrement(&LOG_OCCURRENCES); \ - if (LOG_OCCURRENCES <= n) \ diff --git a/external_imported/vcpkg/ports/glog/portfile.cmake b/external_imported/vcpkg/ports/glog/portfile.cmake index 5738ba092..ea67d8ad1 100644 --- a/external_imported/vcpkg/ports/glog/portfile.cmake +++ b/external_imported/vcpkg/ports/glog/portfile.cmake @@ -1,21 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.5.0 - SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a + REF v0.6.0 + SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 HEAD_REF master PATCHES - glog_disable_debug_postfix.patch - fix_glog_CMAKE_MODULE_PATH.patch - fix_log_every_n.patch - nogdi-nominmax.patch + fix_glog_CMAKE_MODULE_PATH.patch + glog_disable_debug_postfix.patch + fix_crosscompile_symbolize.patch + fix_cplusplus_macro.patch +) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + unwind WITH_UNWIND ) +file(REMOVE "${SOURCE_PATH}/glog-modules.cmake.in") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -25,5 +30,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/glog/vcpkg.json b/external_imported/vcpkg/ports/glog/vcpkg.json index 3c0296ec8..9f88d84f2 100644 --- a/external_imported/vcpkg/ports/glog/vcpkg.json +++ b/external_imported/vcpkg/ports/glog/vcpkg.json @@ -1,9 +1,9 @@ { "name": "glog", - "version": "0.5.0", + "version": "0.6.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", - "license": null, + "license": "BSD-3-Clause", "dependencies": [ "gflags", { @@ -14,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "unwind": { + "description": "Enable libunwind support", + "supports": "linux" + } + } } diff --git a/external_imported/vcpkg/ports/glslang/always-install-resource-limits.patch b/external_imported/vcpkg/ports/glslang/always-install-resource-limits.patch deleted file mode 100644 index 56c34dfc4..000000000 --- a/external_imported/vcpkg/ports/glslang/always-install-resource-limits.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 751d1cd71..0f5cf0dc0 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) - install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - -- if(BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS OR TRUE) - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/external_imported/vcpkg/ports/glslang/glslang-config.cmake b/external_imported/vcpkg/ports/glslang/glslang-config.cmake deleted file mode 100644 index 5eb356151..000000000 --- a/external_imported/vcpkg/ports/glslang/glslang-config.cmake +++ /dev/null @@ -1,7 +0,0 @@ -include(CMakeFindDependencyMacro) - -find_dependency(Threads) - -foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper) - include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL) -endforeach() diff --git a/external_imported/vcpkg/ports/glslang/portfile.cmake b/external_imported/vcpkg/ports/glslang/portfile.cmake index e153195dc..90620f64b 100644 --- a/external_imported/vcpkg/ports/glslang/portfile.cmake +++ b/external_imported/vcpkg/ports/glslang/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 11.8.0 - SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 + REF 11.11.0 + SHA512 c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd HEAD_REF master PATCHES ignore-crt.patch - always-install-resource-limits.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -43,13 +42,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/bin") -if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake") - message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") -endif() - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/glslang/usage b/external_imported/vcpkg/ports/glslang/usage new file mode 100644 index 000000000..795414824 --- /dev/null +++ b/external_imported/vcpkg/ports/glslang/usage @@ -0,0 +1,4 @@ +The package glslang provides CMake targets: + + find_package(glslang CONFIG REQUIRED) + target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OGLCompiler glslang::glslangValidator glslang::spirv-remap glslang::glslang-default-resource-limits glslang::SPVRemapper glslang::SPIRV glslang::HLSL) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/glslang/vcpkg.json b/external_imported/vcpkg/ports/glslang/vcpkg.json index b09ee8ded..1642c1298 100644 --- a/external_imported/vcpkg/ports/glslang/vcpkg.json +++ b/external_imported/vcpkg/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "11.8.0", + "version": "11.11.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "dependencies": [ diff --git a/external_imported/vcpkg/ports/gmp/portfile.cmake b/external_imported/vcpkg/ports/gmp/portfile.cmake index b4acb3047..00abc340a 100644 --- a/external_imported/vcpkg/ports/gmp/portfile.cmake +++ b/external_imported/vcpkg/ports/gmp/portfile.cmake @@ -43,12 +43,17 @@ if(VCPKG_CROSSCOMPILING) set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") endif() +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^(arm|arm64)$") + list(APPEND OPTIONS --enable-assembly=no) +endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS ${OPTIONS} --enable-cxx + --with-pic ) set(tool_names bases fac fib jacobitab psqr trialdivtab) @@ -71,9 +76,10 @@ if(NOT VCPKG_CROSSCOMPILING) endif() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/info") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/gmp/usage b/external_imported/vcpkg/ports/gmp/usage new file mode 100644 index 000000000..c8ff10a97 --- /dev/null +++ b/external_imported/vcpkg/ports/gmp/usage @@ -0,0 +1,11 @@ +The package gmp can be imported via CMake FindPkgConfig module: + + # gmp + find_package(PkgConfig REQUIRED) + pkg_check_modules(gmp REQUIRED IMPORTED_TARGET gmp) + target_link_libraries(main PkgConfig::gmp) + + # gmpxx + find_package(PkgConfig REQUIRED) + pkg_check_modules(gmpxx REQUIRED IMPORTED_TARGET gmpxx) + target_link_libraries(main PkgConfig::gmpxx) diff --git a/external_imported/vcpkg/ports/gmp/vcpkg.json b/external_imported/vcpkg/ports/gmp/vcpkg.json index 8393feed1..1398c8233 100644 --- a/external_imported/vcpkg/ports/gmp/vcpkg.json +++ b/external_imported/vcpkg/ports/gmp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 9, + "port-version": 13, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", - "supports": "!(windows & (arm | arm64))", + "license": "LGPL-3.0-only OR GPL-2.0-only", "dependencies": [ { "name": "gmp", diff --git a/external_imported/vcpkg/ports/gobject-introspection/0003-fix-paths.patch b/external_imported/vcpkg/ports/gobject-introspection/0003-fix-paths.patch new file mode 100644 index 000000000..b305da447 --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/0003-fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in +index 75c35a7..499ed01 100644 +--- a/tools/g-ir-tool-template.in ++++ b/tools/g-ir-tool-template.in +@@ -46,7 +46,7 @@ if debug: + filedir = os.path.dirname(__file__) + + # Try using relative paths first so that the installation prefix is relocatable +-datadir = os.path.abspath(os.path.join(filedir, '..', 'share')) ++datadir = os.path.abspath(os.path.join(filedir, '..', '..', 'share')) + # Fallback to hard-coded paths if the relocatable paths are wrong + if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): + datadir = "@datarootdir@" +@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir + + # Respect gir_dir_prefix + girdir = '' +-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) ++girdir = datadir + builtins.__dict__['GIRDIR'] = [girdir] + + # Again, relative paths first so that the installation prefix is relocatable diff --git a/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake index 56e6be53e..24458ac62 100644 --- a/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake +++ b/external_imported/vcpkg/ports/gobject-introspection/portfile.cmake @@ -1,11 +1,11 @@ -set(GI_MAJOR_MINOR 1.70) +set(GI_MAJOR_MINOR 1.72) set(GI_PATCH 0) vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/gobject-introspection/${GI_MAJOR_MINOR}/gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" FILENAME "gobject-introspection-${GI_MAJOR_MINOR}.${GI_PATCH}.tar.xz" - SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0 + SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5 ) vcpkg_extract_source_archive_ex( @@ -14,15 +14,16 @@ vcpkg_extract_source_archive_ex( PATCHES 0001-g-ir-tool-template.in.patch 0002-cross-build.patch + 0003-fix-paths.patch + python.patch ) -vcpkg_find_acquire_program(PYTHON3) vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) set(OPTIONS_DEBUG -Dbuild_introspection_data=false) set(OPTIONS_RELEASE -Dbuild_introspection_data=true) -if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET AND +if(VCPKG_CROSSCOMPILING AND NOT (CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")) list(APPEND OPTIONS_RELEASE -Dgi_cross_use_prebuilt_gi=true) endif() @@ -68,7 +69,8 @@ vcpkg_copy_tools(TOOL_NAMES ${GI_TOOLS} AUTO_CLEAN) foreach(script IN LISTS GI_SCRIPTS) file(READ "${CURRENT_PACKAGES_DIR}/bin/${script}" _contents) string(REPLACE "#!/usr/bin/env ${PYTHON3}" "#!/usr/bin/env python3" _contents "${_contents}") - string(REPLACE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib" _contents "${_contents}") + string(REPLACE "datadir = \"${CURRENT_PACKAGES_DIR}/share\"" "raise Exception('could not find right path') " _contents "${_contents}") + string(REPLACE "pylibdir = os.path.join('${CURRENT_PACKAGES_DIR}/lib', 'gobject-introspection')" "raise Exception('could not find right path') " _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${_contents}") file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${script}") diff --git a/external_imported/vcpkg/ports/gobject-introspection/python.patch b/external_imported/vcpkg/ports/gobject-introspection/python.patch new file mode 100644 index 000000000..5a196ae65 --- /dev/null +++ b/external_imported/vcpkg/ports/gobject-introspection/python.patch @@ -0,0 +1,29 @@ +diff --git a/giscanner/meson.build b/giscanner/meson.build +index e63a5ab78..3d7dc678a 100644 +--- a/giscanner/meson.build ++++ b/giscanner/meson.build +@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner', + dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep], + ) + + # https://github.com/mesonbuild/meson/issues/4117 + if host_machine.system() == 'windows' ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency() + else ++ python_ext_dep = libpython_dep +- python_ext_dep = python.dependency().partial_dependency(compile_args: true) + endif + + if not python_ext_dep.found() +diff --git a/meson.build b/meson.build +index 2a9d68556..cffe9014c 100644 +--- a/meson.build ++++ b/meson.build +@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi', + + # python headers +-cc.check_header('Python.h', dependencies: [python.dependency()], required: true) ++libpython_dep = dependency('python-3.10', method : 'pkg-config') ++cc.check_header('Python.h', dependencies: [libpython_dep], required: true) + diff --git a/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json index e7996b925..ed8a0fa75 100644 --- a/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json +++ b/external_imported/vcpkg/ports/gobject-introspection/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gobject-introspection", - "version": "1.70.0", + "version": "1.72.0", "port-version": 1, "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", + "license": null, "supports": "!static & (native | (windows & x86))", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake index 40ed37f4b..6dc05bf8b 100644 --- a/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.39.0 - SHA512 d61ebcdb6680797f20147ee1d37b9d29c82e8c7267b944a346685bfa607cf0b7f1772854874b967f19b4f54ddcefc94a771a4686cafcd6a5fed426d64e553205 + REF v2.2.0 + SHA512 7f51f993464ff72e34a39ba0095774ba71b51203aba82953aaedf9c6eb610efe00d1e798f848575e7e526cf1e5de512bf2024adce50506bab429ac765429159c HEAD_REF main PATCHES support_absl_cxx17.patch @@ -17,9 +17,21 @@ list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") # This feature does not exist, but allows us to simplify the vcpkg.json file. list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") +# google-cloud-cpp uses dialogflow_cx and dialogflow_es. Underscores +# are invalid in `vcpkg` features, we use dashes (`-`) as a separator +# for the `vcpkg` feature name, and convert it here to something that +# `google-cloud-cpp` would like. +if ("dialogflow-cx" IN_LIST FEATURES) + list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-cx") + list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_cx") +endif () +if ("dialogflow-es" IN_LIST FEATURES) + list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-es") + list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_es") +endif () vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" @@ -32,7 +44,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") foreach(feature IN LISTS FEATURES) set(config_path "lib/cmake/google_cloud_cpp_${feature}") # Most features get their own package in `google-cloud-cpp`. @@ -47,7 +59,7 @@ foreach(feature IN LISTS FEATURES) endforeach() # These packages are automatically installed depending on what features are # enabled. -foreach(suffix common googleapis grpc_utils) +foreach(suffix common googleapis grpc_utils rest_internal dialogflow_cx dialogflow_es) set(config_path "lib/cmake/google_cloud_cpp_${suffix}") if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") continue() @@ -57,26 +69,9 @@ foreach(suffix common googleapis grpc_utils) DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() -# These packages are only for backwards compability. The google-cloud-cpp team -# is planning to remove them around 2022-02-15. -foreach(package - googleapis - bigtable_client - pubsub_client - spanner_client - storage_client) - set(config_path "lib/cmake/${package}") - if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") - continue() - endif() - vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" - CONFIG_PATH "${config_path}" - DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${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) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch b/external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch index 5697fd3a9..61de927ba 100644 --- a/external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch +++ b/external_imported/vcpkg/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -1,9 +1,9 @@ -diff --git a//CMakeLists.txt b/CMakeLists.txt -index 4d03fee..42bb13c 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a0d07d1..18320b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) endif () +find_package(absl CONFIG REQUIRED) @@ -15,18 +15,18 @@ index 4d03fee..42bb13c 100644 +endif () + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3) message( diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h -index f02cb7a..0ea8c9c 100644 +index b61eb48..327278f 100644 --- a/google/cloud/internal/port_platform.h +++ b/google/cloud/internal/port_platform.h @@ -49,6 +49,8 @@ - // Abort compilation if the compiler does not support C++11. - #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L - # error "C++11 or newer is required" + // Abort compilation if the compiler does not support C++14. + #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L + # error "C++14 or newer is required" +#elif defined(ABSL_USE_CXX17) && GOOGLE_CLOUD_CPP_CPP_VERSION < 201703L +# error "Compiled to use Abseil with C++17 support, but using with C++ < C++17" - #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L - // Abort the build if the version of the compiler is too old. With CMake we + // Abort the build if the version of the compiler is too old. This simplifies diff --git a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json index 5036979e7..a8143fc4f 100644 --- a/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.39.0", - "port-version": 1, + "version": "2.2.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -100,6 +99,7 @@ }, "asset": { "description": "Cloud Asset API C++ Client Library", + "supports": "!windows", "dependencies": [ { "name": "google-cloud-cpp", @@ -134,6 +134,30 @@ } ] }, + "baremetalsolution": { + "description": "Bare Metal Solution API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "beyondcorp": { + "description": "BeyondCorp API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "bigquery": { "description": "The Google Cloud BigQuery C++ client library", "dependencies": [ @@ -184,6 +208,7 @@ }, "channel": { "description": "Cloud Channel API C++ Client Library", + "supports": "!windows", "dependencies": [ { "name": "google-cloud-cpp", @@ -278,6 +303,18 @@ } ] }, + "dataplex": { + "description": "Cloud Dataplex API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "dataproc": { "description": "Cloud Dataproc API C++ Client Library", "dependencies": [ @@ -302,6 +339,30 @@ } ] }, + "dialogflow-cx": { + "description": "Cloud Dialogflow CX API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "dialogflow-es": { + "description": "Cloud Dialogflow ES API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "dlp": { "description": "Cloud Data Loss Prevention (DLP) API C++ Client Library", "dependencies": [ @@ -486,6 +547,18 @@ } ] }, + "logging": { + "description": "Google Cloud Logging C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "managedidentities": { "description": "Managed Service for Microsoft Active Directory API C++ Client Library", "dependencies": [ @@ -546,6 +619,18 @@ } ] }, + "optimization": { + "description": "Cloud Optimization API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "orgpolicy": { "description": "Organization Policy API C++ Client Library", "dependencies": [ @@ -678,6 +763,18 @@ } ] }, + "run": { + "description": "Cloud Run Admin API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "scheduler": { "description": "Cloud Scheduler API C++ Client Library", "dependencies": [ @@ -786,6 +883,18 @@ } ] }, + "speech": { + "description": "The Google Cloud Speech-to-Text C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "storage": { "description": "The Google Cloud Storage C++ client library", "dependencies": [ @@ -883,6 +992,18 @@ } ] }, + "video": { + "description": "Video Services C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "videointelligence": { "description": "Cloud Video Intelligence API C++ Client Library", "dependencies": [ diff --git a/external_imported/vcpkg/ports/gperf/portfile.cmake b/external_imported/vcpkg/ports/gperf/portfile.cmake index 1e589d7c9..34644af1b 100644 --- a/external_imported/vcpkg/ports/gperf/portfile.cmake +++ b/external_imported/vcpkg/ports/gperf/portfile.cmake @@ -14,12 +14,12 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools + OPTIONS_RELEASE -DCMAKE_INSTALL_BINDIR=tools/gperf ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/external_imported/vcpkg/ports/gperf/vcpkg.json b/external_imported/vcpkg/ports/gperf/vcpkg.json index da0d637c4..02f6116f1 100644 --- a/external_imported/vcpkg/ports/gperf/vcpkg.json +++ b/external_imported/vcpkg/ports/gperf/vcpkg.json @@ -1,7 +1,17 @@ { "name": "gperf", "version": "3.1", - "port-version": 3, + "port-version": 4, "description": "GNU perfect hash function generator", - "homepage": "https://www.gnu.org/software/gperf/" + "homepage": "https://www.gnu.org/software/gperf/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/gpgmm/portfile.cmake b/external_imported/vcpkg/ports/gpgmm/portfile.cmake new file mode 100644 index 000000000..7a6f054c1 --- /dev/null +++ b/external_imported/vcpkg/ports/gpgmm/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/gpgmm + REF v0.0.4 + SHA512 2ffc3c8299f2d10cb1c0013cd306ba45781a644fa0aa426ef1dfa616e4b53671461a376f65b7068b1ff8a4a2d1a6f9539664174eb5830ea6a760ef5e5d0fc6b0 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DGPGMM_STANDALONE=OFF + -DGPGMM_ENABLE_TESTS=OFF + -DGPGMM_ENABLE_VK=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${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(GLOB GPGMM_INCLUDE "${SOURCE_PATH}/src/include/*.h") +file(COPY ${GPGMM_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gpgmm/vcpkg.json b/external_imported/vcpkg/ports/gpgmm/vcpkg.json new file mode 100644 index 000000000..1786fab40 --- /dev/null +++ b/external_imported/vcpkg/ports/gpgmm/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gpgmm", + "version": "0.0.4", + "description": "GPGMM is a General-Purpose GPU Memory Management library. It provides a common set of GPU memory routines optimized for GPUs. The library helps developers manage video memory by implementing the necessary functionality across components based on Vulkan or D3D12", + "homepage": "https://github.com/intel/GPGMM/", + "license": "Apache-2.0", + "supports": "windows & !(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/gppanel/portfile.cmake b/external_imported/vcpkg/ports/gppanel/portfile.cmake index b05377133..f4c719f33 100644 --- a/external_imported/vcpkg/ports/gppanel/portfile.cmake +++ b/external_imported/vcpkg/ports/gppanel/portfile.cmake @@ -6,19 +6,22 @@ vcpkg_from_github( REF f58a9028f7c9a8e9b4324ff2165951f558365f90 SHA512 4ec5fbef4c487d351c60f48b0c0e41c5d077989ab96f827b9fd5ef01c167d50f39a313bd82db1b5df19d14025983e83db4d19cc4048c1c50fc8ef9128de15575 HEAD_REF master - PATCHES 00001-fix-build.patch + PATCHES + 00001-fix-build.patch + use-complex-header.patch ) 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 + -DCMAKE_CXX_STANDARD=11 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/gpPanel) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/gpPanel) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/external_imported/vcpkg/ports/gppanel/use-complex-header.patch b/external_imported/vcpkg/ports/gppanel/use-complex-header.patch new file mode 100644 index 000000000..aa9c553f0 --- /dev/null +++ b/external_imported/vcpkg/ports/gppanel/use-complex-header.patch @@ -0,0 +1,14 @@ +diff --git a/include/Fourier.h b/include/Fourier.h +index af55d2a..4283be8 100644 +--- a/include/Fourier.h ++++ b/include/Fourier.h +@@ -13,7 +13,8 @@ + //============================================================================== + // FORWARD DECLARATION + //============================================================================== +-namespace std { template class complex; } ++#include ++ + #define SQUARE(real,imag) sqrt((real)*(real)+(imag)*(imag)) + + //============================================================================== diff --git a/external_imported/vcpkg/ports/gppanel/vcpkg.json b/external_imported/vcpkg/ports/gppanel/vcpkg.json index 2493d41a8..0ffcd4063 100644 --- a/external_imported/vcpkg/ports/gppanel/vcpkg.json +++ b/external_imported/vcpkg/ports/gppanel/vcpkg.json @@ -1,10 +1,19 @@ { "name": "gppanel", "version-date": "2020-05-20", - "port-version": 1, + "port-version": 2, "description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.", "homepage": "https://github.com/woollybah/gppanel", + "license": "GPL-2.0-or-later WITH WxWindows-exception-3.1", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wxwidgets" ] } diff --git a/external_imported/vcpkg/ports/graphene/fix_clang-cl.patch b/external_imported/vcpkg/ports/graphene/fix_clang-cl.patch new file mode 100644 index 000000000..0b71ea3bb --- /dev/null +++ b/external_imported/vcpkg/ports/graphene/fix_clang-cl.patch @@ -0,0 +1,40 @@ +diff --git a/meson.build b/meson.build +index 1a93dbb95..2f5f7c891 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ conf = configuration_data() + common_cflags = [] + common_ldflags = [] + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + # Make MSVC more pedantic, this is a recommended pragma list + # from _Win32_Programming_ by Rector and Newcomer. Taken from + # glib's msvc_recommended_pragmas.h--please see that file for +@@ -117,7 +117,7 @@ endif + common_cflags = cc.get_supported_arguments(test_cflags) + + # MSVC: Let C4819 error out if we do not have the -utf-8 compiler flag +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + if not common_cflags.contains('-utf-8') + common_cflags += cc.get_supported_arguments('-we4819') + endif +@@ -202,7 +202,7 @@ if get_option('default_library') != 'static' + if host_system == 'windows' + conf.set('DLL_EXPORT', true) + conf.set('_GRAPHENE_PUBLIC', '__declspec(dllexport) extern') +- if cc.get_id() != 'msvc' ++ if cc.get_argument_syntax() != 'msvc' + extra_args += ['-fvisibility=hidden'] + endif + else +@@ -226,7 +226,7 @@ if get_option('gobject_types') + ) + build_gobject = gobject.found() + if build_gobject +- if cc.get_id() == 'msvc' ++ if cc.get_argument_syntax() == 'msvc' + extra_args += ['/FImsvc_recommended_pragmas.h'] + endif + endif diff --git a/external_imported/vcpkg/ports/graphene/portfile.cmake b/external_imported/vcpkg/ports/graphene/portfile.cmake index 8b5066367..2c16cdbc5 100644 --- a/external_imported/vcpkg/ports/graphene/portfile.cmake +++ b/external_imported/vcpkg/ports/graphene/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + fix_clang-cl.patch ) vcpkg_configure_meson( diff --git a/external_imported/vcpkg/ports/graphene/vcpkg.json b/external_imported/vcpkg/ports/graphene/vcpkg.json index f34bcb799..01f0cb6f7 100644 --- a/external_imported/vcpkg/ports/graphene/vcpkg.json +++ b/external_imported/vcpkg/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version": "1.10.2", - "port-version": 2, + "port-version": 3, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "supports": "!(arm & windows)", diff --git a/external_imported/vcpkg/ports/graphviz/vcpkg.json b/external_imported/vcpkg/ports/graphviz/vcpkg.json index 2419d09af..ea8b7ad36 100644 --- a/external_imported/vcpkg/ports/graphviz/vcpkg.json +++ b/external_imported/vcpkg/ports/graphviz/vcpkg.json @@ -1,10 +1,11 @@ { "name": "graphviz", "version-semver": "2.49.1", - "port-version": 3, + "port-version": 4, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", + "supports": "!(windows & arm64)", "dependencies": [ "cairo", "getopt", diff --git a/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch b/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch index a7f353d70..2aea0afd7 100644 --- a/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch +++ b/external_imported/vcpkg/ports/grpc/00001-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a97604..4967c4f 100644 +index 25990a5d8a..4bec4e1e72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -215,6 +215,9 @@ if(UNIX) +@@ -219,6 +219,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -11,8 +11,8 @@ index 7a97604..4967c4f 100644 + endif() endif() - # Use C99 standard -@@ -259,6 +262,9 @@ if(MSVC) + # Use C11 standard +@@ -263,6 +266,9 @@ if(MSVC) set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") @@ -21,8 +21,8 @@ index 7a97604..4967c4f 100644 + endif() # Silences thousands of trucation warnings set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") - endif() -@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # Tell MSVC to build grpc using utf-8 +@@ -430,6 +436,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 7a97604..4967c4f 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) +@@ -552,6 +562,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) endif () @@ -41,16 +41,16 @@ index 7a97604..4967c4f 100644 add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) -@@ -424,6 +435,7 @@ add_custom_target(tools_cxx +@@ -567,6 +578,7 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) +endif() - protobuf_generate_grpc_cpp( - src/proto/grpc/channelz/channelz.proto + protobuf_generate_grpc_cpp_with_import_path_correction( + src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 5d2bdc1..e9870c2 100644 +index 5d2bdc14de..e9870c2656 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; } diff --git a/external_imported/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch b/external_imported/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch index 0d1abe7f8..54b55c60b 100644 --- a/external_imported/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch +++ b/external_imported/vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14514b7..497470c 100644 +index 25990a5d8a..8a632d2289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake) - include(cmake/zlib.cmake) +@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) + endif() if(WIN32) - set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) endif() - # Create directory for generated .proto files + # Create directory for proto source files diff --git a/external_imported/vcpkg/ports/grpc/00005-fix-uwp-error.patch b/external_imported/vcpkg/ports/grpc/00005-fix-uwp-error.patch index ff86f68fe..fb4968429 100644 --- a/external_imported/vcpkg/ports/grpc/00005-fix-uwp-error.patch +++ b/external_imported/vcpkg/ports/grpc/00005-fix-uwp-error.patch @@ -1,8 +1,21 @@ +diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +index cb17759bba..a3c3598430 100644 +--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc ++++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +@@ -1032,7 +1032,7 @@ class HPackParser::Parser { + + private: + void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { +- const char* type; ++ const char* type = nullptr; + switch (log_info_.type) { + case LogInfo::kHeaders: + type = "HDR"; diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index 0dacbfef3e..0743a1b003 100644 +index 2e78b4de9e..77e88cab70 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc -@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, +@@ -181,6 +181,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, size_t len) { uint8_t* ptr = reinterpret_cast(p.get()); grpc_slice slice; @@ -10,7 +23,7 @@ index 0dacbfef3e..0743a1b003 100644 if (len <= sizeof(slice.data.inlined.bytes)) { slice.refcount = nullptr; slice.data.inlined.length = len; -@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { +@@ -199,7 +200,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { } grpc_slice grpc_slice_from_cpp_string(std::string str) { @@ -20,10 +33,10 @@ index 0dacbfef3e..0743a1b003 100644 slice.refcount = nullptr; slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index c94551545d..3fd9797316 100644 +index 4c0220837e..bb5a367107 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc -@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { +@@ -902,7 +902,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } diff --git a/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch b/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch deleted file mode 100644 index 871e170c4..000000000 --- a/external_imported/vcpkg/ports/grpc/00006-fix-uwp-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index 18abbda..9789983 100644 ---- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc -+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1052,7 +1052,7 @@ class HPackParser::Parser { - - private: - void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { -- const char* type; -+ const char* type = nullptr; - switch (log_info_.type) { - case LogInfo::kHeaders: - type = "HDR"; diff --git a/external_imported/vcpkg/ports/grpc/00009-use-system-upb.patch b/external_imported/vcpkg/ports/grpc/00009-use-system-upb.patch index e40b27dbb..35d936e47 100644 --- a/external_imported/vcpkg/ports/grpc/00009-use-system-upb.patch +++ b/external_imported/vcpkg/ports/grpc/00009-use-system-upb.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c3146b..ae06ea3 100644 +index 8498b6e435..12d50a26ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") +@@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library") set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,33 +12,49 @@ index 1c3146b..ae06ea3 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -1504,7 +1507,6 @@ target_link_libraries(gpr - absl::synchronization +@@ -1596,6 +1599,7 @@ target_link_libraries(gpr absl::time absl::optional -- upb + absl::variant ++ ${_gRPC_UPB_LIBRARIES} ) if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr -@@ -3927,6 +3929,7 @@ endif() +@@ -2400,7 +2404,6 @@ target_link_libraries(grpc + gpr + ${_gRPC_SSL_LIBRARIES} + address_sorting +- upb + ) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) + target_link_libraries(grpc "-framework CoreFoundation") +@@ -2961,7 +2964,6 @@ target_link_libraries(grpc_unsecure + absl::utility + gpr + address_sorting +- upb + ) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) + target_link_libraries(grpc_unsecure "-framework CoreFoundation") +@@ -4254,6 +4256,7 @@ endif() endif() +if (gRPC_UPB_PROVIDER STREQUAL "module") add_library(upb - third_party/upb/upb/decode_fast.c - third_party/upb/upb/decode.c -@@ -3984,7 +3987,7 @@ if(gRPC_INSTALL) + third_party/upb/third_party/utf8_range/naive.c + third_party/upb/third_party/utf8_range/range2-neon.c +@@ -4322,7 +4325,7 @@ if(gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() - - +endif() - add_executable(check_epollexclusive - test/build/check_epollexclusive.c + + add_executable(gen_hpack_tables diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in -index 3623f4a..df6ced5 100644 +index 3623f4aa5e..df6ced560e 100644 --- a/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in @@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) @@ -50,10 +66,10 @@ index 3623f4a..df6ced5 100644 # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index f2a0e50..ac6d397 100644 +index f2a0e508c3..09751f5ef0 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake -@@ -12,9 +12,21 @@ +@@ -12,9 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -67,12 +83,9 @@ index f2a0e50..ac6d397 100644 set(_gRPC_UPB_LIBRARIES upb) + -+ +elseif(gRPC_UPB_PROVIDER STREQUAL "package") + find_package(upb CONFIG REQUIRED) -+ set(_gRPC_UPB_LIBRARIES upb::upb) ++ set(_gRPC_UPB_LIBRARIES upb::fastdecode upb::json upb::upb upb::utf8_range upb::textformat upb::reflection upb::descriptor_upb_proto) + set(_gRPC_UPB_INCLUDE_DIR) -+ set(upb ${_gRPC_UPB_LIBRARIES}) + set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") +endif() -\ No newline at end of file diff --git a/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch b/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch deleted file mode 100644 index 75d986d61..000000000 --- a/external_imported/vcpkg/ports/grpc/00010-add-feature-absl-sync.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 497470c..9c07732 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2196,6 +2196,8 @@ target_link_libraries(grpc - ${_gRPC_UPB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::flat_hash_map -+ absl::time -+ absl::synchronization - absl::inlined_vector - absl::bind_front - absl::hash -@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure - ${_gRPC_UPB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::flat_hash_map -+ absl::time -+ absl::synchronization - absl::inlined_vector - absl::bind_front - absl::statusor -diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index c89ba26..81212b9 100644 ---- a/cmake/abseil-cpp.cmake -+++ b/cmake/abseil-cpp.cmake -@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") - find_package(absl REQUIRED CONFIG) - endif() - set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFIG)\nendif()") -+ if (gRPC_ABSL_SYNC_ENABLE) -+ add_definitions(-DGPR_ABSEIL_SYNC=1) -+ endif() diff --git a/external_imported/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch b/external_imported/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch deleted file mode 100644 index fb258f900..000000000 --- a/external_imported/vcpkg/ports/grpc/00011-fix-csharp_plugin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae77375eae..ad8815d2f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1960,10 +1960,14 @@ endif() - - if(gRPC_BUILD_CSHARP_EXT) - --add_library(grpc_csharp_ext SHARED -+add_library(grpc_csharp_ext - src/csharp/ext/grpc_csharp_ext.c - ) - -+if (WIN32 AND BUILD_SHARED_LIBS) -+ target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS) -+endif() -+ - set_target_properties(grpc_csharp_ext PROPERTIES - VERSION ${gRPC_CORE_VERSION} - SOVERSION ${gRPC_CORE_SOVERSION} -@@ -1977,6 +1981,12 @@ if(WIN32 AND MSVC) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb - DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL - ) -+ -+ install(TARGETS grpc_csharp_ext -+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ) - endif() - endif() - diff --git a/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch b/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch index 7ff404a8e..57af77625 100644 --- a/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch +++ b/external_imported/vcpkg/ports/grpc/00012-fix-use-cxx17.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c07732..54b4b23 100644 +index 25990a5d8a..ba8df92858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -321,6 +321,11 @@ include(cmake/ssl.cmake) - include(cmake/upb.cmake) - include(cmake/xxhash.cmake) +@@ -326,6 +326,11 @@ include(cmake/xxhash.cmake) include(cmake/zlib.cmake) -+ + include(cmake/download_archive.cmake) + +if (ABSL_USE_CXX17) + message(STATUS "Found absl uses CXX17, enable CXX17 feature.") + set(CMAKE_CXX_STANDARD 17) +endif() - - if(WIN32) - set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) ++ + # Setup external proto library at third_party/envoy-api with 2 download URLs + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api) + # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. diff --git a/external_imported/vcpkg/ports/grpc/00013-build-upbdefs.patch b/external_imported/vcpkg/ports/grpc/00013-build-upbdefs.patch deleted file mode 100644 index 9a601ec5a..000000000 --- a/external_imported/vcpkg/ports/grpc/00013-build-upbdefs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 59d6813..1ce8bce 100644 ---- a/cmake/upb.cmake -+++ b/cmake/upb.cmake -@@ -24,8 +24,21 @@ set(_gRPC_UPB_LIBRARIES upb) - - elseif(gRPC_UPB_PROVIDER STREQUAL "package") - find_package(upb CONFIG REQUIRED) -- set(_gRPC_UPB_LIBRARIES upb::upb) -+ set(_gRPC_UPB_LIBRARIES upb) - set(_gRPC_UPB_INCLUDE_DIR) -- set(upb ${_gRPC_UPB_LIBRARIES}) -+ add_library(upb STATIC -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c -+ ) -+ set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs) -+ target_include_directories(upb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated") -+ target_link_libraries(upb PUBLIC upb::all_libs) -+ if(gRPC_INSTALL) -+ install(TARGETS upb EXPORT gRPCTargets -+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ) -+ endif() - set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") - endif() diff --git a/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch b/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch index 01e064e3b..9a5c8efc1 100644 --- a/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/external_imported/vcpkg/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54b4b23..83fab3b 100644 +index 8498b6e435..4e2e9a6130 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17276,7 +17276,7 @@ generate_pkgconfig( +@@ -21946,7 +21946,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant" + "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz" ++ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_collections -lupb_extension_registry -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" "" "grpc.pc") diff --git a/external_imported/vcpkg/ports/grpc/00015-disable-download-archive.patch b/external_imported/vcpkg/ports/grpc/00015-disable-download-archive.patch new file mode 100644 index 000000000..b28bc72a7 --- /dev/null +++ b/external_imported/vcpkg/ports/grpc/00015-disable-download-archive.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/download_archive.cmake b/cmake/download_archive.cmake +index 820aafafb7..a59b785c7e 100644 +--- a/cmake/download_archive.cmake ++++ b/cmake/download_archive.cmake +@@ -19,6 +19,7 @@ file(MAKE_DIRECTORY ${_download_archive_TEMPORARY_DIR}) + # Note that strip_prefix strips the directory path prefix of the extracted + # archive content, and it may strip multiple directories. + function(download_archive destination url hash strip_prefix) ++ return() + # Fetch and validate + set(_TEMPORARY_FILE ${_download_archive_TEMPORARY_DIR}/${strip_prefix}.tar.gz) + message(STATUS "Downloading from ${url}, if failed, please try configuring again") diff --git a/external_imported/vcpkg/ports/grpc/portfile.cmake b/external_imported/vcpkg/ports/grpc/portfile.cmake index 11705ec43..5936a2f7d 100644 --- a/external_imported/vcpkg/ports/grpc/portfile.cmake +++ b/external_imported/vcpkg/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0 - SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d + REF v1.49.0 + SHA512 592413f0f907ec5c7c6b22366e418c589a653ef105b61bf0f98fc64dc40ccea0d2fadc9af9ade62bffa99cafec6e1305300cb9531202923614fe308b7f831210 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -14,14 +14,11 @@ vcpkg_from_github( 00003-undef-base64-macro.patch 00004-link-gdi32-on-windows.patch 00005-fix-uwp-error.patch - 00006-fix-uwp-error.patch 00009-use-system-upb.patch - 00010-add-feature-absl-sync.patch - 00011-fix-csharp_plugin.patch snprintf.patch 00012-fix-use-cxx17.patch - 00013-build-upbdefs.patch 00014-pkgconfig-upbdefs.patch + 00015-disable-download-archive.patch ) if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) @@ -40,7 +37,6 @@ endif() vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - absl-sync gRPC_ABSL_SYNC_ENABLE codegen gRPC_BUILD_CODEGEN ) @@ -64,8 +60,8 @@ vcpkg_cmake_configure( -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" - -DPROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" MAYBE_UNUSED_VARIABLES gRPC_MSVC_STATIC_RUNTIME ) @@ -90,11 +86,13 @@ else() configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY) endif() -# Ignore the C# extension DLL in bin/ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +if (VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/external_imported/vcpkg/ports/grpc/vcpkg.json b/external_imported/vcpkg/ports/grpc/vcpkg.json index 63b1b33dd..6fe26b8c4 100644 --- a/external_imported/vcpkg/ports/grpc/vcpkg.json +++ b/external_imported/vcpkg/ports/grpc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "grpc", - "version-semver": "1.44.0", + "version-semver": "1.49.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", + "license": "Apache-2.0", "dependencies": [ "abseil", { @@ -36,7 +37,7 @@ ], "features": { "absl-sync": { - "description": "Use abseil synchronization module" + "description": "Deprecated." }, "codegen": { "description": "Build code generator machinery" diff --git a/external_imported/vcpkg/ports/grppi/portfile.cmake b/external_imported/vcpkg/ports/grppi/portfile.cmake index 058f39fd0..11543d49b 100644 --- a/external_imported/vcpkg/ports/grppi/portfile.cmake +++ b/external_imported/vcpkg/ports/grppi/portfile.cmake @@ -1,25 +1,34 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arcosuc3m/grppi - REF v0.4.0 + REF v0.4.0 SHA512 f8235af6832958de420a68d4465a6c63701ab4385f3430d32f77c1d5e8212001262aad1a8aae04261ba889d592798cd3963843b190d325bddc1fe7dcc4aebd7d HEAD_REF master PATCHES fix-build-error.patch fix-support-other-compilers.patch + tbb.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(REMOVE "${SOURCE_PATH}/cmake.modules/FindTBB.cmake") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tbb GRPPI_TBB_ENABLE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGRPPI_DOXY_ENABLE=OFF - -DGRPPI_EXAMPLE_APPLICATIONS_ENABLE=OFF - -DGRPPI_UNIT_TEST_ENABLE=OFF + ${FEATURE_OPTIONS} + -DGRPPI_DOXY_ENABLE=OFF + -DGRPPI_EXAMPLE_APPLICATIONS_ENABLE=OFF + -DGRPPI_UNIT_TEST_ENABLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -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/external_imported/vcpkg/ports/grppi/tbb.patch b/external_imported/vcpkg/ports/grppi/tbb.patch new file mode 100644 index 000000000..8d17ee35f --- /dev/null +++ b/external_imported/vcpkg/ports/grppi/tbb.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09f1f9b..d58b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,15 +53,10 @@ endif() + include_directories("${CMAKE_SOURCE_DIR}/include") + + # TBB Library +-find_package( TBB ) +-if( TBB_FOUND ) +- option(GRPPI_TBB_ENABLE "Require TBB library" ON) +- message(STATUS "TBB found") +-else( TBB_FOUND ) +- option(GRPPI_TBB_ENABLE "Require TBB library" OFF ) +- set(GRPPI_TBB_ENABLE OFF CACHE BOOL "Require TBB library" FORCE) +- message(STATUS "TBB not found") +-endif( TBB_FOUND ) ++option(GRPPI_TBB_ENABLE "Enable TBB backend" OFF) ++if(GRPPI_TBB_ENABLE) ++ find_package(TBB CONFIG REQUIRED) ++endif() + + message( STATUS "TBB: " ${GRPPI_TBB_ENABLE} ) + if( GRPPI_TBB_ENABLE ) diff --git a/external_imported/vcpkg/ports/grppi/vcpkg.json b/external_imported/vcpkg/ports/grppi/vcpkg.json index 1cc832ab3..126b90f7c 100644 --- a/external_imported/vcpkg/ports/grppi/vcpkg.json +++ b/external_imported/vcpkg/ports/grppi/vcpkg.json @@ -1,7 +1,22 @@ { "name": "grppi", - "version-string": "0.4.0", - "port-version": 1, + "version": "0.4.0", + "port-version": 2, "description": "GrPPI is an open source generic and reusable parallel pattern programming interface developed at University Carlos III of Madrid.", - "homepage": "https://github.com/arcosuc3m/grppi" + "homepage": "https://github.com/arcosuc3m/grppi", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tbb": { + "description": "Enable tbb backend", + "dependencies": [ + "tbb" + ] + } + } } diff --git a/external_imported/vcpkg/ports/gsl/CMakeLists.txt b/external_imported/vcpkg/ports/gsl/CMakeLists.txt index 2d37f37e9..7e522cc5c 100644 --- a/external_imported/vcpkg/ports/gsl/CMakeLists.txt +++ b/external_imported/vcpkg/ports/gsl/CMakeLists.txt @@ -75,6 +75,9 @@ if(INSTALL_HEADERS) set(TARGET_INSTALL_OPTIONS PUBLIC_HEADER DESTINATION include/gsl) endif() +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gsl.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gsl.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(TARGETS gsl gslcblas RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/external_imported/vcpkg/ports/gsl/portfile.cmake b/external_imported/vcpkg/ports/gsl/portfile.cmake index fb746d71f..a107ce7b7 100644 --- a/external_imported/vcpkg/ports/gsl/portfile.cmake +++ b/external_imported/vcpkg/ports/gsl/portfile.cmake @@ -24,6 +24,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + 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) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/gsl/vcpkg.json b/external_imported/vcpkg/ports/gsl/vcpkg.json index c01838c61..44c14d97f 100644 --- a/external_imported/vcpkg/ports/gsl/vcpkg.json +++ b/external_imported/vcpkg/ports/gsl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "gsl", "version": "2.7.1", + "port-version": 1, "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch new file mode 100644 index 000000000..92e96f3c4 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch @@ -0,0 +1,111 @@ +diff --git a/ext/dts/meson.build b/ext/dts/meson.build +index 8ab3fc917..c19aa2264 100644 +--- a/ext/dts/meson.build ++++ b/ext/dts/meson.build +@@ -15,7 +15,7 @@ if not dca_dep.found() + endif + + no_warn_c_args = [] +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + # autotools didn't use the libdca pkg-config cflags, and they + # can point to a non-existing location (/usr/include/dca) + no_warn_c_args = ['-Wno-missing-include-dirs'] +diff --git a/gst-libs/gst/d3d11/meson.build b/gst-libs/gst/d3d11/meson.build +index 4a844ef75..cd97e8f7a 100644 +--- a/gst-libs/gst/d3d11/meson.build ++++ b/gst-libs/gst/d3d11/meson.build +@@ -174,7 +174,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/meson.build b/meson.build +index 7cab556e0..35531110b 100644 +--- a/meson.build ++++ b/meson.build +@@ -45,7 +45,7 @@ endif + + cdata = configuration_data() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +diff --git a/sys/asio/meson.build b/sys/asio/meson.build +index 3006d26ce..1afbd0022 100644 +--- a/sys/asio/meson.build ++++ b/sys/asio/meson.build +@@ -15,7 +15,7 @@ endif + + # FIXME: non-msvc is not tested, and unlikely supported yet because of + # tool-chain issue +-if cxx.get_id() != 'msvc' ++if cxx.get_argument_syntax() != 'msvc' + if asio_option.enabled() + error('asio plugin can only be built with MSVC') + else +diff --git a/sys/d3d11/meson.build b/sys/d3d11/meson.build +index 43f213d9c..9c9e9b535 100644 +--- a/sys/d3d11/meson.build ++++ b/sys/d3d11/meson.build +@@ -102,7 +102,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_mingw_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/sys/decklink/meson.build b/sys/decklink/meson.build +index d869e79a4..c7b37a7c6 100644 +--- a/sys/decklink/meson.build ++++ b/sys/decklink/meson.build +@@ -18,7 +18,7 @@ decklink_libs = [] + + if host_system == 'windows' + decklink_sources += ['win/DeckLinkAPIDispatch.cpp', 'win/DeckLinkAPI_i.c'] +- if cxx.get_id() == 'msvc' ++ if cxx.get_argument_syntax() == 'msvc' + # FIXME: Use commsuppwd.lib for debug builds? + comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink')) + if comutil_dep.found() +diff --git a/sys/mediafoundation/meson.build b/sys/mediafoundation/meson.build +index 828954909..af570f9ff 100644 +--- a/sys/mediafoundation/meson.build ++++ b/sys/mediafoundation/meson.build +@@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled() + subdir_done() + endif + +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + if mf_option.enabled() + error('mediafoundation plugin can only be built with MSVC') + endif +diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build +index a77160049..7c834d8ed 100644 +--- a/sys/msdk/meson.build ++++ b/sys/msdk/meson.build +@@ -139,13 +139,13 @@ if have_mfx_ver134 + endif + + if host_machine.system() == 'windows' +- if cc.get_id() != 'msvc' and msdk_option.enabled() ++ if cc.get_argument_syntax() != 'msvc' and msdk_option.enabled() + error('msdk plugin can only be built with MSVC') + endif + legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) + d3d11_dep = cc.find_library('d3d11', required: get_option('msdk')) + msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep]) +- msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' ++ msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc' + else + libva_dep = dependency('libva', required: get_option('msdk')) + libva_drm_dep = dependency('libva-drm', required: get_option('msdk')) diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch new file mode 100644 index 000000000..4c406427d --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-base.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 495671ebb..fff3ea518 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,7 +43,7 @@ plugins = [] + + cc = meson.get_compiler('c') + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -75,7 +75,7 @@ endif + core_conf = configuration_data() + + # Symbol visibility +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + export_define = '__declspec(dllexport) extern' + elif cc.has_argument('-fvisibility=hidden') + add_project_arguments('-fvisibility=hidden', language: 'c') diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-good.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-good.patch new file mode 100644 index 000000000..d2ed46e83 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-good.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 64705379f..0c55b9732 100644 +--- a/meson.build ++++ b/meson.build +@@ -30,7 +30,7 @@ plugins = [] + cc = meson.get_compiler('c') + host_system = host_machine.system() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -183,7 +183,7 @@ cdata.set('SIZEOF_OFF_T', cc.sizeof('off_t')) + # Here be fixmes. + # FIXME: check if this is correct + cdata.set('HAVE_CPU_X86_64', host_machine.cpu() == 'amd64') +-cdata.set('HAVE_GCC_ASM', cc.get_id() != 'msvc') ++cdata.set('HAVE_GCC_ASM', cc.get_argument_syntax() != 'msvc') + cdata.set_quoted('VERSION', gst_version) + cdata.set_quoted('PACKAGE_VERSION', gst_version) + cdata.set_quoted('GST_LICENSE', 'LGPL') diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch new file mode 100644 index 000000000..928a5785f --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch @@ -0,0 +1,57 @@ +diff --git a/gst/parse/meson.build b/gst/parse/meson.build +index 35ed6f2f4..5e38e49ea 100644 +--- a/gst/parse/meson.build ++++ b/gst/parse/meson.build +@@ -16,7 +16,7 @@ else + endif + + flex_cdata.set('FLEX', flex.path()) +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + flex_cdata.set('FLEX_ARGS', '--nounistd') + else + flex_cdata.set('FLEX_ARGS', '') +diff --git a/meson.build b/meson.build +index 772809e15..70b1eafc5 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,7 +36,7 @@ cc = meson.get_compiler('c') + + cdata = configuration_data() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -61,7 +61,7 @@ endif + + # Symbol visibility + have_visibility_hidden = false +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + export_define = '__declspec(dllexport) extern' + elif cc.has_argument('-fvisibility=hidden') + add_project_arguments('-fvisibility=hidden', language: 'c') +@@ -313,8 +313,10 @@ static __uint128_t v2 = 10; + static __uint128_t u; + u = v1 / v2; + }''' +-if cc.compiles(uint128_t_src, name : '__uint128_t available') +- cdata.set('HAVE_UINT128_T', 1) ++if cc.get_argument_syntax() != 'msvc' ++ if cc.compiles(uint128_t_src, name : '__uint128_t available') ++ cdata.set('HAVE_UINT128_T', 1) ++ endif + endif + + # All supported platforms have long long now +@@ -322,7 +324,7 @@ cdata.set('HAVE_LONG_LONG', 1) + + # We only want to use the __declspec(dllexport/import) dance in GST_EXPORT when + # building with MSVC +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 1) + else + cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 0) diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch new file mode 100644 index 000000000..ae83ee482 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 14be48c4c..83d019874 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,7 +31,7 @@ if have_cxx + cxx = meson.get_compiler('cpp') + endif + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/external_imported/vcpkg/ports/gstreamer/fix-clang-cl.patch b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl.patch new file mode 100644 index 000000000..d6eded2f5 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/fix-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 1316366ed..daeaf3cb1 100644 +--- a/meson.build ++++ b/meson.build +@@ -62,7 +62,7 @@ endif + # Ensure that MSVC interprets all source code as UTF-8. Only do this when we're + # not a subproject, because subprojects are not allowed to call + # add_global_arguments(). +-if not meson.is_subproject() and cc.get_id() == 'msvc' ++if not meson.is_subproject() and cc.get_argument_syntax() == 'msvc' + add_global_arguments( + cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 + language: ['c', 'cpp']) +@@ -316,7 +316,7 @@ if get_option('default_library') == 'static' + if cc.has_link_argument(link_arg) + gstfull_link_args += link_arg + link_deps += symbol_map +- elif cc.get_id() == 'msvc' ++ elif cc.get_argument_syntax() == 'msvc' + warning('FIXME: Provide a def file to publish the public symbols') + else + error('Failed to link with version script (' + symbol_map + '), check logs for details') diff --git a/external_imported/vcpkg/ports/gstreamer/plugins-base-x11.patch b/external_imported/vcpkg/ports/gstreamer/plugins-base-x11.patch new file mode 100644 index 000000000..9860308a9 --- /dev/null +++ b/external_imported/vcpkg/ports/gstreamer/plugins-base-x11.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 9b00253a0f..e3c3a0d920 100644 +--- a/meson.build ++++ b/meson.build +@@ -316,7 +316,7 @@ else + gtk_quartz_dep = dependency('', required : false) + endif + +-core_conf.set('HAVE_X11', x11_dep.found()) ++core_conf.set('HAVE_X11', false) + core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) + + if gio_dep.type_name() == 'pkgconfig' diff --git a/external_imported/vcpkg/ports/gstreamer/portfile.cmake b/external_imported/vcpkg/ports/gstreamer/portfile.cmake index 25cfb74b8..026227087 100644 --- a/external_imported/vcpkg/ports/gstreamer/portfile.cmake +++ b/external_imported/vcpkg/ports/gstreamer/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master - PATCHES gstreamer-disable-hot-doc.patch + PATCHES gstreamer-disable-hot-doc.patch fix-clang-cl.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH @@ -12,10 +12,10 @@ vcpkg_from_github( REF 1.19.2 SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master - PATCHES gstreamer-disable-no-unused.patch + PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch ) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch plugins-base-x11.patch) list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) endif() @@ -25,7 +25,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 d2005e6a3bda5f08395b131347e8f4054c2469e04e65d1acc1a1572bf10d81d4dad4e43d6a8600346b6175a2310f81157a0cd27398ef69b5363b16346febfb39 HEAD_REF master - PATCHES ${PLUGIN_BASE_PATCHES} + PATCHES ${PLUGIN_BASE_PATCHES} fix-clang-cl-base.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH @@ -33,7 +33,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 71e9f36d407db3b75d9a68f6447093aa011b2b586b06e0a1bb79c7db37c9114de505699e99a4dad06d8d9c742e91f48dd35457283babe440f88a9e40d3da465b HEAD_REF master - PATCHES ${PLUGIN_GOOD_PATCHES} + PATCHES ${PLUGIN_GOOD_PATCHES} fix-clang-cl-good.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH @@ -41,6 +41,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d HEAD_REF master + PATCHES fix-clang-cl-bad.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH @@ -48,7 +49,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master - PATCHES ${PLUGIN_UGLY_PATCHES} + PATCHES ${PLUGIN_UGLY_PATCHES} fix-clang-cl-ugly.patch ) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -136,6 +137,18 @@ else() set(PLUGIN_GOOD_FLAC disabled) endif() +if ("x11" IN_LIST FEATURES) + set(PLUGIN_BASE_X11 enabled) +else() + set(PLUGIN_BASE_X11 disabled) +endif() + +if ("opus" IN_LIST FEATURES) + set(PLUGIN_BASE_OPUS enabled) +else() + set(PLUGIN_BASE_OPUS disabled) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "shared") else() @@ -147,6 +160,13 @@ vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) vcpkg_add_to_path("${GIT_DIR}") +if(VCPKG_TARGET_IS_WINDOWS) + set(PLUGIN_BASE_WIN + -Dgst-plugins-base:xvideo=disabled + -Dgst-plugins-base:xshm=disabled + -Dgst-plugins-base:gl_winsys=win32) +endif() + # # check scripts/cmake/vcpkg_configure_meson.cmake # --wrap-mode=nodownload @@ -188,6 +208,9 @@ vcpkg_configure_meson( -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} + -Dgst-plugins-base:x11=${PLUGIN_BASE_X11} + -Dgst-plugins-base:opus=${PLUGIN_BASE_OPUS} + ${PLUGIN_BASE_WIN} # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:qt5=disabled diff --git a/external_imported/vcpkg/ports/gstreamer/vcpkg.json b/external_imported/vcpkg/ports/gstreamer/vcpkg.json index 43bfd15e6..b2ac7fb19 100644 --- a/external_imported/vcpkg/ports/gstreamer/vcpkg.json +++ b/external_imported/vcpkg/ports/gstreamer/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 5, + "port-version": 8, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", - "license": "LGPL-2.0", + "license": "LGPL-2.0-only", "supports": "!linux & !uwp", "dependencies": [ { @@ -62,6 +62,12 @@ "graphene" ] }, + "opus": { + "description": "Opus de/encoding via libopus", + "dependencies": [ + "opus" + ] + }, "plugins-bad": { "description": "'Bad' GStreamer plugins and helper libraries", "dependencies": [ @@ -131,6 +137,13 @@ "libraw" ] }, + "x11": { + "description": "Use x11 window system", + "supports": "!windows", + "dependencies": [ + "libx11" + ] + }, "x264": { "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", "supports": "!arm", diff --git a/external_imported/vcpkg/ports/gtest/portfile.cmake b/external_imported/vcpkg/ports/gtest/portfile.cmake index b2bff3768..6b1446d4d 100644 --- a/external_imported/vcpkg/ports/gtest/portfile.cmake +++ b/external_imported/vcpkg/ports/gtest/portfile.cmake @@ -5,13 +5,12 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF release-1.11.0 - SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 + REF release-1.12.1 + SHA512 a9104dc6c53747e36e7dd7bb93dfce51a558bd31b487a9ef08def095518e1296da140e0db263e0644d9055dbd903c0cb69380cb2322941dbfb04780ef247df9c HEAD_REF main PATCHES clang-tidy-no-lint.patch fix-main-lib-path.patch - remove-werror.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) @@ -31,6 +30,7 @@ file( "${SOURCE_PATH}/googletest/src/gtest.cc" "${SOURCE_PATH}/googletest/src/gtest_main.cc" "${SOURCE_PATH}/googletest/src/gtest-all.cc" + "${SOURCE_PATH}/googletest/src/gtest-assertion-result.cc" "${SOURCE_PATH}/googletest/src/gtest-death-test.cc" "${SOURCE_PATH}/googletest/src/gtest-filepath.cc" "${SOURCE_PATH}/googletest/src/gtest-internal-inl.h" diff --git a/external_imported/vcpkg/ports/gtest/remove-werror.patch b/external_imported/vcpkg/ports/gtest/remove-werror.patch deleted file mode 100644 index 96eba0202..000000000 --- a/external_imported/vcpkg/ports/gtest/remove-werror.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 8d8d60a8..58fc9bfb 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -84,13 +84,13 @@ macro(config_compiler_and_linker) - # Ensure MSVC treats source files as UTF-8 encoded. - set(cxx_base_flags "${cxx_base_flags} -utf-8") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion") -+ set(cxx_base_flags "-Wall -Wshadow -Wconversion") - set(cxx_exception_flags "-fexceptions") - set(cxx_no_exception_flags "-fno-exceptions") - set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls") - set(cxx_no_rtti_flags "-fno-rtti") - elseif (CMAKE_COMPILER_IS_GNUCXX) -- set(cxx_base_flags "-Wall -Wshadow -Werror") -+ set(cxx_base_flags "-Wall -Wshadow") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() diff --git a/external_imported/vcpkg/ports/gtest/vcpkg.json b/external_imported/vcpkg/ports/gtest/vcpkg.json index 9bd6e0194..a4ab44499 100644 --- a/external_imported/vcpkg/ports/gtest/vcpkg.json +++ b/external_imported/vcpkg/ports/gtest/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtest", - "version-semver": "1.11.0", - "port-version": 5, + "version-semver": "1.12.1", "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/gtk/0001-build.patch b/external_imported/vcpkg/ports/gtk/0001-build.patch index 9b01b2c43..f0e2d2e87 100644 --- a/external_imported/vcpkg/ports/gtk/0001-build.patch +++ b/external_imported/vcpkg/ports/gtk/0001-build.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 9fe9cd5ac..19a19e5c6 100644 +index 41cf592..cb4d638 100644 --- a/meson.build +++ b/meson.build -@@ -845,24 +845,24 @@ subdir('po-properties') +@@ -897,24 +897,24 @@ subdir('po-properties') subdir('docs/tools') subdir('docs/reference') @@ -11,7 +11,7 @@ index 9fe9cd5ac..19a19e5c6 100644 - gnome.post_install( - glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, -- gtk_update_icon_cache: true, +- gtk_update_icon_cache: get_option('demos'), - ) - else - meson.add_install_script('build-aux/meson/post-install.py', @@ -29,7 +29,7 @@ index 9fe9cd5ac..19a19e5c6 100644 +# gnome.post_install( +# glib_compile_schemas: true, +# gio_querymodules: gio_module_dirs, -+# gtk_update_icon_cache: true, ++# gtk_update_icon_cache: get_option('demos'), +# ) +# else +# meson.add_install_script('build-aux/meson/post-install.py', diff --git a/external_imported/vcpkg/ports/gtk/portfile.cmake b/external_imported/vcpkg/ports/gtk/portfile.cmake index 8c7595e60..416aad274 100644 --- a/external_imported/vcpkg/ports/gtk/portfile.cmake +++ b/external_imported/vcpkg/ports/gtk/portfile.cmake @@ -1,11 +1,11 @@ -set(GTK_VERSION 4.6.0) +set(GTK_VERSION 4.6.2) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gtk - REF 70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 #v4.6.0 - SHA512 dba6ce5a8306f9dda290f3785d6d15aee67c66329ab0756b7b7573387c1a512e96d3b53b24ed342ce7376832dcac20fb24025f2b8986f74d91a88e4fcf3de6ae + REF aec7ca82007dbe07faee6be084d20758ebac2b91 #v4.6.2 + SHA512 05ebba53e71a997b4dc04bc018f420f62d569cb66a2f3e713bd2b48abd7c0051f67939e42c812388bd0565d12a3f82b45731a086d3ab0e75d16eee200a3be95f HEAD_REF master # branch name PATCHES 0001-build.patch @@ -60,13 +60,13 @@ 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}' - sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' ADDITIONAL_CROSS_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_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) vcpkg_install_meson() @@ -109,7 +109,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) set(TOOL_NAMES gtk4-builder-tool gtk4-encode-symbolic-svg diff --git a/external_imported/vcpkg/ports/gtk/vcpkg.json b/external_imported/vcpkg/ports/gtk/vcpkg.json index 4966aae5b..214a524c6 100644 --- a/external_imported/vcpkg/ports/gtk/vcpkg.json +++ b/external_imported/vcpkg/ports/gtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtk", - "version": "4.6.0", + "version": "4.6.2", + "port-version": 2, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", @@ -23,6 +24,14 @@ }, "gdk-pixbuf", "gettext", + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, "glib", { "name": "glib", @@ -31,7 +40,10 @@ "graphene", "libepoxy", "pango", - "sassc", + { + "name": "sassc", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/external_imported/vcpkg/ports/gtl/portfile.cmake b/external_imported/vcpkg/ports/gtl/portfile.cmake index ed16730c1..ac553fecb 100644 --- a/external_imported/vcpkg/ports/gtl/portfile.cmake +++ b/external_imported/vcpkg/ports/gtl/portfile.cmake @@ -3,14 +3,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/gtl - REF 1.00 - SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + REF v1.1.2 + SHA512 f609b965826f738592d85b015c3a5d29830cebc457e21987aaa69ab0fc4336adfd69538d81bd8b46c9467a449d7c25dd92fd3fa0ec86e68e423a4abf2bafa517 HEAD_REF main ) # Use greg7mdp/gtl's own build process, skipping examples and tests vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGTL_BUILD_TESTS=OFF + -DGTL_BUILD_EXAMPLES=OFF + -DGTL_BUILD_BENCHMARKS=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/gtl/vcpkg.json b/external_imported/vcpkg/ports/gtl/vcpkg.json index b6b93c45f..12a1347cb 100644 --- a/external_imported/vcpkg/ports/gtl/vcpkg.json +++ b/external_imported/vcpkg/ports/gtl/vcpkg.json @@ -1,7 +1,8 @@ { "name": "gtl", - "version": "1.0.0", + "version": "1.1.2", "description": "Greg's Template Library of useful classes.", + "homepage": "https://github.com/greg7mdp/gtl", "license": "Apache-2.0", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/gts/CMakeLists.txt b/external_imported/vcpkg/ports/gts/CMakeLists.txt new file mode 100644 index 000000000..295c0c6f7 --- /dev/null +++ b/external_imported/vcpkg/ports/gts/CMakeLists.txt @@ -0,0 +1,43 @@ +cmake_minimum_required(VERSION 3.14) + +project(gts C) + +find_package(PkgConfig REQUIRED) +pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) + +if(WIN32) + add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES) +else() + add_definitions(-DHAVE_FPU_CONTROL_H) +endif() + +add_definitions( + -DGTS_COMPILATION + -DGTS_MAJOR_VERSION=0 + -DGTS_MINOR_VERSION=7 + -DGTS_MICRO_VERSION=6 + -DGTS_INTERFACE_AGE=1 + -DGTS_BINARY_AGE=1 + -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION} +) + +file(GLOB src src/*.c src/gts.def) +list(REMOVE_ITEM src src/predicate_init.c) +add_library(gts ${src}) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "") +target_include_directories(gts PUBLIC + $ + $ + $ +) +target_link_libraries(gts PUBLIC PkgConfig::GLIB2) + +set(prefix ?) +set(exec_prefix \${prefix}) +set(libdir \${prefix}/lib) +set(includedir \${prefix}/include) +configure_file(gts.pc.in gts.pc @ONLY) + +install(FILES src/gts.h src/gtsconfig.h DESTINATION include) +install(TARGETS gts) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gts.pc" DESTINATION lib/pkgconfig) diff --git a/external_imported/vcpkg/ports/gts/fix-M_PI-in-windows.patch b/external_imported/vcpkg/ports/gts/fix-M_PI-in-windows.patch deleted file mode 100644 index d573ef080..000000000 --- a/external_imported/vcpkg/ports/gts/fix-M_PI-in-windows.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/curvature.c b/src/curvature.c -index 70f6af2..a5c0187 100644 ---- a/src/curvature.c -+++ b/src/curvature.c -@@ -17,6 +17,9 @@ - * Boston, MA 02111-1307, USA. - */ - -+#ifdef _WIN32 -+#define _USE_MATH_DEFINES -+#endif - #include - #include "gts.h" - -diff --git a/src/triangle.c b/src/triangle.c -index 1d82869..47170c6 100644 ---- a/src/triangle.c -+++ b/src/triangle.c -@@ -17,6 +17,9 @@ - * Boston, MA 02111-1307, USA. - */ - -+#ifdef _WIN32 -+#define _USE_MATH_DEFINES -+#endif - #include - #include "gts.h" - diff --git a/external_imported/vcpkg/ports/gts/fix-dllexport.patch b/external_imported/vcpkg/ports/gts/fix-dllexport.patch new file mode 100644 index 000000000..dd9eb175e --- /dev/null +++ b/external_imported/vcpkg/ports/gts/fix-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b76915..ae1d888 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -38,7 +38,7 @@ extern "C" { + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef NATIVE_WIN32 ++#if 0 + # ifdef GTS_COMPILATION + # define GTS_C_VAR __declspec(dllexport) + # else /* not GTS_COMPILATION */ diff --git a/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch b/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch new file mode 100644 index 000000000..52ad11cce --- /dev/null +++ b/external_imported/vcpkg/ports/gts/fix-dllexport_2.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b76915..ae1d888 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -38,7 +38,7 @@ extern "C" { + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef NATIVE_WIN32 ++#if 1 + # ifdef GTS_COMPILATION + # define GTS_C_VAR __declspec(dllexport) + # else /* not GTS_COMPILATION */ diff --git a/external_imported/vcpkg/ports/gts/fix-pkgconfig.patch b/external_imported/vcpkg/ports/gts/fix-pkgconfig.patch deleted file mode 100644 index 59deeca22..000000000 --- a/external_imported/vcpkg/ports/gts/fix-pkgconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f458c35..8035507 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,3 +124,11 @@ INSTALL(FILES - src/gtsconfig.h - DESTINATION include COMPONENT Development - ) -+ -+set(prefix ${CMAKE_INSTALL_PREFIX}) -+set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -+set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -+set(includedir ${CMAKE_INSTALL_PREFIX}/include) -+ -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gts.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/gts.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gts.pc" DESTINATION lib/pkgconfig) -\ No newline at end of file -diff --git a/gts.pc.in b/gts.pc.in -index 39626d7..bcd4014 100644 ---- a/gts.pc.in -+++ b/gts.pc.in -@@ -7,5 +7,5 @@ Name: GTS - Description: GNU Triangulated Surface Library - Version: @VERSION@ - Requires: glib-2.0,gthread-2.0,gmodule-2.0 --Libs: -L${libdir} @LIBS@ -lgts -lm -+Libs: -L${libdir} @LIBS@ -lgts - Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/gts/fix_missing_extern.patch b/external_imported/vcpkg/ports/gts/fix_missing_extern.patch new file mode 100644 index 000000000..0e798c48e --- /dev/null +++ b/external_imported/vcpkg/ports/gts/fix_missing_extern.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b7691531..1e87167bc 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -40,7 +40,7 @@ extern "C" { + */ + #if 1 + # ifdef GTS_COMPILATION +-# define GTS_C_VAR __declspec(dllexport) ++# define GTS_C_VAR extern __declspec(dllexport) + # else /* not GTS_COMPILATION */ + # define GTS_C_VAR extern __declspec(dllimport) + # endif /* not GTS_COMPILATION */ diff --git a/external_imported/vcpkg/ports/gts/glib2.patch b/external_imported/vcpkg/ports/gts/glib2.patch deleted file mode 100644 index 60de77c70..000000000 --- a/external_imported/vcpkg/ports/gts/glib2.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 941e9b96b..ea031828d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -85,30 +85,35 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/src - ) - --find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0 -- HINTS ${glib_BINARY_DIR}) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) - --get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY) --get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME) --string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME}) -+# find_library(glib_LIBRARY NAMES glib libglib glib-2.0 libglib-2.0 -+ # HINTS ${glib_BINARY_DIR}) - --find_path(glib_H NAMES glib.h -- HINTS ${glib_LIBRARY_DIR}/../include) --get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY) -+# get_filename_component(glib_LIBRARY_DIR ${glib_LIBRARY} DIRECTORY) -+# get_filename_component(glib_LIBRARY_NAME ${glib_LIBRARY} NAME) -+# string(REGEX REPLACE "\\.[^.]*$" "" glib_LIBRARY_NAME ${glib_LIBRARY_NAME}) - --set(glib_CONFIG_H) --find_path(glib_CONFIG_H NAMES glibconfig.h -- HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include) -+# find_path(glib_H NAMES glib.h -+ # HINTS ${glib_LIBRARY_DIR}/../include) -+# get_filename_component(glib_INCLUDE_DIR ${glib_H} DIRECTORY) - --get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY) --include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H}) -+# set(glib_CONFIG_H) -+# find_path(glib_CONFIG_H NAMES glibconfig.h -+ # HINTS ${glib_LIBRARY_DIR}/${glib_LIBRARY_NAME}/include) -+ -+# get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY) -+# include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H}) -+include_directories(${GLIB2_INCLUDE_DIRS}) - - if (NOT WIN32 AND BUILD_SHARED_LIBS) - add_definitions(/DGTS_COMPILATION) - endif() - - add_library(${kit} SHARED ${srcs}) --target_link_libraries(${kit} ${glib_LIBRARY}) -+target_include_directories(${kit} PUBLIC ${GLIB2_INCLUDE_DIRS}) -+target_link_libraries(${kit} PkgConfig::GLIB2) - - if(MSVC) - SET_TARGET_PROPERTIES(${kit} PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/src/gts.def\"") diff --git a/external_imported/vcpkg/ports/gts/portfile.cmake b/external_imported/vcpkg/ports/gts/portfile.cmake index 98ea07a8f..2f31dcd49 100644 --- a/external_imported/vcpkg/ports/gts/portfile.cmake +++ b/external_imported/vcpkg/ports/gts/portfile.cmake @@ -1,29 +1,34 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(patches fix-dllexport.patch) +elseif(VCPKG_TARGET_IS_WINDOWS) + set(patches fix-dllexport_2.patch fix_missing_extern.patch) +endif() -vcpkg_from_github( +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH - REPO finetjul/gts - REF c4da61ae075f355d9ecc9f2d4767acf777f54c2b #0.7.6 - SHA512 e53d11213c26cbda08ae62e6388aee0a14d2884de72268ad25d10a23e77baa53a2b1151c5cc7643b059ded82b8edf0da79144c3108949fdc515168cac13ffca9 - HEAD_REF master - PATCHES - fix-M_PI-in-windows.patch - support-unix.patch - fix-pkgconfig.patch - glib2.patch + REPO gts/gts + REF 0.7.6 + FILENAME gts-0.7.6.tar.gz + SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8 + PATCHES ${patches} ) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/predicates_init.h" DESTINATION "${SOURCE_PATH}/src") + vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +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") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/external_imported/vcpkg/ports/gts/predicates_init.h b/external_imported/vcpkg/ports/gts/predicates_init.h new file mode 100644 index 000000000..059ecf6ff --- /dev/null +++ b/external_imported/vcpkg/ports/gts/predicates_init.h @@ -0,0 +1,26 @@ +/* This file was generated automatically by predicates_init + * + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +static double splitter = 134217729.000000; +static double resulterrbound = 3.330669073875471e-16; +static double ccwerrboundA = 3.330669073875472e-16; +static double ccwerrboundB = 2.220446049250315e-16; +static double ccwerrboundC = 1.109335647967049e-31; +static double o3derrboundA = 7.771561172376103e-16; +static double o3derrboundB = 3.330669073875473e-16; +static double o3derrboundC = 3.204747427460364e-31; +static double iccerrboundA = 1.110223024625158e-15; +static double iccerrboundB = 4.440892098500632e-16; +static double iccerrboundC = 5.423418723394464e-31; +static double isperrboundA = 1.776356839400253e-15; +static double isperrboundB = 5.551115123125792e-16; +static double isperrboundC = 8.751425667295619e-31; diff --git a/external_imported/vcpkg/ports/gts/support-unix.patch b/external_imported/vcpkg/ports/gts/support-unix.patch deleted file mode 100644 index 597b4f545..000000000 --- a/external_imported/vcpkg/ports/gts/support-unix.patch +++ /dev/null @@ -1,190 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c35100c..f458c35 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.1) - add_executable(predicates_init src/predicates_init.c) - - execute_process( -- COMMAND predicates_init.exe -+ COMMAND predicates_init - OUTPUT_FILE predicates_init.h - OUTPUT_VARIABLE OUTVAR) - -@@ -12,6 +12,31 @@ MESSAGE("${OUTVAR}") - set(kit gts) - project(${kit}) - -+if (NOT WIN32) -+ set(CPP_HAS_WARNING 1) -+ set(HAVE_DLFCN_H 1) -+ set(HAVE_FLOATINGPOINT_H 1) -+ set(HAVE_FPU_CONTROL_H 1) -+ set(HAVE_GETOPT_H 1) -+ set(HAVE_GETOPT_LONG 1) -+ set(HAVE_INTTYPES_H 1) -+ set(HAVE_MEMORY_H 1) -+ set(HAVE_STDINT_H 1) -+ set(HAVE_STDLIB_H 1) -+ set(HAVE_STRINGS_H 1) -+ set(HAVE_STRING_H 1) -+ set(HAVE_SYS_STAT_H 1) -+ set(HAVE_SYS_TYPES_H 1) -+ set(HAVE_UNISTD_H 1) -+ set(PACKAGE_BUGREPORT 0) -+ set(PACKAGE_NAME "gts") -+ set(PACKAGE_STRING "0.7.6") -+ set(PACKAGE_TARNAME "gts") -+ set(PACKAGE_URL "") -+ set(PACKAGE_VERSION "0.7.6") -+ set(STDC_HEADERS) -+endif() -+ - set(srcs - src/bbtree.c - src/boolean.c -@@ -49,7 +74,11 @@ set(srcs - src/vopt.c - ) - -+if (WIN32) - configure_file(src/config.h.win32 config.h) -+else() -+configure_file(config.h.in config.h @ONLY) -+endif() - - SET(CMAKE_INCLUDE_CURRENT_DIR ON) - include_directories( -@@ -74,7 +103,9 @@ find_path(glib_CONFIG_H NAMES glibconfig.h - get_filename_component(glibconfig_INCLUDE_DIR ${glib_CONFIG_H} DIRECTORY) - include_directories(${glib_INCLUDE_DIR} ${glib_CONFIG_H}) - -+if (NOT WIN32 AND BUILD_SHARED_LIBS) - add_definitions(/DGTS_COMPILATION) -+endif() - - add_library(${kit} SHARED ${srcs}) - target_link_libraries(${kit} ${glib_LIBRARY}) -diff --git a/config.h.in b/config.h.in -index ad95945..fe6c945 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -1,89 +1,89 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - - /* Define if C preprocessor supports warning directive. */ --#undef CPP_HAS_WARNING -+#cmakedefine CPP_HAS_WARNING @CPP_HAS_WARNING@ - - /* Binary age */ --#undef GTS_BINARY_AGE -+#define GTS_BINARY_AGE 0 - - /* Interface age */ --#undef GTS_INTERFACE_AGE -+#define GTS_INTERFACE_AGE 0 - - /* Major version */ --#undef GTS_MAJOR_VERSION -+#define GTS_MAJOR_VERSION 0 - - /* Micro version */ --#undef GTS_MICRO_VERSION -+#define GTS_MICRO_VERSION 0 - - /* Minor version */ --#undef GTS_MINOR_VERSION -+#define GTS_MINOR_VERSION 6 - - /* Define to 1 if you have the header file. */ --#undef HAVE_DLFCN_H -+#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_FLOATINGPOINT_H -+#cmakedefine HAVE_FLOATINGPOINT_H @HAVE_FLOATINGPOINT_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_FPU_CONTROL_H -+#cmakedefine HAVE_FPU_CONTROL_H @HAVE_FPU_CONTROL_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_GETOPT_H -+#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ - - /* Define to 1 if you have the `getopt_long' function. */ --#undef HAVE_GETOPT_LONG -+#cmakedefine HAVE_GETOPT_LONG @HAVE_GETOPT_LONG@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_INTTYPES_H -+#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_MEMORY_H -+#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_STDINT_H -+#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_STDLIB_H -+#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_STRINGS_H -+#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_STRING_H -+#cmakedefine HAVE_STRING_H @HAVE_STRING_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STAT_H -+#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TYPES_H -+#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ - - /* Define to 1 if you have the header file. */ --#undef HAVE_UNISTD_H -+#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ - - /* Define to the sub-directory in which libtool stores uninstalled libraries. - */ --#undef LT_OBJDIR -+#cmakedefine LT_OBJDIR @LT_OBJDIR@ - - /* Define if netpbm include files are in netpbm/. */ --#undef NETPBM_INCLUDE -+#cmakedefine NETPBM_INCLUDE @NETPBM_INCLUDE@ - - /* Define to the address where bug reports for this package should be sent. */ --#undef PACKAGE_BUGREPORT -+#cmakedefine PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@ - - /* Define to the full name of this package. */ --#undef PACKAGE_NAME -+#cmakedefine PACKAGE_NAME @PACKAGE_NAME@ - - /* Define to the full name and version of this package. */ --#undef PACKAGE_STRING -+#cmakedefine PACKAGE_STRING @PACKAGE_STRING@ - - /* Define to the one symbol short name of this package. */ --#undef PACKAGE_TARNAME -+#cmakedefine PACKAGE_TARNAME @PACKAGE_TARNAME@ - - /* Define to the home page for this package. */ --#undef PACKAGE_URL -+#cmakedefine PACKAGE_URL @PACKAGE_URL@ - - /* Define to the version of this package. */ --#undef PACKAGE_VERSION -+#cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@ - - /* Define to 1 if you have the ANSI C header files. */ --#undef STDC_HEADERS -+#cmakedefine STDC_HEADERS @STDC_HEADERS@ diff --git a/external_imported/vcpkg/ports/gts/usage b/external_imported/vcpkg/ports/gts/usage new file mode 100644 index 000000000..ccd803ef8 --- /dev/null +++ b/external_imported/vcpkg/ports/gts/usage @@ -0,0 +1,6 @@ +The port gts supports consumption from CMake: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(GTS gts REQUIRED) + target_compile_options(main PRIVATE ${GTS_CFLAGS}) + target_link_libraries(main PRIVATE ${GTS_LDFLAGS}) diff --git a/external_imported/vcpkg/ports/gts/vcpkg.json b/external_imported/vcpkg/ports/gts/vcpkg.json index 45de1e6a4..3b5549f3a 100644 --- a/external_imported/vcpkg/ports/gts/vcpkg.json +++ b/external_imported/vcpkg/ports/gts/vcpkg.json @@ -1,10 +1,15 @@ { "name": "gts", "version": "0.7.6", - "port-version": 4, - "description": "A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles", - "homepage": "https://github.com/finetjul/gts", + "port-version": 7, + "description": "3D surfaces meshed with interconnected triangles", + "homepage": "http://gts.sourceforge.net/", + "supports": "!osx", "dependencies": [ - "glib" + "glib", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/guile/portfile.cmake b/external_imported/vcpkg/ports/guile/portfile.cmake new file mode 100644 index 000000000..c41acdf45 --- /dev/null +++ b/external_imported/vcpkg/ports/guile/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_download_distfile(GUILE_ARCHIVE + URLS https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz + FILENAME guile-3.0.8.tar.gz + SHA512 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d + ) + +vcpkg_extract_source_archive(GUILE_SOURCES ARCHIVE ${GUILE_ARCHIVE}) + +vcpkg_configure_make( + SOURCE_PATH "${GUILE_SOURCES}" + ADD_BIN_TO_PATH + AUTOCONFIG + ) +vcpkg_install_make() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file( + INSTALL "${GUILE_SOURCES}/COPYING.LESSER" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright + ) diff --git a/external_imported/vcpkg/ports/guile/vcpkg.json b/external_imported/vcpkg/ports/guile/vcpkg.json new file mode 100644 index 000000000..59c7e4163 --- /dev/null +++ b/external_imported/vcpkg/ports/guile/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "guile", + "version": "3.0.8", + "description": "GNU's programming and extension language", + "homepage": "https://www.gnu.org/software/guile/", + "documentation": "https://www.gnu.org/software/guile/manual/", + "license": "LGPL-3.0-or-later", + "supports": "linux", + "dependencies": [ + "bdwgc", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gmp", + "libffi", + "libunistring" + ] +} diff --git a/external_imported/vcpkg/ports/guilite/portfile.cmake b/external_imported/vcpkg/ports/guilite/portfile.cmake index 70189fd61..ff509f9bc 100644 --- a/external_imported/vcpkg/ports/guilite/portfile.cmake +++ b/external_imported/vcpkg/ports/guilite/portfile.cmake @@ -1,8 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "idea4good/GuiLite" - SHA512 "9132f854f2e0d517797a3b30458ac692b509cb5a2fea2bff606b6b84b60a5760311f488c77f2dc21e954a14378e8d803d555750f90d00d5655e216a2a0c83ce8" - REF "master" + REPO idea4good/GuiLite + REF 61d1bd94cbc35da74c0f3c40422a7d783c04d40b + SHA512 b428e9bfc62fabb4d23d4c39b78d521aa13eb52e571a5aaab7609a03bb88e6f2184587885cd4df950eb5f48dece2b8fbff2264f158251ed06c6a6415b9b59f1a + HEAD_REF master ) file(INSTALL "${SOURCE_PATH}/GuiLite.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/external_imported/vcpkg/ports/guilite/vcpkg.json b/external_imported/vcpkg/ports/guilite/vcpkg.json index 6cbda897a..630d5c6cd 100644 --- a/external_imported/vcpkg/ports/guilite/vcpkg.json +++ b/external_imported/vcpkg/ports/guilite/vcpkg.json @@ -1,6 +1,7 @@ { "name": "guilite", - "version-date": "2021-07-31", + "version-date": "2022-05-05", "description": "The smallest header-only GUI library (4 KLOC) for all platforms.", - "homepage": "https://github.com/idea4good/GuiLite" + "homepage": "https://github.com/idea4good/GuiLite", + "license": "Apache-2.0" } diff --git a/external_imported/vcpkg/ports/gul14/portfile.cmake b/external_imported/vcpkg/ports/gul14/portfile.cmake new file mode 100644 index 000000000..5cc03c7c0 --- /dev/null +++ b/external_imported/vcpkg/ports/gul14/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gul-cpp/gul14 + REF a6d5612f8074f7defd08de1245fb81ca9866223b # v2.6 as first moved to GitHub + SHA512 4b384252bf5c2fe317d4173bacc59ddc85ebe2fe104909aaf43f537a68879a69f1a271e84b9eed5c79fb1b1c351f744268e542c60c5cb5dace5cd8d1cd663408 + HEAD_REF main +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_meson() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +# Install copyright file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") diff --git a/external_imported/vcpkg/ports/gul14/vcpkg.json b/external_imported/vcpkg/ports/gul14/vcpkg.json new file mode 100644 index 000000000..7bf6ac3ae --- /dev/null +++ b/external_imported/vcpkg/ports/gul14/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "gul14", + "version": "2.6", + "description": [ + "General Utility Library for C++14.", + "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", + "It provides basic functionality that is not available in the C++14 standard library, including some backports from later versions of the standard." + ], + "homepage": "https://github.desy.de/gul-cpp/gul14.git", + "documentation": "https://winweb.desy.de/mcs/docs/gul/index.html", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/gumbo/CMakeLists.txt b/external_imported/vcpkg/ports/gumbo/CMakeLists.txt index 1c90f42bc..f5d170d33 100644 --- a/external_imported/vcpkg/ports/gumbo/CMakeLists.txt +++ b/external_imported/vcpkg/ports/gumbo/CMakeLists.txt @@ -24,11 +24,19 @@ endif (MSVC) add_library(gumbo ${gumbo_srcs}) install( - TARGETS gumbo + TARGETS gumbo EXPORT unofficial-gumbo-config RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + +install(EXPORT unofficial-gumbo-config + NAMESPACE unofficial::gumbo:: + DESTINATION share/unofficial-gumbo + ) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/gumbo.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" @ONLY) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/pkgconfig/gumbo.pc" DESTINATION "lib/pkgconfig") if(NOT DISABLE_INSTALL_HEADERS) install(FILES src/gumbo.h src/tag_enum.h DESTINATION include) endif() diff --git a/external_imported/vcpkg/ports/gumbo/portfile.cmake b/external_imported/vcpkg/ports/gumbo/portfile.cmake index 55ece8267..e6b0764fe 100644 --- a/external_imported/vcpkg/ports/gumbo/portfile.cmake +++ b/external_imported/vcpkg/ports/gumbo/portfile.cmake @@ -8,14 +8,22 @@ 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 - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gumbo RENAME copyright) +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-gumbo CONFIG_PATH share/unofficial-gumbo) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright) diff --git a/external_imported/vcpkg/ports/gumbo/vcpkg.json b/external_imported/vcpkg/ports/gumbo/vcpkg.json index 650c5b6f3..6ec0a368f 100644 --- a/external_imported/vcpkg/ports/gumbo/vcpkg.json +++ b/external_imported/vcpkg/ports/gumbo/vcpkg.json @@ -1,7 +1,18 @@ { "name": "gumbo", - "version-string": "0.10.1", - "port-version": 4, + "version": "0.10.1", + "port-version": 5, "description": "An HTML5 parsing library in pure C99", - "homepage": "https://github.com/google/gumbo-parser" + "homepage": "https://github.com/google/gumbo-parser", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/halide/portfile.cmake b/external_imported/vcpkg/ports/halide/portfile.cmake index 1b7dea6d5..c5fcb86a1 100644 --- a/external_imported/vcpkg/ports/halide/portfile.cmake +++ b/external_imported/vcpkg/ports/halide/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(HALIDE_VERSION_TAG v13.0.2) +set(HALIDE_VERSION_TAG v14.0.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide REF ${HALIDE_VERSION_TAG} - SHA512 d2b19934ff0d759d302428f61e4075306f79c29cc1cd8802dc1ac5f325434034e0f430c435610e58f862b87cc8ef34ddcc3d0588947eeb8e1387d0bf31b9c008 - HEAD_REF release/13.x + SHA512 c7b1186cca545f30d038f1e9bb28ca7231023869d191c50722213da4c7e9adfd4a53129fe395cd7938cb7cb3fb1bf80f9cd3b4b8473a0246f15b9ad8d3e40fe2 + HEAD_REF release/14.x ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/halide/vcpkg.json b/external_imported/vcpkg/ports/halide/vcpkg.json index 4e54393fe..d24aa98e0 100644 --- a/external_imported/vcpkg/ports/halide/vcpkg.json +++ b/external_imported/vcpkg/ports/halide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "halide", - "version": "13.0.2", + "version": "14.0.0", "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", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/hareflow/portfile.cmake b/external_imported/vcpkg/ports/hareflow/portfile.cmake new file mode 100644 index 000000000..aca8ed9c0 --- /dev/null +++ b/external_imported/vcpkg/ports/hareflow/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coveooss/hareflow + REF a59406398c60d4908a9f894c187ef90370119594 # 0.1.0 + SHA512 ed9e3b54f879fed65cf7765b37951a0da04e99b09950316d9108ea35917d05b4733c5cb8f3c161e42f1baab5978affd4522e5b5028861b3f7d6cc0bfe0a40363 + HEAD_REF main +) + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_INSTALL_RPATH=${rpath}" +) +vcpkg_cmake_install() + +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") diff --git a/external_imported/vcpkg/ports/hareflow/vcpkg.json b/external_imported/vcpkg/ports/hareflow/vcpkg.json new file mode 100644 index 000000000..7452a5ffe --- /dev/null +++ b/external_imported/vcpkg/ports/hareflow/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "hareflow", + "version-semver": "0.1.0", + "description": "Hareflow: A RabbitMQ C++ stream client.", + "homepage": "https://github.com/coveooss/hareflow", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "boost-asio", + "features": [ + "ssl" + ], + "version>=": "1.78.0" + }, + { + "name": "boost-endian", + "version>=": "1.78.0" + }, + { + "name": "fmt", + "version>=": "8.0.1" + }, + { + "name": "openssl", + "version>=": "3.0.2#3" + }, + { + "name": "qpid-proton", + "version>=": "0.37.0#2" + }, + { + "name": "vcpkg-cmake", + "host": true, + "version>=": "2021-02-28" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "version>=": "2021-02-26" + } + ] +} diff --git a/external_imported/vcpkg/ports/harfbuzz/0001-circumvent-samefile-error.patch b/external_imported/vcpkg/ports/harfbuzz/0001-circumvent-samefile-error.patch deleted file mode 100755 index 40aaac0b4..000000000 --- a/external_imported/vcpkg/ports/harfbuzz/0001-circumvent-samefile-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/gen-harfbuzzcc.py b/src/gen-harfbuzzcc.py -index b25bcc7..f3bc87a 100644 ---- a/src/gen-harfbuzzcc.py -+++ b/src/gen-harfbuzzcc.py -@@ -15,4 +15,8 @@ with open (OUTPUT, "wb") as f: - f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) - - # copy it also to src/ --shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) -+src = OUTPUT -+dst = os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT)) -+# Avoid SameFileError -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) -diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py -index 879811f..c376721 100644 ---- a/src/gen-hb-version.py -+++ b/src/gen-hb-version.py -@@ -33,4 +33,8 @@ with open (INPUT, "r", encoding='utf-8') as template: - .encode ()) - - # copy it also to src/ --shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) -+src = OUTPUT -+dst = os.path.join(CURRENT_SOURCE_DIR, os.path.basename (OUTPUT)) -+# Avoid SameFileError if src and dst is the same -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) -diff --git a/src/gen-ragel-artifacts.py b/src/gen-ragel-artifacts.py -index d22e03a..2b1e819 100644 ---- a/src/gen-ragel-artifacts.py -+++ b/src/gen-ragel-artifacts.py -@@ -22,4 +22,8 @@ hh = rl.replace ('.rl', '.hh') - subprocess.Popen (ragel.split() + ['-e', '-F1', '-o', hh, rl], cwd=outdir).wait () - - # copy it also to src/ --shutil.copyfile (os.path.join (outdir, hh), os.path.join (CURRENT_SOURCE_DIR, hh)) -+src = os.path.join (outdir, hh) -+dst = os.path.join (CURRENT_SOURCE_DIR, hh) -+# Avoid SameFileError -+if not os.path.samefile(src, dst): -+ shutil.copyfile (src, dst) diff --git a/external_imported/vcpkg/ports/harfbuzz/0002-fix-uwp-build.patch b/external_imported/vcpkg/ports/harfbuzz/0002-fix-uwp-build.patch deleted file mode 100644 index beb5ce750..000000000 --- a/external_imported/vcpkg/ports/harfbuzz/0002-fix-uwp-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/hb-ft.cc b/src/hb-ft.cc -index 1900f30..add9917 100644 ---- a/src/hb-ft.cc -+++ b/src/hb-ft.cc -@@ -31,6 +31,10 @@ - - #include "hb-ft.h" - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#define generic GenericFromFreeTypeLibrary -+#endif -+ - #include "hb-font.hh" - #include "hb-machinery.hh" - #include "hb-cache.hh" diff --git a/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff b/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff deleted file mode 100644 index 3d0f8b5ce..000000000 --- a/external_imported/vcpkg/ports/harfbuzz/fix-macos-build.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc -index 5f383064c4..6ccc1b0a2b 100644 ---- a/src/hb-coretext.cc -+++ b/src/hb-coretext.cc -@@ -897,7 +897,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs); - - buffer->len = 0; -- uint32_t status_and = ~0, status_or = 0; -+ uint32_t status_or = 0; - CGFloat advances_so_far = 0; - /* For right-to-left runs, CoreText returns the glyphs positioned such that - * any trailing whitespace is to the left of (0,0). Adjust coordinate system -@@ -918,7 +918,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - CTRunRef run = static_cast(CFArrayGetValueAtIndex (glyph_runs, i)); - CTRunStatus run_status = CTRunGetStatus (run); - status_or |= run_status; -- status_and &= run_status; - DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); - CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr); - if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) -@@ -1140,21 +1139,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, - buffer->len += num_glyphs; - } - -- /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, -- * or if it does, it doesn't respect it. So we get runs with wrong -- * directions. As such, disable the assert... It wouldn't crash, but -- * cursoring will be off... -- * -- * https://crbug.com/419769 -- */ -- if (false) -- { -- /* Make sure all runs had the expected direction. */ -- HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); -- assert (bool (status_and & kCTRunStatusRightToLeft) == backward); -- assert (bool (status_or & kCTRunStatusRightToLeft) == backward); -- } -- - buffer->clear_positions (); - - unsigned int count = buffer->len; diff --git a/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch b/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch new file mode 100644 index 000000000..901def627 --- /dev/null +++ b/external_imported/vcpkg/ports/harfbuzz/fix-win32-build.patch @@ -0,0 +1,26 @@ +diff --git a/src/meson.build b/src/meson.build +index e336037..35af00e 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -349,6 +349,11 @@ hb_subset_sources = files( + 'hb-subset.hh', + ) + ++extra_hb_cpp_args = [] ++if cpp.get_argument_syntax() == 'msvc' ++ extra_hb_cpp_args += ['/bigobj'] ++endif ++ + hb_subset_headers = files( + 'hb-subset.h', + 'hb-subset-repacker.h' +@@ -472,8 +477,7 @@ defs_list = [harfbuzz_def] + + version = '0.@0@.0'.format(hb_version_int) + +-extra_hb_cpp_args = [] +-if cpp.get_id() == 'msvc' ++if cpp.get_argument_syntax() == 'msvc' + if get_option('default_library') != 'static' + extra_hb_cpp_args += '-DHB_DLL_EXPORT' + endif diff --git a/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in index d4db3ea41..42f8b2ee7 100644 --- a/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/external_imported/vcpkg/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -1,11 +1,21 @@ # For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0057 NEW) -include(CMakeFindDependencyMacro) + +# Traditional find module variables (vcpkg polyfill) +set(HARFBUZZ_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/harfbuzz" CACHE INTERNAL "") +set(HARFBUZZ_INCLUDE_DIRS "${HARFBUZZ_INCLUDE_DIR}") +set(HARFBUZZ_LIBRARY harfbuzz::harfbuzz CACHE INTERNAL "") +set(HARFBUZZ_LIBRARIES harfbuzz::harfbuzz) if(TARGET harfbuzz) - return() + set(HARFBUZZ_FOUND TRUE) + return() endif() +include(CMakeFindDependencyMacro) + add_library(harfbuzz INTERFACE IMPORTED GLOBAL) add_library(harfbuzz::harfbuzz ALIAS harfbuzz) @@ -56,16 +66,4 @@ if ("icu" IN_LIST HARFBUZZ_FEATURES) target_link_libraries(harfbuzz INTERFACE ICU::uc) endif() -get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -target_include_directories(harfbuzz INTERFACE "${_INSTALL_DIR}/include/harfbuzz") - -set(HARFBUZZ_LIBRARY harfbuzz::harfbuzz PARENT_SCOPE) -set(HARFBUZZ_LIBRARIES harfbuzz::harfbuzz PARENT_SCOPE) -set(HARFBUZZ_INCLUDE_DIR "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) -set(HARFBUZZ_INCLUDE_DIRS "${_INSTALL_DIR}/include/harfbuzz" PARENT_SCOPE) - -if(HARFBUZZ_LIBRARY_RELEASE) - set(HARFBUZZ_FOUND TRUE PARENT_SCOPE) -else() - set(HARFBUZZ_FOUND FALSE PARENT_SCOPE) -endif() +target_include_directories(harfbuzz INTERFACE "${HARFBUZZ_INCLUDE_DIR}") diff --git a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake index d12203416..745fafcf8 100644 --- a/external_imported/vcpkg/ports/harfbuzz/portfile.cmake +++ b/external_imported/vcpkg/ports/harfbuzz/portfile.cmake @@ -1,17 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 3.2.0 - SHA512 5d8c629416c0bc557b83e8d9d731d41b9e8ee3abc74590e65ed6ca67d74d3a440d038134313f17a7b1b14ef0fc1ecf8bb87113fdcf5f0c8d3dc3d2eeb9b08c18 + REF 5.0.1 + SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c HEAD_REF master PATCHES - # This patch is a workaround that is needed until the following issues are resolved upstream: - # - https://github.com/mesonbuild/meson/issues/8375 - # - https://github.com/harfbuzz/harfbuzz/issues/2870 - # Details: https://github.com/microsoft/vcpkg/issues/16262 - 0001-circumvent-samefile-error.patch - 0002-fix-uwp-build.patch - fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484 + fix-win32-build.patch ) if("icu" IN_LIST FEATURES) @@ -26,9 +20,6 @@ else() endif() if("coretext" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -Dcoretext=enabled) # Enable CoreText shaper backend on macOS - if(NOT VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'coretext' os only available on OSX") - endif() else() list(APPEND FEATURE_OPTIONS -Dcoretext=disabled) endif() @@ -47,8 +38,9 @@ list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -Dcairo=disabled # Use Cairo graphics library -Dintrospection=disabled # Generate gobject-introspection bindings (.gir/.typelib files) -Ddocs=disabled # Generate documentation with gtk-doc @@ -64,16 +56,29 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB PC_FILES + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") + + foreach(PC_FILE IN LISTS PC_FILES) + file(READ "${PC_FILE}" PC_FILE_CONTENT) + string(REGEX REPLACE + "\\$\\{prefix\}\\/lib\\/([a-zA-Z0-9\-]*)\\.lib" + "-l\\1" PC_FILE_CONTENT + "${PC_FILE_CONTENT}") + file(WRITE "${PC_FILE}" ${PC_FILE_CONTENT}) + endforeach() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/harfbuzzConfig.cmake" @ONLY) -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +vcpkg_list(SET TOOL_NAMES) if("glib" IN_LIST FEATURES) - list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure) + vcpkg_list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure) endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) @@ -82,3 +87,5 @@ endif() 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) diff --git a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json index 7b444a360..13bed7c38 100644 --- a/external_imported/vcpkg/ports/harfbuzz/vcpkg.json +++ b/external_imported/vcpkg/ports/harfbuzz/vcpkg.json @@ -1,9 +1,10 @@ { "name": "harfbuzz", - "version-semver": "3.2.0", + "version": "5.0.1", "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", + "license": "MIT-Modern-Variant", "dependencies": [ { "name": "freetype", @@ -20,7 +21,8 @@ ], "features": { "coretext": { - "description": "Enable CoreText shaper backend on macOS" + "description": "Enable CoreText shaper backend on macOS", + "supports": "osx" }, "glib": { "description": "Glib Unicode callbacks support", diff --git a/external_imported/vcpkg/ports/hash-library/001-fix-macos.patch b/external_imported/vcpkg/ports/hash-library/001-fix-macos.patch new file mode 100644 index 000000000..60658e316 --- /dev/null +++ b/external_imported/vcpkg/ports/hash-library/001-fix-macos.patch @@ -0,0 +1,98 @@ +Fixes includes of endian.h on MacOS, see https://github.com/stbrumme/hash-library/pull/4. + +diff --git a/crc32.cpp b/crc32.cpp +--- a/crc32.cpp ++++ b/crc32.cpp +@@ -7,8 +7,10 @@ + #include "crc32.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/keccak.cpp b/keccak.cpp +--- a/keccak.cpp ++++ b/keccak.cpp +@@ -7,8 +7,10 @@ + #include "keccak.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/md5.cpp b/md5.cpp +--- a/md5.cpp ++++ b/md5.cpp +@@ -6,8 +6,10 @@ + + #include "md5.h" + +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha1.cpp b/sha1.cpp +--- a/sha1.cpp ++++ b/sha1.cpp +@@ -7,8 +7,10 @@ + #include "sha1.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha256.cpp b/sha256.cpp +--- a/sha256.cpp ++++ b/sha256.cpp +@@ -7,8 +7,10 @@ + #include "sha256.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + +diff --git a/sha3.cpp b/sha3.cpp +--- a/sha3.cpp ++++ b/sha3.cpp +@@ -7,8 +7,10 @@ + #include "sha3.h" + + // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN +-#ifndef _MSC_VER +-#include ++#if defined(__APPLE__) ++ #include ++#elif !defined(_MSC_VER) ++ #include + #endif + + #include diff --git a/external_imported/vcpkg/ports/hash-library/CMakeLists.txt b/external_imported/vcpkg/ports/hash-library/CMakeLists.txt new file mode 100644 index 000000000..abc69f1e0 --- /dev/null +++ b/external_imported/vcpkg/ports/hash-library/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.5.1) +project(hash-library CXX) + +set(HEADERS + crc32.h + hash.h + hmac.h + keccak.h + md5.h + sha1.h + sha256.h + sha3.h +) + +set(SRCS + crc32.cpp + keccak.cpp + md5.cpp + sha1.cpp + sha256.cpp + sha3.cpp +) + +add_library(hash-library ${SRCS}) + +target_include_directories(hash-library PUBLIC $ $) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES ${HEADERS} DESTINATION include/hash-library) +endif() + +install( + TARGETS hash-library + EXPORT unofficial-hash-library-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install( + EXPORT unofficial-hash-library-targets + FILE unofficial-hash-library-targets.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-hash-library +) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-hash-library-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-hash-library-targets.cmake)\n") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-hash-library-config.cmake" DESTINATION share/unofficial-hash-library) diff --git a/external_imported/vcpkg/ports/hash-library/portfile.cmake b/external_imported/vcpkg/ports/hash-library/portfile.cmake new file mode 100644 index 000000000..6d6ced518 --- /dev/null +++ b/external_imported/vcpkg/ports/hash-library/portfile.cmake @@ -0,0 +1,26 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stbrumme/hash-library + REF hash_library_v8 + SHA512 1c428710c0c3e4d5d1114d757a5d9145ed12c7e2fbbfa51635f43a349ddb5634bdf49e8d8fdbc7576e90b319989fb85efec433bb43ddb551c2cf29a8e80ba78b + HEAD_REF master + PATCHES + 001-fix-macos.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/hash-library/vcpkg.json b/external_imported/vcpkg/ports/hash-library/vcpkg.json new file mode 100644 index 000000000..7c771cc33 --- /dev/null +++ b/external_imported/vcpkg/ports/hash-library/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "hash-library", + "version": "8", + "port-version": 2, + "description": "Portable C++ hashing library", + "homepage": "https://create.stephan-brumme.com/hash-library/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/hdf5/hdf5_config.patch b/external_imported/vcpkg/ports/hdf5/hdf5_config.patch index 85196507e..bcd76519c 100644 --- a/external_imported/vcpkg/ports/hdf5/hdf5_config.patch +++ b/external_imported/vcpkg/ports/hdf5/hdf5_config.patch @@ -18,14 +18,14 @@ index 4d02c9c..8c10d2d 100644 #----------------------------------------------------------------------------- if (NOT TARGET "@HDF5_PACKAGE@") - if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) -- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) +- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT) + find_dependency(ZLIB) endif () - if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) -- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZ_PACKAGE_NAME@/@SZ_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) +- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) + find_dependency(szip) endif () - include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) + include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) endif () diff --git a/external_imported/vcpkg/ports/hdf5/portfile.cmake b/external_imported/vcpkg/ports/hdf5/portfile.cmake index 6383a4826..da9f53e78 100644 --- a/external_imported/vcpkg/ports/hdf5/portfile.cmake +++ b/external_imported/vcpkg/ports/hdf5/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HDFGroup/hdf5 - REF hdf5-1_12_1 - SHA512 8a736b6a66bf4ec904a0e0dd9e8e0e791d8a04c996c5ea6b73b7d6f8145c4bfa4ed5c6e4f11740ceb1d1226a333c8242968e604dbdac2b7b561a1bd265423434 + REF hdf5-1_12_2 + SHA512 8f110e035a9bd5b07687b30fb944ed72e5b6a6e0ea74ee650250f40f0d4ff81e304366a76129a50a2d37c7f4c59a57356d0d9eed18db6cb90e924c62273d17a4 HEAD_REF develop PATCHES hdf5_config.patch @@ -47,7 +47,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip -if(FEATURES MATCHES "tools" AND VCPKG_CRT_LINKAGE STREQUAL "static") +if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) endif() @@ -65,7 +65,7 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF -DHDF5_BUILD_EXAMPLES=OFF -DHDF5_INSTALL_DATA_DIR=share/hdf5/data - -DHDF5_INSTALL_CMAKE_DIR=share + -DHDF5_INSTALL_CMAKE_DIR=share/hdf5 -DHDF_PACKAGE_NAMESPACE:STRING=hdf5:: -DHDF5_MSVC_NAMING_CONVENTION=OFF -DSZIP_USE_EXTERNAL=ON @@ -84,12 +84,16 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") - foreach(file IN LISTS pc_files) + +file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") +foreach(file IN LISTS pc_files) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5") - endforeach() -endif() + endif() + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${file}" "/msmpi.lib\"" "/msmpi\"") + endif() +endforeach() file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] @@ -98,7 +102,7 @@ string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] ) file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) -if(FEATURES MATCHES "tools") +if("tools" IN_LIST FEATURES) set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import ) @@ -115,6 +119,12 @@ if(FEATURES MATCHES "tools") endif() endforeach() + if("parallel" IN_LIST FEATURES) + list(APPEND HDF5_TOOLS h5perf) + else() + list(APPEND HDF5_TOOLS h5perf_serial) + endif() + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) endif() diff --git a/external_imported/vcpkg/ports/hdf5/vcpkg.json b/external_imported/vcpkg/ports/hdf5/vcpkg.json index d535ebfa5..363719571 100644 --- a/external_imported/vcpkg/ports/hdf5/vcpkg.json +++ b/external_imported/vcpkg/ports/hdf5/vcpkg.json @@ -1,9 +1,10 @@ { "name": "hdf5", - "version": "1.12.1", - "port-version": 4, + "version": "1.12.2", + "port-version": 1, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/hexl/portfile.cmake b/external_imported/vcpkg/ports/hexl/portfile.cmake index bbfbed2a9..e18590542 100644 --- a/external_imported/vcpkg/ports/hexl/portfile.cmake +++ b/external_imported/vcpkg/ports/hexl/portfile.cmake @@ -1,35 +1,30 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - REF 0858760dc957280e8eb8953af4b4b83879d7b8a4 - SHA512 f2400c4bf32d22904f5917a396fdf6fc625a8832455437429abd54cae70da51cfc42a57dc176d1faeb76f7cd4569dd7499a8f302aef2ea8463d3e8ddc3132050 - HEAD_REF 1.2.3 + REF b4589b6149a46dd287bcc0c81c746f72bcf6b37d # 1.2.4 + SHA512 79eaec45cf5b83459e41cd26c58118a1d0fa4bc1f07ebb00ebd646c90effb0d1dc26f3c33d28f3f1d3cd1cdff8fd23053790156b1c1a736525681bb6fa1fe027 + HEAD_REF development ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(HEXL_SHARED OFF) -else() - set(HEXL_SHARED ON) -endif() - -vcpkg_find_acquire_program(GIT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HEXL_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DHEXL_BENCHMARK=OFF" - "-DHEXL_COVERAGE=OFF" - "-DHEXL_TESTING=OFF" - "-DHEXL_SHARED_LIB=${HEXL_SHARED}" + -DHEXL_BENCHMARK=OFF + -DHEXL_COVERAGE=OFF + -DHEXL_TESTING=OFF + -DHEXL_SHARED_LIB=${HEXL_SHARED} ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.3") +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.4") +vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") - -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/hexl/vcpkg.json b/external_imported/vcpkg/ports/hexl/vcpkg.json index 7d75fd4b5..86e61f459 100644 --- a/external_imported/vcpkg/ports/hexl/vcpkg.json +++ b/external_imported/vcpkg/ports/hexl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "hexl", - "version": "1.2.3", - "port-version": 1, + "version": "1.2.4", "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", - "supports": "x64 & !(windows & !static)", + "license": "Apache-2.0", + "supports": "x64", "dependencies": [ "cpu-features", "easyloggingpp", diff --git a/external_imported/vcpkg/ports/hidapi/portfile.cmake b/external_imported/vcpkg/ports/hidapi/portfile.cmake index 57dfd339b..b83a4d416 100644 --- a/external_imported/vcpkg/ports/hidapi/portfile.cmake +++ b/external_imported/vcpkg/ports/hidapi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/hidapi - REF hidapi-0.11.2 - SHA512 c4d04bf570aa98dd88d7ce08ef1abb0675d500c9aa2c22f0437fa30b700a94446779f77e1170267926d5f6f0d9cdb2bb81ad1fe20d158c18587fddbca59e9517 + REF hidapi-0.12.0 + SHA512 866268927698db6fa553e000ead3c0c4b8df67ea768d36acac9c71f06f0bd8283778e90eee03f81aaa930f38dbb5719391906c7d2742b74479ffa436104f5fa4 HEAD_REF master ) @@ -16,7 +16,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/hidapi/hidapi.cmake" "\"/hidapi\"" "\"\${_IMPORT_PREFIX}/include\"") +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) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/hidapi/vcpkg.json b/external_imported/vcpkg/ports/hidapi/vcpkg.json index 673384492..4d60e3dc4 100644 --- a/external_imported/vcpkg/ports/hidapi/vcpkg.json +++ b/external_imported/vcpkg/ports/hidapi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hidapi", - "version-semver": "0.11.2", - "port-version": 1, + "version-semver": "0.12.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", diff --git a/external_imported/vcpkg/ports/highfive/fix_compiler_flags.patch b/external_imported/vcpkg/ports/highfive/fix_compiler_flags.patch new file mode 100644 index 000000000..06a766c6e --- /dev/null +++ b/external_imported/vcpkg/ports/highfive/fix_compiler_flags.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/config/CompilerFlagsHelpers.cmake b/CMake/config/CompilerFlagsHelpers.cmake +index 67e7d9fe1..11ae2036c 100644 +--- a/CMake/config/CompilerFlagsHelpers.cmake ++++ b/CMake/config/CompilerFlagsHelpers.cmake +@@ -32,6 +32,9 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST}) + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON) + elseif(${CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID} MATCHES "Clang") + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_CLANG ON) ++ if(CMAKE_${COMPILER_LANGUAGE}_COMPILER_FRONTEND_VARIANT MATCHES "MSVC") ++ set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON) ++ endif() + elseif(CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID MATCHES "GNU") + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_GCC ON) + else() diff --git a/external_imported/vcpkg/ports/highfive/portfile.cmake b/external_imported/vcpkg/ports/highfive/portfile.cmake index f43ab26b5..50f6f3fd8 100644 --- a/external_imported/vcpkg/ports/highfive/portfile.cmake +++ b/external_imported/vcpkg/ports/highfive/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependency-hdf5.patch fix-error-C1128.patch + fix_compiler_flags.patch ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/highfive/vcpkg.json b/external_imported/vcpkg/ports/highfive/vcpkg.json index c30c52860..47b8d9e1f 100644 --- a/external_imported/vcpkg/ports/highfive/vcpkg.json +++ b/external_imported/vcpkg/ports/highfive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "highfive", "version": "2.3", - "port-version": 2, + "port-version": 3, "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", "homepage": "https://github.com/BlueBrain/HighFive", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/hiredis/portfile.cmake b/external_imported/vcpkg/ports/hiredis/portfile.cmake index 6e7e0937d..0eb8f9b56 100644 --- a/external_imported/vcpkg/ports/hiredis/portfile.cmake +++ b/external_imported/vcpkg/ports/hiredis/portfile.cmake @@ -33,11 +33,24 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() if("ssl" IN_LIST FEATURES) vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/hiredis.h" +[[typedef long long ssize_t; +#define _SSIZE_T_ /* for compatibility with libuv */]] +[[typedef intptr_t ssize_t;]] +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/sds.h" +[[typedef long long ssize_t; +#define SSIZE_MAX (LLONG_MAX >> 1)]] +[[typedef intptr_t ssize_t; +#define SSIZE_MAX INTPTR_MAX]] +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/hiredis/vcpkg.json b/external_imported/vcpkg/ports/hiredis/vcpkg.json index 48379f488..b8cbfc8e4 100644 --- a/external_imported/vcpkg/ports/hiredis/vcpkg.json +++ b/external_imported/vcpkg/ports/hiredis/vcpkg.json @@ -1,9 +1,10 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 3, + "port-version": 4, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch b/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch deleted file mode 100644 index 5a9e1b3ca..000000000 --- a/external_imported/vcpkg/ports/hpx/fix-cmakecache-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/HPX_ForwardCacheVariables.cmake b/cmake/HPX_ForwardCacheVariables.cmake -index 7c434085a76..34cc47c7750 100644 ---- a/cmake/HPX_ForwardCacheVariables.cmake -+++ b/cmake/HPX_ForwardCacheVariables.cmake -@@ -23,6 +23,17 @@ set(_cache_var_file_template - ) - set(_cache_variables) - foreach(_var IN LISTS cache_vars) -+ if(HPX_WITH_VCPKG) -+ # avoid writing directory names into cache file -+ string(FIND ${_var} "_DIR" _pos) -+ if(NOT ${_pos} EQUAL -1) -+ continue() -+ endif() -+ string(FIND ${_var} "_PATH" _pos) -+ if(NOT ${_pos} EQUAL -1) -+ continue() -+ endif() -+ endif() - set(_cache_variables "${_cache_variables}set(${_var} ${${_var}})\n") - endforeach() - diff --git a/external_imported/vcpkg/ports/hpx/fix-debug.patch b/external_imported/vcpkg/ports/hpx/fix-debug.patch new file mode 100644 index 000000000..a77b518be --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/fix-debug.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/HPX_CompilerFlagsTargets.cmake b/cmake/HPX_CompilerFlagsTargets.cmake +index 5bf4649..0912503 100644 +--- a/cmake/HPX_CompilerFlagsTargets.cmake ++++ b/cmake/HPX_CompilerFlagsTargets.cmake +@@ -15,14 +15,8 @@ target_compile_features(hpx_public_flags INTERFACE cxx_std_${HPX_CXX_STANDARD}) + + # Set other flags that should always be set + +-# HPX_DEBUG must be set without a generator expression as it determines ABI +-# compatibility. Projects in Release mode using HPX in Debug mode must have +-# HPX_DEBUG set, and projects in Debug mode using HPX in Release mode must not +-# have HPX_DEBUG set. HPX_DEBUG must also not be set by projects using HPX. +-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") +- target_compile_definitions(hpx_private_flags INTERFACE HPX_DEBUG) +- target_compile_definitions(hpx_public_flags INTERFACE HPX_DEBUG) +-endif() ++target_compile_definitions(hpx_private_flags INTERFACE $<$:HPX_DEBUG>) ++target_compile_definitions(hpx_public_flags INTERFACE $<$:HPX_DEBUG>) + + target_compile_definitions( + hpx_private_flags diff --git a/external_imported/vcpkg/ports/hpx/fix-export.patch b/external_imported/vcpkg/ports/hpx/fix-export.patch new file mode 100644 index 000000000..c9c2bbf4c --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/fix-export.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/HPX_GeneratePackageUtils.cmake b/cmake/HPX_GeneratePackageUtils.cmake +index 3ec8002..b098465 100644 +--- a/cmake/HPX_AddModule.cmake ++++ b/cmake/HPX_AddModule.cmake +@@ -437,7 +437,7 @@ function(add_hpx_module libname modulename) + elseif(MSVC) + set(_module_target hpx_${modulename}) + target_link_libraries( +- hpx_${libname} PRIVATE -WHOLEARCHIVE:$ ++ hpx_${libname} PRIVATE -WHOLEARCHIVE:$> + ) + endif() + target_link_libraries(hpx_${libname} PRIVATE ${_module_target}) +--- a/cmake/HPX_GeneratePackageUtils.cmake ++++ b/cmake/HPX_GeneratePackageUtils.cmake +@@ -101,7 +101,7 @@ function( + ) + set(_libraries + ${_libraries} +- $>$> ++ $>>$> + ) + endif() + elseif("${dep_target}" MATCHES "^-l") diff --git a/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch b/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch new file mode 100644 index 000000000..a031b1fa6 --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/fix_output_name_clash.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake +index 129a87ced..b45feb3f5 100644 +--- a/cmake/HPX_AddComponent.cmake ++++ b/cmake/HPX_AddComponent.cmake +@@ -303,7 +303,7 @@ function(add_hpx_component name) + hpx_setup_target( + ${name}_component + TYPE COMPONENT +- NAME ${name} ++ NAME ${name}_component + FOLDER ${${name}_FOLDER} + COMPILE_FLAGS ${${name}_COMPILE_FLAGS} + LINK_FLAGS ${${name}_LINK_FLAGS} diff --git a/external_imported/vcpkg/ports/hpx/format.patch b/external_imported/vcpkg/ports/hpx/format.patch new file mode 100644 index 000000000..f3a5003ce --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/format.patch @@ -0,0 +1,12 @@ +diff --git a/components/iostreams/include/hpx/components/iostreams/ostream.hpp b/components/iostreams/include/hpx/components/iostreams/ostream.hpp +index 423f4728d00..dda4b059796 100644 +--- a/components/iostreams/include/hpx/components/iostreams/ostream.hpp ++++ b/components/iostreams/include/hpx/components/iostreams/ostream.hpp +@@ -398,6 +398,6 @@ namespace hpx { namespace util { + hpx::iostreams::ostream& os, std::string const& format_str, + Args const&... args) + { +- return os << format(format_str, args...); ++ return os << hpx::util::format(format_str, args...); + } + }} // namespace hpx::util diff --git a/external_imported/vcpkg/ports/hpx/portfile.cmake b/external_imported/vcpkg/ports/hpx/portfile.cmake index 9cbdf361f..00d351d31 100644 --- a/external_imported/vcpkg/ports/hpx/portfile.cmake +++ b/external_imported/vcpkg/ports/hpx/portfile.cmake @@ -1,24 +1,38 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.7.1 - SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 + REF f48c81865800ae72618b40b4e79d4168cfb0bd56 + SHA512 06d1384615b327194d871145c1899317bd350c43a072be2cbfdc773f7869b71aafce3e9cabf835a8fe902a13d7050d5e0400a76f74023985575347a645196b1d HEAD_REF stable PATCHES fix-dependency-hwloc.patch - fix-cmakecache-paths.patch + format.patch + fix-export.patch + fix-debug.patch + fix_output_name_clash.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "zlib" HPX_WITH_COMPRESSION_ZLIB + "snappy" HPX_WITH_COMPRESSION_SNAPPY + "bzip2" HPX_WITH_COMPRESSION_BZIP2 + "cuda" HPX_WITH_CUDA + "mpi" HPX_WITH_PARCELPORT_MPI + "mpi" HPX_WITH_PARCELPORT_MPI_MULTITHREADED ) -set(HPX_WITH_MALLOC system) -if(VCPKG_TARGET_IS_LINUX) - # This is done at the request of the hpx maintainers; see - # https://github.com/microsoft/vcpkg/pull/21673#issuecomment-979904882 - # It must match when gperftools is treated as a dependency of this port. - set(HPX_WITH_MALLOC tcmalloc) +if(NOT VCPKG_TARGET_ARCHITECTURE MATCHES "(x64|x86)") + list(APPEND FEATURE_OPTIONS "-DHPX_WITH_GENERIC_CONTEXT_COROUTINES=ON") endif() +file(REMOVE "${SOURCE_PATH}/cmake/FindBZip2.cmake") # Outdated vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -28,9 +42,16 @@ vcpkg_cmake_configure( -DHPX_WITH_EXAMPLES=OFF -DHPX_WITH_TOOLS=OFF -DHPX_WITH_RUNTIME=OFF - "-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}" + -DHPX_USE_CMAKE_CXX_STANDARD=ON + ${FEATURE_OPTIONS} + -DHPX_WITH_PKGCONFIG=OFF + -DHPX_WITH_STATIC_LINKING=${HPX_WITH_STATIC_LINKING} + -DHPX_WITH_PARCELPORT_TCP=ON + -DHPX_WITH_THREAD_TARGET_ADDRESS=ON + -DHPX_WITH_CHECK_MODULE_DEPENDENCIES=ON + -DHPX_WITH_THREAD_IDLE_RATES=ON + -DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET} ) - vcpkg_cmake_install() # post build cleanup @@ -64,30 +85,6 @@ file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/hpx") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/hpx") - file(REMOVE ${DLLS}) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -96,4 +93,13 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") -vcpkg_copy_pdbs() +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/external_imported/vcpkg/ports/hpx/usage b/external_imported/vcpkg/ports/hpx/usage new file mode 100644 index 000000000..cf471d059 --- /dev/null +++ b/external_imported/vcpkg/ports/hpx/usage @@ -0,0 +1,4 @@ +The port hpx provides CMake targets: + + find_package(HPX REQUIRED) + target_link_libraries(main PRIVATE HPX::hpx) diff --git a/external_imported/vcpkg/ports/hpx/vcpkg.json b/external_imported/vcpkg/ports/hpx/vcpkg.json index c82018a75..ba47e04b6 100644 --- a/external_imported/vcpkg/ports/hpx/vcpkg.json +++ b/external_imported/vcpkg/ports/hpx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hpx", - "version-semver": "1.7.1", - "port-version": 5, + "version": "1.8.0", + "port-version": 1, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." @@ -29,6 +29,10 @@ "platform": "linux" }, "hwloc", + { + "name": "pkgconf", + "host": true + }, { "name": "vcpkg-cmake", "host": true @@ -37,5 +41,43 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "bzip2", + "mpi", + "snappy", + "zlib" + ], + "features": { + "bzip2": { + "description": "Build with bzip2 compression", + "dependencies": [ + "bzip2" + ] + }, + "cuda": { + "description": "Build with CUDA support", + "dependencies": [ + "cuda" + ] + }, + "mpi": { + "description": "Build with MPI parcelport", + "dependencies": [ + "mpi" + ] + }, + "snappy": { + "description": "Build with snappy compression", + "dependencies": [ + "snappy" + ] + }, + "zlib": { + "description": "Build with zlib compression", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/external_imported/vcpkg/ports/hunspell/0005-autotools-subdirs.patch b/external_imported/vcpkg/ports/hunspell/0005-autotools-subdirs.patch new file mode 100644 index 000000000..0a4320d5b --- /dev/null +++ b/external_imported/vcpkg/ports/hunspell/0005-autotools-subdirs.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index c0aae53..769aef5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS= po src man tests ++SUBDIRS= po src + + pkgconfdir = $(libdir)/pkgconfig + pkgconf_DATA = hunspell.pc +diff --git a/configure.ac b/configure.ac +index 358cb1d..152adef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,6 +38,9 @@ dnl internationalization macros + AM_GNU_GETTEXT_VERSION(0.18) + AM_GNU_GETTEXT([external]) + ++AC_ARG_ENABLE(tools,[]) ++AM_CONDITIONAL(DISABLE_TOOLS, test x$enable_tools != xyes) ++ + AC_ARG_WITH(warnings,[ --with-warnings compile with warning messages],[ + AC_DEFINE(HUNSPELL_WARNING_ON,1,"Define if you need warning messages") + ]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 45b7703..27700af 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1 +1,5 @@ ++if DISABLE_TOOLS ++SUBDIRS=hunspell ++else + SUBDIRS=hunspell parsers tools ++endif diff --git a/external_imported/vcpkg/ports/hunspell/portfile.cmake b/external_imported/vcpkg/ports/hunspell/portfile.cmake index 6c82edd18..61ab522af 100644 --- a/external_imported/vcpkg/ports/hunspell/portfile.cmake +++ b/external_imported/vcpkg/ports/hunspell/portfile.cmake @@ -1,24 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell - REF v1.7.0 - SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 + REF v1.7.1 + SHA512 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec HEAD_REF master PATCHES 0001_fix_unistd.patch 0002-disable-test.patch 0003-fix-win-build.patch 0004-add-win-arm64.patch + 0005-autotools-subdirs.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools BUILD_TOOLS -) +file(REMOVE "${SOURCE_PATH}/README") #README is a symlink +configure_file("${SOURCE_PATH}/README.md" "${SOURCE_PATH}/README" COPYONLY) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(REMOVE "${SOURCE_PATH}/README") #README is a symlink - #architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(HUNSPELL_ARCH Win32) @@ -30,10 +27,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(FATAL_ERROR "unsupported architecture") endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(HUNSPELL_CONFIGURATION _dll) else() - set(HUNSPELL_CONFIGURATION ) + set(HUNSPELL_CONFIGURATION "") endif() if("tools" IN_LIST FEATURES) @@ -51,49 +48,58 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) DEBUG_CONFIGURATION Debug${HUNSPELL_CONFIGURATION} ALLOW_ROOT_INCLUDES ) + vcpkg_copy_pdbs() + + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") + else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ENV{CFLAGS} "$ENV{CFLAGS} -DHUNSPELL_STATIC") set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} -DHUNSPELL_STATIC") endif() - if(NOT "tools" IN_LIST FEATURES) # Building the tools is not possible on windows! - file(READ "${SOURCE_PATH}/src/Makefile.am" _contents) - string(REPLACE " parsers tools" "" _contents "${_contents}") - file(WRITE "${SOURCE_PATH}/src/Makefile.am" "${_contents}") + vcpkg_list(SET options) + if("tools" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-tools") + endif() + if("nls" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-nls") + else() + set(ENV{AUTOPOINT} true) # true, the program + vcpkg_list(APPEND options "--disable-nls") endif() - vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG ADDITIONAL_MSYS_PACKAGES gzip + OPTIONS + ${options} + OPTIONS_DEBUG + --disable-tools ) - #install-pkgconfDATA: - vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) + if("nls" IN_LIST FEATURES) + vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) + endif() vcpkg_install_make() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") vcpkg_fixup_pkgconfig() + + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") endif() -vcpkg_copy_pdbs() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if (VCPKG_TARGET_IS_WINDOWS) - set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") - else() - set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") - endif() - vcpkg_replace_string( - ${HUNSPELL_EXPORT_HDR} - "#if defined(HUNSPELL_STATIC)" - "#if 1" - ) + vcpkg_replace_string("${HUNSPELL_EXPORT_HDR}" "#if defined(HUNSPELL_STATIC)" "#if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-lgpl) -file(INSTALL "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-mpl) +vcpkg_install_copyright( + COMMENT "Hunspell is licensed under LGPL/GPL/MPL tri-license." + FILE_LIST + "${SOURCE_PATH}/license.hunspell" + "${SOURCE_PATH}/license.myspell" + "${SOURCE_PATH}/COPYING.MPL" + "${SOURCE_PATH}/COPYING" + "${SOURCE_PATH}/COPYING.LESSER" +) diff --git a/external_imported/vcpkg/ports/hunspell/vcpkg.json b/external_imported/vcpkg/ports/hunspell/vcpkg.json index ae1c6d393..f5e602197 100644 --- a/external_imported/vcpkg/ports/hunspell/vcpkg.json +++ b/external_imported/vcpkg/ports/hunspell/vcpkg.json @@ -1,17 +1,19 @@ { "name": "hunspell", - "version": "1.7.0", - "port-version": 8, + "version": "1.7.1", "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", + "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later", "supports": "!uwp", "dependencies": [ "libiconv" ], "features": { - "tools": { - "description": "Build hunspell tools", + "nls": { + "description": "Enable native language support", + "supports": "!windows | mingw", "dependencies": [ + "gettext", { "name": "gettext", "host": true, @@ -20,6 +22,9 @@ ] } ] + }, + "tools": { + "description": "Build hunspell tools" } } } diff --git a/external_imported/vcpkg/ports/hwloc/portfile.cmake b/external_imported/vcpkg/ports/hwloc/portfile.cmake index 2109cf414..8c328031d 100644 --- a/external_imported/vcpkg/ports/hwloc/portfile.cmake +++ b/external_imported/vcpkg/ports/hwloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0 - SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516 + REF 3cf146011de099c53efee163ea7d3a059fd7bd60 # hwloc-2.7.1 + SHA512 c6c4fbd3a1bea2bd1df65b7512748cd10944a255b145effe6f75d5fa2c5b1da32d344f2cbff3062391d47230e84361620c69f87500113b45992282a512be90b4 PATCHES fix_shared_win_build.patch ) diff --git a/external_imported/vcpkg/ports/hwloc/vcpkg.json b/external_imported/vcpkg/ports/hwloc/vcpkg.json index 139760ba4..3ede66263 100644 --- a/external_imported/vcpkg/ports/hwloc/vcpkg.json +++ b/external_imported/vcpkg/ports/hwloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hwloc", - "version": "2.7.0", + "version": "2.7.1", "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", diff --git a/external_imported/vcpkg/ports/hyperscan/portfile.cmake b/external_imported/vcpkg/ports/hyperscan/portfile.cmake index b69532635..665a2873f 100644 --- a/external_imported/vcpkg/ports/hyperscan/portfile.cmake +++ b/external_imported/vcpkg/ports/hyperscan/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(HYPERSCAN_VERSION 5.3.0) +set(HYPERSCAN_VERSION 5.4.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hyperscan REF v${HYPERSCAN_VERSION} - SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56 + SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62 HEAD_REF master PATCHES 0001-remove-Werror.patch @@ -14,17 +14,16 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/hyperscan/vcpkg.json b/external_imported/vcpkg/ports/hyperscan/vcpkg.json index 05f19e116..767c6b810 100644 --- a/external_imported/vcpkg/ports/hyperscan/vcpkg.json +++ b/external_imported/vcpkg/ports/hyperscan/vcpkg.json @@ -1,9 +1,9 @@ { "name": "hyperscan", - "version-string": "5.3.0", - "port-version": 3, + "version": "5.4.0", "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", "supports": "!arm", "dependencies": [ "boost-array", @@ -26,6 +26,10 @@ "boost-unordered", "boost-utility", "pcre", - "ragel" + "ragel", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/icu/check-autoconf-archive.patch b/external_imported/vcpkg/ports/icu/check-autoconf-archive.patch new file mode 100644 index 000000000..4da4be13a --- /dev/null +++ b/external_imported/vcpkg/ports/icu/check-autoconf-archive.patch @@ -0,0 +1,14 @@ +diff --git a/source/configure.ac b/source/configure.ac +index d194c6d..33fcb2f 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -208,6 +208,8 @@ fi + #AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true) + #AC_CHECK_PROG(STRIP, strip, strip, true) + ++m4_ifndef([AX_CHECK_COMPILE_FLAG], [AC_MSG_ERROR(['autoconf-archive' is missing])]) ++ + # TODO(ICU-20301): Remove fallback to Python 2. + AC_CHECK_PROGS(PYTHON, python3 "py -3" python "py") + AC_SUBST(PYTHON) + diff --git a/external_imported/vcpkg/ports/icu/portfile.cmake b/external_imported/vcpkg/ports/icu/portfile.cmake index 1383c2bba..8aff183cc 100644 --- a/external_imported/vcpkg/ports/icu/portfile.cmake +++ b/external_imported/vcpkg/ports/icu/portfile.cmake @@ -1,4 +1,4 @@ -set(ICU_VERSION_MAJOR 70) +set(ICU_VERSION_MAJOR 71) set(ICU_VERSION_MINOR 1) set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") @@ -8,7 +8,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9 + SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912 ) vcpkg_extract_source_archive_ex( @@ -22,6 +22,7 @@ vcpkg_extract_source_archive_ex( mingw-dll-install.patch disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. fix-win-build.patch + check-autoconf-archive.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/external_imported/vcpkg/ports/icu/vcpkg.json b/external_imported/vcpkg/ports/icu/vcpkg.json index e3fec7996..9f40f50dd 100644 --- a/external_imported/vcpkg/ports/icu/vcpkg.json +++ b/external_imported/vcpkg/ports/icu/vcpkg.json @@ -1,8 +1,9 @@ { "name": "icu", - "version": "70.1", + "version": "71.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", + "license": "ICU", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json b/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json index f0ba45361..0d10509af 100644 --- a/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json +++ b/external_imported/vcpkg/ports/ideviceinstaller/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ideviceinstaller", "version-string": "1.1.2.23", - "port-version": 2, + "port-version": 3, "description": "Manage apps of iOS devices", + "supports": "!(windows & arm64)", "dependencies": [ "libimobiledevice", "libzip" diff --git a/external_imported/vcpkg/ports/ignition-cmake0/portfile.cmake b/external_imported/vcpkg/ports/ignition-cmake0/portfile.cmake index c57d7b03e..4e2d7dbaa 100644 --- a/external_imported/vcpkg/ports/ignition-cmake0/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-cmake0/portfile.cmake @@ -1,26 +1,24 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "0.6.1") ignition_modular_library(NAME cmake - VERSION ${PACKAGE_VERSION} + VERSION ${PACKAGE_VERSION} REF "ignition-cmake_${PACKAGE_VERSION}" - SHA512 bd57cd43dd944fef264353b67fbbbab989d4bb638b684f80868a8b61fe0b854e156e00852b967c7caa8598315bea60bd8b27ff000410e93c4f04185a13c90489 + SHA512 9414db04ef6ce0206aba4eb1c8192524249761976b82654da89222e0931d1e2bbd63dcc7f4e6c6fddbc71e54911e9bf9fcbd159f51862e89419e0686bfb035e9 # Ensure that gtest is not compiled (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/163) PATCHES do-not-compile-gtest.patch - # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) - support-arm64.patch - # Do not depend on pkg-config installed to find uuid + # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) + support-arm64.patch + # Do not depend on pkg-config installed to find uuid uuid-do-not-require-pkg-config.patch # Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175) fix-find-ign-curl.patch - ) + ) # Permit empty include folder set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Remove unneccessary directory, as ignition-cmake is a pure CMake package -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/external_imported/vcpkg/ports/ignition-cmake0/vcpkg.json b/external_imported/vcpkg/ports/ignition-cmake0/vcpkg.json index 4decf445a..6d97e8a6e 100644 --- a/external_imported/vcpkg/ports/ignition-cmake0/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-cmake0/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ignition-cmake0", - "version-string": "0.6.2", - "port-version": 3, + "version": "0.6.2", + "port-version": 4, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, "dependencies": [ - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch b/external_imported/vcpkg/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch new file mode 100644 index 000000000..5acf97537 --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake +index bc6dbdc..1e8adbb 100644 +--- a/cmake/IgnUtils.cmake ++++ b/cmake/IgnUtils.cmake +@@ -138,7 +138,7 @@ macro(ign_find_package PACKAGE_NAME) + #------------------------------------ + # Define the expected arguments + set(options REQUIRED PRIVATE EXACT QUIET BUILD_ONLY PKGCONFIG_IGNORE) +- set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON) ++ set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON BY_PKGCONFIG) + set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS) + + #------------------------------------ +@@ -183,9 +183,15 @@ macro(ign_find_package PACKAGE_NAME) + endif() + + ++ if (NOT ign_find_package_BY_PKGCONFIG) + #------------------------------------ + # Call find_package with the provided arguments + find_package(${${PACKAGE_NAME}_find_package_args}) ++ else() ++ find_package(PkgConfig REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(${PACKAGE_NAME} ${ign_find_package_BY_PKGCONFIG}) ++ endif() + + if(${PACKAGE_NAME}_FOUND) + +@@ -300,17 +306,11 @@ macro(ign_find_package PACKAGE_NAME) + endif() + + if(ign_find_package_REQUIRED_BY) +- +- # Identify which components are privately requiring this package +- foreach(component ${ign_find_package_PRIVATE_FOR}) +- set(${component}_${PACKAGE_NAME}_PRIVATE true) +- endforeach() +- + # If this is required by some components, add it to the + # ${component}_CMAKE_DEPENDENCIES variables that are specific to those + # componenets + foreach(component ${ign_find_package_REQUIRED_BY}) +- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) ++ if(NOT ign_find_package_BY_PKGCONFIG) + ign_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") + endif() + endforeach() diff --git a/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake b/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake index 454a84f17..93dc94a3d 100644 --- a/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-cmake2/portfile.cmake @@ -1,11 +1,11 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "2.5.0") ignition_modular_library(NAME cmake VERSION ${PACKAGE_VERSION} - SHA512 dc546e5e4deabba12faec5fb0162309dfce9b429a6bbd6637c058acdda3eb4fa1e44e9b71f55603d0cff77550117dafc3fc8475621ede65fa8aa915254beb463 - PATCHES FindGTS.patch) + SHA512 e39ed44ae6f7ccc338412f466f1257f88989e0818bee801ddbe09350e906cd9ce709be24356310fdbfde22d1b5b5846fed0aa794c06dcf7caf82748a07b428d6 + PATCHES + FindGTS.patch + add-pkgconfig-and-remove-privatefor-limit.patch) # Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json b/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json index 52c914892..84fcf05c3 100644 --- a/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-cmake2/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ignition-cmake2", "version": "2.5.0", - "port-version": 1, + "port-version": 3, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", + "license": null, "dependencies": [ - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/ignition-common1/portfile.cmake b/external_imported/vcpkg/ports/ignition-common1/portfile.cmake index 205673123..6bea5e2e2 100644 --- a/external_imported/vcpkg/ports/ignition-common1/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-common1/portfile.cmake @@ -1,6 +1,4 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME common VERSION "1.1.1" REF ignition-common_1.1.1 - SHA512 e96e82dc401281cd31843f4b0ae2c1d23589170869621ea62eb6d6b31b11bd622c14da7046b1993c8fc67a1d39bae9a96b9f8efc8923e305823f963d864975f7) + SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309) diff --git a/external_imported/vcpkg/ports/ignition-common1/vcpkg.json b/external_imported/vcpkg/ports/ignition-common1/vcpkg.json index a7df59922..bb85740f1 100644 --- a/external_imported/vcpkg/ports/ignition-common1/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-common1/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ignition-common1", - "version-string": "1.1.1", - "port-version": 2, + "version": "1.1.1", + "port-version": 3, "description": "Common libraries for robotics applications", + "license": null, "dependencies": [ { "name": "dlfcn-win32", @@ -22,6 +23,10 @@ }, "ignition-cmake0", "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, { "name": "tinyxml2", "platform": "!windows & !uwp" diff --git a/external_imported/vcpkg/ports/ignition-common3/fix-dependencies.patch b/external_imported/vcpkg/ports/ignition-common3/fix-dependencies.patch new file mode 100644 index 000000000..7908991df --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-common3/fix-dependencies.patch @@ -0,0 +1,81 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73920fe..8bee7fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) + #-------------------------------------- + # Find Tinyxml2 + if(USE_EXTERNAL_TINYXML2) +- ign_find_package(TINYXML2 PRETTY tinyxml2 ++ ign_find_package(tinyxml2 EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + else() +@@ -70,13 +70,13 @@ if(NOT MSVC) + + #------------------------------------ + # Find uuid +- ign_find_package(UUID REQUIRED PRETTY uuid) ++ ign_find_package(UUID REQUIRED PRETTY uuid REQUIRED_BY graphics) + + endif() + + #------------------------------------ + # Find Freeimage +-ign_find_package(FreeImage VERSION 3.9 ++ign_find_package(freeimage EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +@@ -84,6 +84,7 @@ ign_find_package(FreeImage VERSION 3.9 + # Find GNU Triangulation Surface Library + ign_find_package( + GTS PRETTY gts PURPOSE "GNU Triangulation Surface library" ++ BY_PKGCONFIG gts + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt +index 000a0ce..f6e1831 100644 +--- a/graphics/src/CMakeLists.txt ++++ b/graphics/src/CMakeLists.txt +@@ -16,8 +16,10 @@ target_link_libraries(${graphics_target} + PUBLIC + ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER} + PRIVATE +- GTS::GTS +- FreeImage::FreeImage) ++ ${GTS_LINK_LIBRARIES} ++ freeimage::FreeImage) ++ ++target_include_directories(${graphics_target} PRIVATE ${GTS_INCLUDE_DIRS}) + + ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} + LIB_DEPS ${graphics_target}) +@@ -28,13 +30,13 @@ if(USE_EXTERNAL_TINYXML2) + # If we are using an external copy of tinyxml2, add its imported target + target_link_libraries(${graphics_target} + PRIVATE +- TINYXML2::TINYXML2) ++ tinyxml2::tinyxml2) + + # The collada exporter test uses tinyxml2, so we must link it if we're using + # an external copy. The graphics target considers tinyxml2 to be a private + # dependency, so it will not automatically get linked to this test. + if(TARGET UNIT_ColladaExporter_TEST) +- target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2) ++ target_link_libraries(UNIT_ColladaExporter_TEST tinyxml2::tinyxml2) + endif() + + else() +@@ -62,8 +64,8 @@ endif() + + # define of tinxml2 major version >= 6 + # https://github.com/ignitionrobotics/ign-common/issues/28 +-if (NOT TINYXML2_VERSION VERSION_LESS "6.0.0") +- message(STATUS "TINYXML2_VERSION ${TINYXML2_VERSION} >= 6.0.0") ++if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") ++ message(STATUS "TINYXML2_VERSION ${tinyxml2_VERSION} >= 6.0.0") + target_compile_definitions(${graphics_target} + PRIVATE "TINYXML2_MAJOR_VERSION_GE_6") + endif() diff --git a/external_imported/vcpkg/ports/ignition-common3/portfile.cmake b/external_imported/vcpkg/ports/ignition-common3/portfile.cmake index 93059ae23..5ea87a935 100644 --- a/external_imported/vcpkg/ports/ignition-common3/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-common3/portfile.cmake @@ -1,8 +1,8 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME common VERSION "3.9.0" - SHA512 8d052850cbb125e334494c9ad9b234c371fe310327dba997515651f29479d747dffa55b0aa822f2a78e6317a4df2d41389c7a07165cdc08894fdfb116e4d9756) + SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9 + OPTIONS -DUSE_EXTERNAL_TINYXML2=ON + PATCHES fix-dependencies.patch) # Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") diff --git a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json index 700d243cb..f25d46d50 100644 --- a/external_imported/vcpkg/ports/ignition-common3/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-common3/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ignition-common3", - "version-string": "3.9.0", - "port-version": 2, + "version": "3.9.0", + "port-version": 4, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", + "license": null, "dependencies": [ { "name": "dlfcn-win32", @@ -14,7 +15,10 @@ "gts", "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, { "name": "libuuid", "platform": "!windows & !uwp & !osx" diff --git a/external_imported/vcpkg/ports/ignition-fuel-tools1/portfile.cmake b/external_imported/vcpkg/ports/ignition-fuel-tools1/portfile.cmake index c7c310294..3911029ed 100644 --- a/external_imported/vcpkg/ports/ignition-fuel-tools1/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-fuel-tools1/portfile.cmake @@ -1,9 +1,7 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME fuel-tools VERSION "1.2.0" CMAKE_PACKAGE_NAME ignition-fuel_tools1 - SHA512 a656fed74fb2138b3bcf7d35b25ad06da95cfb9a3ad7ded2c9c54db385f55ea310fd1a72dcf6400b0a6199e376c1ba2d11ee2a08c66e3c2cc8b2ee1b25406986 + SHA512 44ce9215231981f393cf1f6f83071e3f1c5d29bef4fab8d6483eb136b6e2a2e4273e85845f8b2336c4d50ac5fdcc6eb028a972baa0950083c8fa700f85cc7078 # Ensure yaml is correctly linked (backport of https://bitbucket.org/ignitionrobotics/ign-fuel-tools/pull-requests/103/use-yaml_target-instead-of-yaml-yaml/diff) PATCHES link-correct-yaml-target.patch # This can be removed when the pc file of curl is fixed diff --git a/external_imported/vcpkg/ports/ignition-fuel-tools1/vcpkg.json b/external_imported/vcpkg/ports/ignition-fuel-tools1/vcpkg.json index 3c4435458..1f4b69293 100644 --- a/external_imported/vcpkg/ports/ignition-fuel-tools1/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-fuel-tools1/vcpkg.json @@ -1,12 +1,17 @@ { "name": "ignition-fuel-tools1", - "version-string": "1.2.0", - "port-version": 3, + "version": "1.2.0", + "port-version": 4, "description": "Tools for using fuel API to download robot models", + "license": null, "dependencies": [ "curl", "ignition-cmake0", "ignition-common1", + { + "name": "ignition-modularscripts", + "host": true + }, "jsoncpp", "libyaml", "libzip" diff --git a/external_imported/vcpkg/ports/ignition-fuel-tools4/portfile.cmake b/external_imported/vcpkg/ports/ignition-fuel-tools4/portfile.cmake index 3e88cbcc2..f542987ff 100644 --- a/external_imported/vcpkg/ports/ignition-fuel-tools4/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-fuel-tools4/portfile.cmake @@ -1,7 +1,5 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME fuel-tools VERSION "4.3.0" CMAKE_PACKAGE_NAME ignition-fuel_tools4 - SHA512 451d7bcd195a8ce41c3a7d64ad936c8c0812cbc7af03dbe75cbdc359599bf1f828595833c1758d4de8e37c37730bb852de95b2256ff9134af4ab197df2b66a8b + SHA512 1996e487bf8dcb29798064b1a12fe972931e84bcb19a4df2398d34cda9963bc9eef6dd14446c22c18f0de894dcdf35852669ce62b57562b1609045248f41ea0f ) diff --git a/external_imported/vcpkg/ports/ignition-fuel-tools4/vcpkg.json b/external_imported/vcpkg/ports/ignition-fuel-tools4/vcpkg.json index 093056ffb..3b5b17a11 100644 --- a/external_imported/vcpkg/ports/ignition-fuel-tools4/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-fuel-tools4/vcpkg.json @@ -1,14 +1,18 @@ { "name": "ignition-fuel-tools4", - "version-string": "4.3.0", - "port-version": 1, + "version": "4.3.0", + "port-version": 2, "description": "Tools for using fuel API to download robot models", "homepage": "https://ignitionrobotics.org/libs/fuel_tools", + "license": null, "dependencies": [ "curl", "ignition-cmake2", "ignition-common3", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs5", "jsoncpp", "libyaml", diff --git a/external_imported/vcpkg/ports/ignition-math4/portfile.cmake b/external_imported/vcpkg/ports/ignition-math4/portfile.cmake index 8d5148477..352330d67 100644 --- a/external_imported/vcpkg/ports/ignition-math4/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-math4/portfile.cmake @@ -1,5 +1,3 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME math VERSION "4.0.0" - SHA512 5996af60666a1166fc19b2db9715f7214341becb8eb6071c09315e1f71e759c6de4da99b44312829fc7b2bdef7e0f3671e4d2a92e0d2dd5d5fd782a6c46b012a) + SHA512 b0559c691335d43e4cbb986ff13cdee9c65ce59d8e3a15808d9b052fc064263560fece71d670d5417b4b713fcd7ac32f5b808703ff472979a7226e0c1b2089aa) diff --git a/external_imported/vcpkg/ports/ignition-math4/vcpkg.json b/external_imported/vcpkg/ports/ignition-math4/vcpkg.json index bcdab1843..33466e290 100644 --- a/external_imported/vcpkg/ports/ignition-math4/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-math4/vcpkg.json @@ -1,10 +1,15 @@ { "name": "ignition-math4", - "version-string": "4.0.0", - "port-version": 2, + "version": "4.0.0", + "port-version": 3, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, "dependencies": [ - "ignition-cmake0" + "ignition-cmake0", + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/ignition-math6/portfile.cmake b/external_imported/vcpkg/ports/ignition-math6/portfile.cmake index b0254303f..fc9ac4469 100644 --- a/external_imported/vcpkg/ports/ignition-math6/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-math6/portfile.cmake @@ -1,6 +1,4 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME math VERSION "6.6.0" - SHA512 1b5f59b45256daa81cbfb7da4727200d0d6cb4a75fbc3b83b512c18ec6307b5bd78b8ee7a84f0f8a8c334717a1480766f62658bd213e9021c09c0ed22caa921d + SHA512 6c0a6e7098f31b3dc9abbcd8714808669eca10e385748d4c1b44aa06dcfa5701906bea0277a99c3132fdd1a8c9a8e9c593099ac0eedfe5dec370018b2b63bfec PATCHES fix-isspace.patch) diff --git a/external_imported/vcpkg/ports/ignition-math6/vcpkg.json b/external_imported/vcpkg/ports/ignition-math6/vcpkg.json index 9d934867b..dc47d8753 100644 --- a/external_imported/vcpkg/ports/ignition-math6/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-math6/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ignition-math6", - "version-string": "6.6.0", - "port-version": 2, + "version": "6.6.0", + "port-version": 3, "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", + "license": null, "dependencies": [ "eigen3", "ignition-cmake2", - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/ignition-modularscripts/portfile.cmake b/external_imported/vcpkg/ports/ignition-modularscripts/portfile.cmake index 509240d7d..cabf97adc 100644 --- a/external_imported/vcpkg/ports/ignition-modularscripts/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-modularscripts/portfile.cmake @@ -1,8 +1,7 @@ -file(COPY - ${CMAKE_CURRENT_LIST_DIR}/ignition_modular_library.cmake - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/ignitionmodularscripts -) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/ignitionmodularscripts/copyright "") +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/ignition-modularscripts/ignition_modular_library.cmake b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake similarity index 81% rename from external_imported/vcpkg/ports/ignition-modularscripts/ignition_modular_library.cmake rename to external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake index 9492531e8..7737281d4 100644 --- a/external_imported/vcpkg/ports/ignition-modularscripts/ignition_modular_library.cmake +++ b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,10 +1,18 @@ -function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME IML_DISABLE_PKGCONFIG_INSTALL) +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}) + vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${IML_SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE - OPTIONS -DBUILD_TESTING=OFF + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -DBUILD_TESTING=OFF + ${IML_OPTIONS} ) vcpkg_install_cmake(ADD_BIN_TO_PATH) @@ -12,7 +20,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC # 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 ${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_fixup_cmake_targets for them as well file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES LIST_DIRECTORIES TRUE RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" @@ -25,10 +33,10 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC endforeach() file(GLOB_RECURSE CMAKE_RELEASE_FILES - "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") + "${CURRENT_PACKAGES_DIR}/lib/cmake/${IML_CMAKE_PACKAGE_NAME}/*") file(COPY ${CMAKE_RELEASE_FILES} DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") + "${CURRENT_PACKAGES_DIR}/share/${IML_CMAKE_PACKAGE_NAME}/") endif() # Remove unused files files @@ -111,7 +119,7 @@ endfunction() function(ignition_modular_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME) - set(multiValueArgs PATCHES) + set(multiValueArgs PATCHES OPTIONS) cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION}) @@ -141,8 +149,21 @@ function(ignition_modular_library) SHA512 ${IML_SHA512} HEAD_REF ${IML_HEAD_REF} PATCHES ${IML_PATCHES} + FILE_DISAMBIGUATOR 1 ) + if (IML_DISABLE_PKGCONFIG_INSTALL) + set(EXTRA_OPTIONS DISABLE_PKGCONFIG_INSTALL) + endif() + # Build library - ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL}) + 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} + OPTIONS ${IML_OPTIONS} + ) endfunction() diff --git a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json index d6c0c638b..d7beaa13f 100644 --- a/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-modularscripts/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ignition-modularscripts", - "version-string": "2020-11-23", + "version-date": "2022-05-11", "port-version": 1, - "description": "Vcpkg helpers to package ignition libraries" + "description": "Vcpkg helpers to package ignition libraries", + "license": null } diff --git a/external_imported/vcpkg/ports/ignition-msgs1/fix-Add_std_string.patch b/external_imported/vcpkg/ports/ignition-msgs1/fix-Add_std_string.patch new file mode 100644 index 000000000..8b20e4337 --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-msgs1/fix-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/include/ignition/msgs/Generator.hh b/include/ignition/msgs/Generator.hh +index 62d77c6..5785e51 100644 +--- a/include/ignition/msgs/Generator.hh ++++ b/include/ignition/msgs/Generator.hh +@@ -43,9 +43,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; +diff --git a/src/Generator.cc b/src/Generator.cc +index f703fb8..922d637 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { diff --git a/external_imported/vcpkg/ports/ignition-msgs1/portfile.cmake b/external_imported/vcpkg/ports/ignition-msgs1/portfile.cmake index 0b2215f49..058c5996c 100644 --- a/external_imported/vcpkg/ports/ignition-msgs1/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-msgs1/portfile.cmake @@ -1,5 +1,3 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - # Explicitly disable cross-compilation until the upstream discussion # https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -18,6 +16,8 @@ ignition_modular_library(NAME msgs VERSION "1.0.0" # See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match REF ignition-msgs_1.0.0 - SHA512 3a270f0ac988b947091d4626be48fe8cfed5ddfde5a37b9d0f08fddcbf278099ab231fca11e2dd2296ca54e0350ea14e3f685dc238f0827f18f10ab7b75039de + SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945 # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) - PATCHES fix-protobuf-static-link-order.patch) + PATCHES + fix-protobuf-static-link-order.patch + fix-Add_std_string.patch) diff --git a/external_imported/vcpkg/ports/ignition-msgs1/vcpkg.json b/external_imported/vcpkg/ports/ignition-msgs1/vcpkg.json index f81434b7a..903b1fceb 100644 --- a/external_imported/vcpkg/ports/ignition-msgs1/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-msgs1/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-msgs1", - "version-string": "1.0.0", - "port-version": 4, + "version": "1.0.0", + "port-version": 6, "description": "Middleware protobuf messages for robotics", + "license": "Apache-2.0", "dependencies": [ "ignition-cmake0", "ignition-math4", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf" ] } diff --git a/external_imported/vcpkg/ports/ignition-msgs5/02-Add_std_string.patch b/external_imported/vcpkg/ports/ignition-msgs5/02-Add_std_string.patch new file mode 100644 index 000000000..1bf22e3df --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-msgs5/02-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/src/Generator.cc b/src/Generator.cc +index 3729ad4..099a46b 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { +diff --git a/src/Generator.hh b/src/Generator.hh +index c0f2336..6132274 100644 +--- a/src/Generator.hh ++++ b/src/Generator.hh +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; diff --git a/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake b/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake index 23a05709d..494a71795 100644 --- a/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-msgs5/portfile.cmake @@ -1,10 +1,9 @@ # Cross-compilation is disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME msgs VERSION "5.3.0" - SHA512 55c167d00b60ae6da0144a9495e9ac8aed61fcbdc61e057e75d31261e335c573543d60e28a7dc195a7c9849c5c6eb0e088d4f4e79fd927e83470a3f1fabef60e + SHA512 645ae5317fb4c3c1b452e98c3581363fc939b5b963dae8a2097bcee97584819bd80357397d88728c5917142dd4ac9beecc335862df44fc06a46d8aa62c54e389 PATCHES - "01-protobuf.patch") + "01-protobuf.patch" + "02-Add_std_string.patch") diff --git a/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json b/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json index d215d8c47..d5cb928c7 100644 --- a/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-msgs5/vcpkg.json @@ -1,13 +1,17 @@ { "name": "ignition-msgs5", "version": "5.3.0", - "port-version": 4, + "port-version": 6, "description": "Middleware protobuf messages for robotics", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf", "tinyxml2" ] diff --git a/external_imported/vcpkg/ports/ignition-msgs6/01-Add_std_string.patch b/external_imported/vcpkg/ports/ignition-msgs6/01-Add_std_string.patch new file mode 100644 index 000000000..609d4ce38 --- /dev/null +++ b/external_imported/vcpkg/ports/ignition-msgs6/01-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/src/Generator.cc b/src/Generator.cc +index d490b5a..4265845 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { +diff --git a/src/Generator.hh b/src/Generator.hh +index c0f2336..6132274 100644 +--- a/src/Generator.hh ++++ b/src/Generator.hh +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; diff --git a/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake b/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake index 41f29fa1e..7b2e50932 100644 --- a/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-msgs6/portfile.cmake @@ -1,8 +1,7 @@ # Cross-compilation is explicitly disabled until the upstream discussion # https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME msgs VERSION "6.0.0" - SHA512 d1d6f6602ae33ec95b36c5df7815b06970f349492ef0309d8aacbaf2dca0c3e7314bbd64890a2554485fbd52f148a90b7bf54dceb0b3a1dd40eeb1f5bdb9613c) + SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46 + PATCHES 01-Add_std_string.patch) diff --git a/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json b/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json index df11c0d2f..715b1ad12 100644 --- a/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-msgs6/vcpkg.json @@ -1,13 +1,17 @@ { "name": "ignition-msgs6", "version": "6.0.0", - "port-version": 3, + "port-version": 5, "description": "Middleware protobuf messages for robotics", + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", "ignition-math6", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "protobuf", "tinyxml2" ] diff --git a/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake b/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake index daa626047..106c8e797 100644 --- a/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-plugin1/portfile.cmake @@ -1,7 +1,5 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - set(PACKAGE_VERSION "1.1.0") ignition_modular_library(NAME plugin VERSION ${PACKAGE_VERSION} REF "ignition-plugin_${PACKAGE_VERSION}" - SHA512 0657c5816e67d02329a79364050b8a56957180e5b7481b01696c7369b063cbfedfc93793a8ad92d87d242d24e476283dc7847bd810a3de98d3ec5ae7d640568c) + SHA512 e932dd7e7b042e9fb4c0569cb8b4028e54c394228aadf6523fa60ab1b9f7f9a17d14c79886a76365e2c47423c221aaef9ca77df638d87e2b6edb82eea10c0a3d) diff --git a/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json b/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json index 58e42c8c1..8a59e3a2d 100644 --- a/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-plugin1/vcpkg.json @@ -1,15 +1,19 @@ { "name": "ignition-plugin1", - "version-string": "1.1.0", - "port-version": 1, + "version": "1.1.0", + "port-version": 2, "description": "Library for registering plugin libraries and dynamically loading them at runtime", "homepage": "https://ignitionrobotics.org/libs/plugin", + "license": null, "dependencies": [ { "name": "dlfcn-win32", "platform": "windows | uwp" }, "ignition-cmake2", - "ignition-modularscripts" + { + "name": "ignition-modularscripts", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake b/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake index 09a868c14..0f70168c9 100644 --- a/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-transport4/portfile.cmake @@ -1,8 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "4.0.0" - SHA512 d4125044c21fdd6754f3b8b06f372df3f858080d5d33e97ed7a8ef8f6fb9857d562082aad41c89ea9146a33b1c3814305d33c5c8f8bcde66a16477b4a01655b4 + SHA512 581dd4700aebc455f6d7c01d8be17c6c4c802fd74b1504b2bd6544a0246b161231305fd318352904e230c986dfe072fa0608fccea9066b076e7216dc507a8510 # This can be removed when the pc file of libuuid on Windows is fixed DISABLE_PKGCONFIG_INSTALL PATCHES diff --git a/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json index b7e6b193e..2658f13ee 100644 --- a/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport4/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ignition-transport4", "version": "4.0.0", - "port-version": 5, + "port-version": 6, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake0", - "ignition-modularscripts", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs1", { "name": "libuuid", diff --git a/external_imported/vcpkg/ports/ignition-transport8/portfile.cmake b/external_imported/vcpkg/ports/ignition-transport8/portfile.cmake index 1155a1ab5..7ca8513e7 100644 --- a/external_imported/vcpkg/ports/ignition-transport8/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-transport8/portfile.cmake @@ -1,7 +1,3 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "8.1.0" - SHA512 eb64f18721190fcb79a5b45746fd44fa24274c6fe6c5021dd9306c15a327873377d07d4aa770633982038b84da650d3d0c8a56169222c0c88fa1318314fc4529 - # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) - DISABLE_PKGCONFIG_INSTALL) + SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a) diff --git a/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json index 8dd933199..52bcedab1 100644 --- a/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport8/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-transport8", - "version-string": "8.1.0", - "port-version": 2, + "version": "8.1.0", + "port-version": 4, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs5", { "name": "libuuid", diff --git a/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake b/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake index fcd8e6b46..039681566 100644 --- a/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake +++ b/external_imported/vcpkg/ports/ignition-transport9/portfile.cmake @@ -1,8 +1,6 @@ -include(${CURRENT_INSTALLED_DIR}/share/ignitionmodularscripts/ignition_modular_library.cmake) - ignition_modular_library(NAME transport VERSION "9.0.0" - SHA512 c3edb7a8a063b4aa5826838ae08c8ec2b3d14563492022df632a719409c95272f4f6a43d91f0c317e44b85921b5aedc1685670b81a7baa949f01af3b3534d76e + SHA512 9add7a8d3a43a17b1b71e7d7d9320909057c1f79880bd969baa99949709cdbb63f00f0735990891358bb29efd9c0ab8b6725b7c340c324b9266dcc9b73d767d4 # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) DISABLE_PKGCONFIG_INSTALL PATCHES diff --git a/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json b/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json index cfbbf4d87..59e5483f4 100644 --- a/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json +++ b/external_imported/vcpkg/ports/ignition-transport9/vcpkg.json @@ -1,11 +1,16 @@ { "name": "ignition-transport9", "version": "9.0.0", - "port-version": 3, + "port-version": 4, "description": "Transport middleware for robotics", + "license": null, "dependencies": [ "cppzmq", "ignition-cmake2", + { + "name": "ignition-modularscripts", + "host": true + }, "ignition-msgs6", { "name": "libuuid", diff --git a/external_imported/vcpkg/ports/igraph/glpk-uwp.patch b/external_imported/vcpkg/ports/igraph/glpk-uwp.patch new file mode 100644 index 000000000..7bee3aed0 --- /dev/null +++ b/external_imported/vcpkg/ports/igraph/glpk-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/glpk/env/dlsup.c b/vendor/glpk/env/dlsup.c +index 741354475..968a794b7 100644 +--- a/vendor/glpk/env/dlsup.c ++++ b/vendor/glpk/env/dlsup.c +@@ -25,6 +25,8 @@ + + #include "env.h" + ++#undef __WOE__ ++ + /* GNU version ********************************************************/ + + #if defined(HAVE_LTDL) diff --git a/external_imported/vcpkg/ports/igraph/portfile.cmake b/external_imported/vcpkg/ports/igraph/portfile.cmake index 4061978e1..7125372ec 100644 --- a/external_imported/vcpkg/ports/igraph/portfile.cmake +++ b/external_imported/vcpkg/ports/igraph/portfile.cmake @@ -4,20 +4,22 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.9.8/igraph-0.9.8.tar.gz" - FILENAME "igraph-0.9.8.tar.gz" - SHA512 4f0af3e2b4e2ed782064afc8a7aa0f104c683c35de3f71240d41a1b5097dd41101a483d4e5f9ce4dca1a5ca0bb616e1c125d58ccf50066b1405e8188fe4d796f + URLS "https://github.com/igraph/igraph/releases/download/0.10.1/igraph-0.10.1.tar.gz" + FILENAME "igraph-0.10.1.tar.gz" + SHA512 5761543be8c44b9d43bbad5e4bc595be2cb518a4a74b0c7c5ace49d4868bb567e44ee882554dc3cfb7b2835881c1c70689f241cd5937039d353e2a7d521a364a ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + "glpk-uwp.patch" # patch GLPK for UWP compatibility ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - graphml IGRAPH_GRAPHML_SUPPORT - openmp IGRAPH_OPENMP_SUPPORT + graphml IGRAPH_GRAPHML_SUPPORT + openmp IGRAPH_OPENMP_SUPPORT ) # Allow cross-compilation. See https://igraph.org/c/html/latest/igraph-Installation.html#igraph-Installation-cross-compiling @@ -38,17 +40,15 @@ vcpkg_cmake_configure( -DIGRAPH_ENABLE_LTO=AUTO # ARPACK not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_ARPACK=ON - # OpenBLAS provides BLAS/LAPACK but some tests fail with OpenBLAS on Windows. - # See https://github.com/igraph/igraph/issues/1491 - -DIGRAPH_USE_INTERNAL_BLAS=ON - -DIGRAPH_USE_INTERNAL_LAPACK=ON - -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF # GLPK is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_GLPK=ON # Currently, external GMP provides no performance or functionality benefits. -DIGRAPH_USE_INTERNAL_GMP=ON # PLFIT is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_PLFIT=ON + # Use BLAS and LAPACK from vcpkg + -DIGRAPH_USE_INTERNAL_BLAS=OFF + -DIGRAPH_USE_INTERNAL_LAPACK=OFF -DF2C_EXTERNAL_ARITH_HEADER=${ARITH_H} ${FEATURE_OPTIONS} ) diff --git a/external_imported/vcpkg/ports/igraph/vcpkg.json b/external_imported/vcpkg/ports/igraph/vcpkg.json index f5a73ff0e..dbc1b7e89 100644 --- a/external_imported/vcpkg/ports/igraph/vcpkg.json +++ b/external_imported/vcpkg/ports/igraph/vcpkg.json @@ -1,11 +1,12 @@ { "name": "igraph", - "version": "0.9.8", + "version": "0.10.1", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", "dependencies": [ - "suitesparse", + "blas", + "lapack", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/iir1/fix-shared-static.patch b/external_imported/vcpkg/ports/iir1/fix-shared-static.patch new file mode 100644 index 000000000..cfa29a122 --- /dev/null +++ b/external_imported/vcpkg/ports/iir1/fix-shared-static.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,9 +12,11 @@ cmake_policy(SET CMP0048 NEW) # set VERSION in project() + cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH by default + + include(GNUInstallDirs) ++if(BUILD_TESTING) + add_subdirectory(test) + add_subdirectory(demo) + enable_testing () ++endif() + + if (MSVC) + add_compile_options(/W4) +@@ -47,6 +49,8 @@ set(LIBINCLUDE + iir/State.h + iir/Types.h) + ++if(BUILD_SHARED_LIBS) ++ + add_library(iir SHARED ${LIBSRC}) + add_library(iir::iir ALIAS iir) + +@@ -73,6 +77,8 @@ install(TARGETS iir EXPORT iir-targets + + configure_file(iir.pc.in iir.pc @ONLY) + ++else(BUILD_SHARED_LIBS) ++ + add_library(iir_static STATIC ${LIBSRC}) + add_library(iir::iir_static ALIAS iir_static) + +@@ -97,6 +103,8 @@ install(TARGETS iir_static EXPORT iir-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iir) + ++endif(BUILD_SHARED_LIBS) ++ + install(EXPORT iir-targets + DESTINATION lib/cmake/iir + NAMESPACE iir:: diff --git a/external_imported/vcpkg/ports/iir1/portfile.cmake b/external_imported/vcpkg/ports/iir1/portfile.cmake index 41dbf465f..0a4d87c2b 100644 --- a/external_imported/vcpkg/ports/iir1/portfile.cmake +++ b/external_imported/vcpkg/ports/iir1/portfile.cmake @@ -1,13 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO berndporr/iir1 - REF 1.9.0 - SHA512 9dced1610fbbfd7194874e984f969880dc76df3562df575c07d022b9ac96c67334b542acea395531423dfb5b8d692b14abdaff0235f048ab6ca7221bfc57fdba + REF 1.9.1 + SHA512 115692fb82637d21c2cbff974d931ef12a5c7fd8502560e2b807ceed69b1a6a4e05898aff37b089ccda7c4aa32e97e71f7e6007998ec52f6122da33eb222112e HEAD_REF master + PATCHES + fix-shared-static.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/iir1/vcpkg.json b/external_imported/vcpkg/ports/iir1/vcpkg.json index 92b672b1e..781d68b2d 100644 --- a/external_imported/vcpkg/ports/iir1/vcpkg.json +++ b/external_imported/vcpkg/ports/iir1/vcpkg.json @@ -1,7 +1,6 @@ { "name": "iir1", - "version": "1.9.0", - "port-version": 1, + "version": "1.9.1", "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", diff --git a/external_imported/vcpkg/ports/ijg-libjpeg/CMakeLists.txt b/external_imported/vcpkg/ports/ijg-libjpeg/CMakeLists.txt index e1a9dcf5c..b65477d9c 100644 --- a/external_imported/vcpkg/ports/ijg-libjpeg/CMakeLists.txt +++ b/external_imported/vcpkg/ports/ijg-libjpeg/CMakeLists.txt @@ -12,9 +12,9 @@ option(BUILD_EXECUTABLES OFF) include(CheckIncludeFile) check_include_file(stddef.h HAVE_STDDEF_H) check_include_file(stdlib.h HAVE_STDLIB_H) -configure_file(jconfig.txt ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h) +configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) -list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h jconfig.h) +list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h) add_library(jpeg ${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h @@ -35,6 +35,8 @@ if(WIN32) ) endif() +target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include ) diff --git a/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake b/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake index 5c0055440..f9771764e 100644 --- a/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake +++ b/external_imported/vcpkg/ports/ijg-libjpeg/portfile.cmake @@ -10,9 +10,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_download_distfile(ARCHIVE - URLS "http://www.ijg.org/files/jpegsr9d.zip" - FILENAME "jpegsr9d.zip" - SHA512 441a783c945fd549693dbe3932d8d35e1ea00d8464870646760ed84a636facb4d7afe0ca3ab988e7281a71e41c2e96be618b8c6a898f116517e639720bba82a3 + URLS "http://www.ijg.org/files/jpegsr9e.zip" + FILENAME "jpegsr9e.zip" + SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -21,31 +21,30 @@ vcpkg_extract_source_archive_ex( # Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command. # See https://github.com/LuaDist/libjpeg -vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" "#define HAVE_STDDEF_H" "#cmakedefine HAVE_STDDEF_H" ) -vcpkg_replace_string(${SOURCE_PATH}/jconfig.txt +vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt" "#define HAVE_STDLIB_H" "#cmakedefine HAVE_STDLIB_H" ) -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 -DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option? ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # There is no LICENSE file, but README containes some legal text. -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) 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") diff --git a/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json b/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json index cf39b27f2..7c4d96429 100644 --- a/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json +++ b/external_imported/vcpkg/ports/ijg-libjpeg/vcpkg.json @@ -1,7 +1,18 @@ { "name": "ijg-libjpeg", - "version-string": "9d", + "version-string": "9e", "description": "Independent JPEG Group's JPEG software", "homepage": "http://www.ijg.org/", - "supports": "!emscripten & !wasm32" + "license": null, + "supports": "!emscripten & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ilmbase/vcpkg.json b/external_imported/vcpkg/ports/ilmbase/vcpkg.json index 9b09a3c7b..a32e6100d 100644 --- a/external_imported/vcpkg/ports/ilmbase/vcpkg.json +++ b/external_imported/vcpkg/ports/ilmbase/vcpkg.json @@ -1,9 +1,8 @@ { "name": "ilmbase", - "version-string": "2.3.0", - "port-version": 1, - "description": "empty package, linking to newer one", + "version": "3", + "description": "Obsolete, use port imath instead", "dependencies": [ - "openexr" + "imath" ] } diff --git a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake index deb2e8e42..b58d25361 100644 --- a/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake +++ b/external_imported/vcpkg/ports/imgui-sfml/portfile.cmake @@ -13,6 +13,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_CXX_STANDARD=11 ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json index a01204e05..7b9e55b0c 100644 --- a/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json +++ b/external_imported/vcpkg/ports/imgui-sfml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui-sfml", "version": "2.5", + "port-version": 1, "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "license": "MIT", diff --git a/external_imported/vcpkg/ports/imgui/CMakeLists.txt b/external_imported/vcpkg/ports/imgui/CMakeLists.txt index 41f03db1c..85544830c 100644 --- a/external_imported/vcpkg/ports/imgui/CMakeLists.txt +++ b/external_imported/vcpkg/ports/imgui/CMakeLists.txt @@ -28,6 +28,8 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp ) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + if(IMGUI_BUILD_ALLEGRO5_BINDING) find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) diff --git a/external_imported/vcpkg/ports/imgui/portfile.cmake b/external_imported/vcpkg/ports/imgui/portfile.cmake index c342a637a..3080df80a 100644 --- a/external_imported/vcpkg/ports/imgui/portfile.cmake +++ b/external_imported/vcpkg/ports/imgui/portfile.cmake @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 1ee252772ae9c0a971d06257bb5c89f628fa696a - SHA512 942cd8e39f490c15d90b6feb6f919ebeab8f6f8f9aacfcbf552daef24b0f7e637ad5f630767a52fd9993d84a80b5954c7b05f7400a9f96b6b739cf5680368119 + REF 9cd9c2eff99877a3f10a7f9c2a3a5b9c15ea36c6 + SHA512 4a9bf74f5f3971bcb954449bdef27e491a0abebc55356bcf0491c7e17dc941c90cf81d539fe4de1e23137866f55456776fcded34a4df2fb16b9020fe1b8d7851 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.87 - SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 + REF v1.88 + SHA512 bfb7381334f1493d64386321401086e4136129b3cc57bf57505ec6183008dddab1a2056b0af2610bc3286c606bafdf9b6e3ebc103131e0504bab2336662bc2c1 HEAD_REF master ) endif() @@ -21,10 +21,6 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/imgui-config.cmake.in" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -if(("metal-binding" IN_LIST FEATURES OR "osx-binding" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_OSX)) - message(FATAL_ERROR "Feature metal-binding and osx-binding are only supported on osx.") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES allegro5-binding IMGUI_BUILD_ALLEGRO5_BINDING diff --git a/external_imported/vcpkg/ports/imgui/vcpkg.json b/external_imported/vcpkg/ports/imgui/vcpkg.json index b5b624bef..200fd5b06 100644 --- a/external_imported/vcpkg/ports/imgui/vcpkg.json +++ b/external_imported/vcpkg/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", - "version": "1.87", + "version": "1.88", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -25,16 +26,20 @@ "description": "Build with docking support" }, "dx10-binding": { - "description": "Make available DirectX10 binding" + "description": "Make available DirectX10 binding", + "supports": "windows & !uwp" }, "dx11-binding": { - "description": "Make available DirectX11 binding" + "description": "Make available DirectX11 binding", + "supports": "windows & !uwp" }, "dx12-binding": { - "description": "Make available DirectX12 binding" + "description": "Make available DirectX12 binding", + "supports": "!x86 & windows & !uwp" }, "dx9-binding": { - "description": "Make available DirectX9 binding" + "description": "Make available DirectX9 binding", + "supports": "windows & !uwp" }, "freetype": { "description": "Build font atlases using FreeType instead of stb_truetype", @@ -58,7 +63,8 @@ "description": "Install the libigl-imgui headers" }, "metal-binding": { - "description": "Make available Metal binding" + "description": "Make available Metal binding", + "supports": "osx" }, "opengl2-binding": { "description": "Make available OpenGL (legacy) binding" @@ -67,7 +73,8 @@ "description": "Make available OpenGL3/ES/ES2 (modern) binding" }, "osx-binding": { - "description": "Make available OSX binding" + "description": "Make available OSX binding", + "supports": "osx" }, "sdl2-binding": { "description": "Make available SDL2 binding", diff --git a/external_imported/vcpkg/ports/implot/portfile.cmake b/external_imported/vcpkg/ports/implot/portfile.cmake index 37d13429d..f505a8024 100644 --- a/external_imported/vcpkg/ports/implot/portfile.cmake +++ b/external_imported/vcpkg/ports/implot/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot - REF v0.13 - SHA512 ed653a14f1174b1689c7b8e5761455644e41e75a3cdf5a76d96adf8e286893418660809c1c158fa405c1c48a82752ae9c3b8e1eb14bd0015081604cdb44d95f4 + REF v0.14 + SHA512 d33c83762ada55d4e188e975faf0c12d42cb3eb6b63904e6bce5b18d4184a2cdfc14e0b92286717ab86a1361dad7161e24402724f4eda2c0bce5658787d2dbe3 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/implot/vcpkg.json b/external_imported/vcpkg/ports/implot/vcpkg.json index 73df80238..4444ceef1 100644 --- a/external_imported/vcpkg/ports/implot/vcpkg.json +++ b/external_imported/vcpkg/ports/implot/vcpkg.json @@ -1,6 +1,6 @@ { "name": "implot", - "version": "0.13", + "version": "0.14", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "license": "MIT", diff --git a/external_imported/vcpkg/ports/influxdb-cxx/include-stringview.patch b/external_imported/vcpkg/ports/influxdb-cxx/include-stringview.patch deleted file mode 100644 index a44563506..000000000 --- a/external_imported/vcpkg/ports/influxdb-cxx/include-stringview.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/Point.cxx b/src/Point.cxx -index 8f7fc10..95b119e 100644 ---- a/src/Point.cxx -+++ b/src/Point.cxx -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - namespace influxdb - { diff --git a/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake b/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake index 5498788ec..41c61daf9 100644 --- a/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake +++ b/external_imported/vcpkg/ports/influxdb-cxx/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx - REF v0.6.7 - SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c + REF 141ef6c3f9ee933262a35abe3ac5900da821078a #Commit on 2022-08-20 + SHA512 d19a7dfd410375a47e5fcb425045732878b09ec6b5eb01740696d57064c739cebcf4a4141c8f592d0c985f10cd8b05c538cef32193cb7226d74bc3462754b8fa HEAD_REF master - PATCHES include-stringview.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json b/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json index 1666fc558..cb5377dbe 100644 --- a/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json +++ b/external_imported/vcpkg/ports/influxdb-cxx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "influxdb-cxx", - "version": "0.6.7", - "port-version": 1, + "version-date": "2022-09-02", "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", + "license": "MIT", "dependencies": [ "curl", { diff --git a/external_imported/vcpkg/ports/inih/CMakeLists.txt b/external_imported/vcpkg/ports/inih/CMakeLists.txt index 6601e543a..184c0c4f8 100644 --- a/external_imported/vcpkg/ports/inih/CMakeLists.txt +++ b/external_imported/vcpkg/ports/inih/CMakeLists.txt @@ -1,15 +1,56 @@ -project(inih) +cmake_minimum_required(VERSION 3.19) +project( + inih + VERSION 56 + LANGUAGES C CXX) -set(SOURCES ini.c cpp/INIReader.cpp) -set(HEADERS ini.h cpp/INIReader.h) +set(Header_Files "ini.h") +set(Source_Files "ini.c") -add_library(inih ${SOURCES}) +# TODO: Put this as vcpkg-feature before `project(` so can do `LANGUAGES C` if false +option(with_INIReader "build the C++ library" OFF) +if (with_INIReader) + list(APPEND Header_Files "cpp/INIReader.h") + list(APPEND Source_Files "cpp/INIReader.cpp") +endif (with_INIReader) + +add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}") + +include(GNUInstallDirs) +target_include_directories( + "${PROJECT_NAME}" + PUBLIC + "$" + "$" +) +target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90) +set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${Header_Files}") install( - TARGETS inih - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + TARGETS "${PROJECT_NAME}" + EXPORT "unofficial-${PROJECT_NAME}Config" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION "${PROJECT_VERSION}" + COMPATIBILITY SameMajorVersion ) +install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}") + +install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT "unofficial-${PROJECT_NAME}Config" + FILE "unofficial-${PROJECT_NAME}Config.cmake" + NAMESPACE "unofficial::${PROJECT_NAME}::" + DESTINATION "share/unofficial-${PROJECT_NAME}") -install(FILES ${HEADERS} DESTINATION include) +export(PACKAGE "${PROJECT_NAME}") diff --git a/external_imported/vcpkg/ports/inih/portfile.cmake b/external_imported/vcpkg/ports/inih/portfile.cmake index 471b35f86..de15f7629 100644 --- a/external_imported/vcpkg/ports/inih/portfile.cmake +++ b/external_imported/vcpkg/ports/inih/portfile.cmake @@ -3,20 +3,34 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO benhoyt/inih - REF d7f465792c0c7686b50ed45c9a435394ae418d3e # r51 - SHA512 f3b621225933d74e9b130957aab1d55a82f06fd836aace439f9192a393d82a446e9f2152bb617a73a1dc681a821fc31d217c41f38c8ef8eeef7ad64c3e274b5d + REF 5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b # r56 + SHA512 477a66643f6636a5826a1206c6588a12827e24a4a2609e11f0695888998e2bfcba8bdb2240c561404ee675bf4c72e85d7d008a1fbddb142c0d263b413de8d358 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_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpp with_INIReader ) -vcpkg_install_cmake() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-inih) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/inih RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +inih provides CMake targets: + find_package(unofficial-inih CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::inih::inih) +]=]) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/inih/vcpkg.json b/external_imported/vcpkg/ports/inih/vcpkg.json index 5b137dcba..5b76e98e6 100644 --- a/external_imported/vcpkg/ports/inih/vcpkg.json +++ b/external_imported/vcpkg/ports/inih/vcpkg.json @@ -1,6 +1,22 @@ { "name": "inih", - "version-string": "51", - "port-version": 1, - "description": "Simple .INI file parser" + "version": "56", + "description": "Simple .INI file parser", + "homepage": "https://github.com/benhoyt/inih", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cpp": { + "description": "Build the C++ library" + } + } } diff --git a/external_imported/vcpkg/ports/iniparser/vcpkg.json b/external_imported/vcpkg/ports/iniparser/vcpkg.json index 88ad1b9f6..e4b515cbf 100644 --- a/external_imported/vcpkg/ports/iniparser/vcpkg.json +++ b/external_imported/vcpkg/ports/iniparser/vcpkg.json @@ -1,7 +1,8 @@ { "name": "iniparser", - "version-string": "2020-04-06", - "port-version": 2, + "version-date": "2020-04-06", + "port-version": 3, "description": "C library for parsing INI-style files", - "homepage": "ndevilla.free.fr/iniparser" + "homepage": "https://github.com/ndevilla/iniparser", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json index 1be8cccde..87415c924 100644 --- a/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json +++ b/external_imported/vcpkg/ports/intelrdfpmathlib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "intelrdfpmathlib", "version-string": "20U2", - "port-version": 3, + "port-version": 4, "description": "Intel(R) Decimal Floating-Point Math Library", + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/isal/CMakeLists.txt b/external_imported/vcpkg/ports/isal/CMakeLists.txt deleted file mode 100644 index b479e1522..000000000 --- a/external_imported/vcpkg/ports/isal/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(isal C) - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -FIND_PROGRAM(NASM nasm) -IF (NOT NASM) - MESSAGE(FATAL_ERROR "NASM not found") -ENDIF () - -IF (EXEC_ENV STREQUAL "Windows") - FIND_PROGRAM(MAKE nmake) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "nmake not found") - ENDIF () -ELSEIF(EXEC_ENV STREQUAL "Linux") - FIND_PROGRAM(MAKE make) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "MAKE not found") - ENDIF () -ENDIF() - -SET(MAKE_FLAGS "-f") - -IF (EXEC_ENV STREQUAL Windows) - STRING(APPEND MAKE_FLAGS " Makefile.nmake /E CC=cl AS=nasm") -ELSEIF (EXEC_ENV STREQUAL Linux) - STRING(APPEND MAKE_FLAGS "Makefile.unx") -ENDIF () - -ADD_CUSTOM_TARGET(isal ALL - COMMAND ${MAKE} ${MAKE_FLAGS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -SET(LIB_PATH ${CMAKE_SOURCE_DIR}/bin/) -IF (LIBRARY_LINKAGE STREQUAL "dynamic") - STRING(APPEND LIB_PATH isal.so) -ELSEIF (LIBRARY_LINKAGE STREQUAL "static") - STRING(APPEND LIB_PATH isa-l.a) -ELSE () - MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}") -ENDIF () -INSTALL(FILES ${LIB_PATH} - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/isal/isalConfig.cmake b/external_imported/vcpkg/ports/isal/isalConfig.cmake index 3348ec434..78b47f223 100644 --- a/external_imported/vcpkg/ports/isal/isalConfig.cmake +++ b/external_imported/vcpkg/ports/isal/isalConfig.cmake @@ -1,17 +1,15 @@ +message(WARNING "'find_package(isal CONFIG)' is deprecated. Please use 'find_package(unofficial-isal CONFIG)' instead.") -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) - -SET_LIBRARY_TARGET("ISAL" "isal" "${ROOT}/debug/lib/isa-l.a" "${ROOT}/lib/isa-l.a" "${ROOT}/include/isal") +include(CMakeFindDependencyMacro) +find_dependency(unofficial-isal) +if(NOT TARGET unofficial::isal::isal) + set(isal_FOUND FALSE) +elseif(TARGET ISAL::isa-l OR TARGET ISAL::isal) + # done +elseif ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + add_library(ISAL::isa-l INTERFACE IMPORTED) + set_target_properties(ISAL::isa-l PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::isal::isal) +else() + add_library(ISAL::isal INTERFACE IMPORTED) + set_target_properties(ISAL::isal PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::isal::isal) +endif() diff --git a/external_imported/vcpkg/ports/isal/osx-asm-sysroot.patch b/external_imported/vcpkg/ports/isal/osx-asm-sysroot.patch new file mode 100644 index 000000000..ece55e80c --- /dev/null +++ b/external_imported/vcpkg/ports/isal/osx-asm-sysroot.patch @@ -0,0 +1,32 @@ +diff --git a/tools/nasm-filter.sh b/tools/nasm-filter.sh +index 5ec9ba3..fcc4971 100755 +--- a/tools/nasm-filter.sh ++++ b/tools/nasm-filter.sh +@@ -15,6 +15,11 @@ while [ -n "$*" ]; do + shift + shift + ;; ++ -isysroot ) ++ # Unsupported options with arg ++ shift ++ shift ++ ;; + --prefix* ) + # Supported options without arg + options="$options $1" +diff --git a/tools/yasm-filter.sh b/tools/yasm-filter.sh +index c33952a..b99bfc3 100755 +--- a/tools/yasm-filter.sh ++++ b/tools/yasm-filter.sh +@@ -10,6 +10,11 @@ while [ -n "$*" ]; do + shift + shift + ;; ++ -isysroot ) ++ # Unsupported options with arg ++ shift ++ shift ++ ;; + -I* | -i* | --prefix* ) + # Supported options without arg + options="$options $1" diff --git a/external_imported/vcpkg/ports/isal/portfile.cmake b/external_imported/vcpkg/ports/isal/portfile.cmake index 0703b7246..9a9a1ef34 100644 --- a/external_imported/vcpkg/ports/isal/portfile.cmake +++ b/external_imported/vcpkg/ports/isal/portfile.cmake @@ -1,46 +1,91 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME) - SET(EXEC_ENV "Windows") -ELSE () - SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") -ENDIF () - -IF (NOT EXEC_ENV STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports Linux platforms") - MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") -ENDIF () - -IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports x64 architecture") -ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO 01org/isa-l - REF v2.25.0 - SHA512 aa556c8ba26b4637493b3de50a23636668bcfd71249029c52fe6983d0bcf120d1b91f39aaa259cb58e59448d401366f3bfaaee24609db7e6a1cd3fdf1a953efe - HEAD_REF master +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/spdk-isal/copyright") + message(FATAL_ERROR "'${PORT}' conflicts with 'spdk-isal'. Please remove spdk-isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/isa-l + REF v2.30.0 + SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2 + HEAD_REF master + PATCHES + osx-asm-sysroot.patch ) -VCPKG_FIND_ACQUIRE_PROGRAM(NASM) -GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) -SET(ENV{PATH} "$ENV{PATH};${NASM_PATH}") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${NASM_PATH}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(NMAKE_TARGET dll) + else() + set(NMAKE_TARGET static) + endif() -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_NAME Makefile.nmake + TARGET ${NMAKE_TARGET} OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} - -DEXEC_ENV:STRING=${EXEC_ENV} - -DLIBRARY_LINKAGE:STRING=${VCPKG_LIBRARY_LINKAGE} -) + CFLAGS_REL= + ) + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(NMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + endif() + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(NMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + else() + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + endif() -VCPKG_INSTALL_CMAKE() + file(GLOB ISAL_HDRS "${SOURCE_PATH}/include/*") + file(INSTALL ${ISAL_HDRS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/isa-l.def" DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") + +else() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_find_acquire_program(YASM) + get_filename_component(YASM_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${YASM_PATH}") + endif() + + vcpkg_list(SET options) + if(VCPKG_TARGET_IS_MINGW) + # There is only a .def file used by nmake, no declspec(...) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + # isal forces yasm for mingw, but stumbles over feature level detection + vcpkg_list(APPEND options AS=) + endif() + + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + # No rpl_malloc provided, and probably not depending on ‘malloc (0)’ returning a valid pointer + ac_cv_func_malloc_0_nonnull=yes + ) + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/isalConfig.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) +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-isal-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-isal/unofficial-isal-config.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/isalConfig.cmake" @ONLY) # legacy +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) diff --git a/external_imported/vcpkg/ports/isal/unofficial-isal-config.cmake b/external_imported/vcpkg/ports/isal/unofficial-isal-config.cmake new file mode 100644 index 000000000..6d38fe821 --- /dev/null +++ b/external_imported/vcpkg/ports/isal/unofficial-isal-config.cmake @@ -0,0 +1,18 @@ +if(NOT TARGET unofficial::isal::isal) + add_library(unofficial::isal::isal UNKNOWN IMPORTED) + get_filename_component(z_vcpkg_isal_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_isal_prefix "${z_vcpkg_isal_prefix}" PATH) + get_filename_component(z_vcpkg_isal_prefix "${z_vcpkg_isal_prefix}" PATH) + find_library(Z_VCPKG_ISAL_LIBRARY_RELEASE NAMES isal isa-l_static isa-l PATHS "${z_vcpkg_isal_prefix}/lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::isal::isal PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_isal_prefix}/include" + IMPORTED_CONFIGURATIONS RELEASE + IMPORTED_LOCATION_RELEASE "${Z_VCPKG_ISAL_LIBRARY_RELEASE}" + ) + if("@VCPKG_BUILD_TYPE@" STREQUAL "") + find_library(Z_VCPKG_ISAL_LIBRARY_DEBUG NAMES isal isa-l_static isa-l PATHS "${z_vcpkg_isal_prefix}/debug/lib" NO_DEFAULT_PATH REQUIRED) + set_property(TARGET unofficial::isal::isal APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(unofficial::isal::isal PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_ISAL_LIBRARY_DEBUG}") + endif() + unset(z_vcpkg_isal_prefix) +endif() diff --git a/external_imported/vcpkg/ports/isal/usage b/external_imported/vcpkg/ports/isal/usage index 23870b20f..1bcbccccd 100644 --- a/external_imported/vcpkg/ports/isal/usage +++ b/external_imported/vcpkg/ports/isal/usage @@ -1,5 +1,4 @@ -The package isal is compatible with built-in CMake targets: +The package isal provides CMake targets: - FIND_PACKAGE(isal REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isa-l) for static linkage or - TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isal) for dynamic linkage + find_package(unofficial-isal CONFIG REQUIRED) + target_link_libraries(main unofficial::isal::isal) diff --git a/external_imported/vcpkg/ports/isal/vcpkg.json b/external_imported/vcpkg/ports/isal/vcpkg.json index 7a18c0095..8052408e4 100644 --- a/external_imported/vcpkg/ports/isal/vcpkg.json +++ b/external_imported/vcpkg/ports/isal/vcpkg.json @@ -1,6 +1,8 @@ { "name": "isal", - "version-string": "2.25.0", - "port-version": 1, - "description": "Intel(R) Intelligent Storage Acceleration Library" + "version": "2.30.0", + "description": "Intel(R) Intelligent Storage Acceleration Library", + "homepage": "https://github.com/intel/isa-l", + "license": "BSD-3-Clause", + "supports": "!uwp & (x64 | (arm64 & linux))" } diff --git a/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake b/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake index 3287accd2..57a2b2c57 100644 --- a/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake +++ b/external_imported/vcpkg/ports/ixwebsocket/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF f7eb3688ddcb7d555df91e97ce8804421378e3b4 #v11.3.3 - SHA512 78eddce7d3f817632b2f48b7f7c8e767fe1995d6a91d9156b0683fafd89c00e898b09fdcaa40559df333fc63c9160fe03b2770e5e9afcfcf489e89871e12fb1c + REF v11.4.3 + SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,16 +19,18 @@ if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -DUSE_TLS=1 + ${FEATURE_OPTIONS} + -DUSE_TLS=1 + MAYBE_UNUSED_VARIABLES + USE_SECURE_TRANSPORT ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ixwebsocket) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -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/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json b/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json index d09b3d9a6..4d7808ac6 100644 --- a/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json +++ b/external_imported/vcpkg/ports/ixwebsocket/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ixwebsocket", - "version-semver": "11.3.3", + "version-semver": "11.4.3", "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/jack2/portfile.cmake b/external_imported/vcpkg/ports/jack2/portfile.cmake index 301bb0ad8..3ab7e180e 100644 --- a/external_imported/vcpkg/ports/jack2/portfile.cmake +++ b/external_imported/vcpkg/ports/jack2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jackaudio/jack2 - REF v1.9.19 - SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d + REF v1.9.21 + SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 HEAD_REF master ) @@ -22,4 +22,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/jack2/vcpkg.json b/external_imported/vcpkg/ports/jack2/vcpkg.json index 3ae06b492..356579f3a 100644 --- a/external_imported/vcpkg/ports/jack2/vcpkg.json +++ b/external_imported/vcpkg/ports/jack2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "jack2", - "version-semver": "1.9.19", - "port-version": 1, + "version-semver": "1.9.21", "description": "Cross-platform API that enables device sharing and inter-application audio routing", "homepage": "https://jackaudio.org/", + "license": "GPL-2.0", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/jansson/fix-linker-flags.patch b/external_imported/vcpkg/ports/jansson/fix-linker-flags.patch new file mode 100644 index 000000000..57d889005 --- /dev/null +++ b/external_imported/vcpkg/ports/jansson/fix-linker-flags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad3..ed33e3c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) + ) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + if (VSCRIPT_WORKS) +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + endif() + endif() + diff --git a/external_imported/vcpkg/ports/jansson/portfile.cmake b/external_imported/vcpkg/ports/jansson/portfile.cmake index 7d9679ffa..e6c17c148 100644 --- a/external_imported/vcpkg/ports/jansson/portfile.cmake +++ b/external_imported/vcpkg/ports/jansson/portfile.cmake @@ -1,50 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO akheron/jansson - REF e9ebfa7e77a6bee77df44e096b100e7131044059 # v2.13.1 - SHA512 88a59c1cf5150699def17c86192ca9bacdfe6669319f770c3fbf14fa8edc48b4bb015a4a634a09db40fba9054320ac7c133c4d156f813af540a636f7825f0610 + REF 684e18c927e89615c2d501737e90018f4930d6c5 # v2.14 + SHA512 e2cac3567bc860d10d9aa386ce370876cb21ff083a970abeb48112b6586b91cd101694a98cb05a06795fb04498e6bc2df3615fedb86635f5a998b68e5670e5b3 HEAD_REF master + PATCHES + fix-linker-flags.patch ) -if(VCPKG_CRT_LINKAGE STREQUAL static) - set(JANSSON_STATIC_CRT ON) -else() - set(JANSSON_STATIC_CRT OFF) -endif() - - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(JANSSON_BUILD_SHARED_LIBS ON) -else() - set(JANSSON_BUILD_SHARED_LIBS OFF) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" JANSSON_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JANSSON_BUILD_SHARED_LIBS) # Jansson tries to random-seed its hash table with system-provided entropy. # This is not ported to UWP yet. -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_UWP) set(USE_WINDOWS_CRYPTOAPI OFF) else() set(USE_WINDOWS_CRYPTOAPI ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJANSSON_STATIC_CRT=${JANSSON_STATIC_CRT} -DJANSSON_EXAMPLES=OFF -DJANSSON_WITHOUT_TESTS=ON + -DJANSSON_BUILD_DOCS=OFF -DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS} -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI} -DJANSSON_INSTALL_CMAKE_DIR:STRING=share/jansson ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +vcpkg_cmake_install() vcpkg_copy_pdbs() - +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/jansson/vcpkg.json b/external_imported/vcpkg/ports/jansson/vcpkg.json index defd7c351..cd99df027 100644 --- a/external_imported/vcpkg/ports/jansson/vcpkg.json +++ b/external_imported/vcpkg/ports/jansson/vcpkg.json @@ -1,7 +1,18 @@ { "name": "jansson", - "version-string": "2.13.1", - "port-version": 2, + "version": "2.14", + "port-version": 1, "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", - "homepage": "https://github.com/akheron/jansson" + "homepage": "https://github.com/akheron/jansson", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/jasper/vcpkg.json b/external_imported/vcpkg/ports/jasper/vcpkg.json index 7d225aadf..92429c150 100644 --- a/external_imported/vcpkg/ports/jasper/vcpkg.json +++ b/external_imported/vcpkg/ports/jasper/vcpkg.json @@ -1,9 +1,10 @@ { "name": "jasper", "version": "2.0.33", - "port-version": 3, + "port-version": 6, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/mdadams/jasper", + "license": null, "dependencies": [ "libjpeg-turbo", { @@ -16,17 +17,33 @@ } ], "default-features": [ - "opengl" + "default-features" ], "features": { + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "jasper", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!(windows & arm) & !uwp & !ios" + } + ] + }, "opengl": { "description": "Enable the use of the OpenGL/GLUT Library", "dependencies": [ { "name": "freeglut", - "platform": "!osx" + "platform": "!osx & !(windows & arm) & !uwp" }, - "opengl" + { + "name": "opengl", + "platform": "!(windows & arm) & !uwp" + } ] } } diff --git a/external_imported/vcpkg/ports/jemalloc/fix-cmakelists.patch b/external_imported/vcpkg/ports/jemalloc/fix-cmakelists.patch deleted file mode 100644 index 3ba70544c..000000000 --- a/external_imported/vcpkg/ports/jemalloc/fix-cmakelists.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06e83ef..229e17a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,7 @@ option(enable-lazy-lock "Enable lazy locking (only lock when multi-threaded" OFF - option(force_lazy_lock "Forcing lazy-lock to avoid allocator/threading bootstrap issues" OFF) - # install_prefix - installation directory prefix - # with-xslroot= XSL stylesheet root path -+option(build-tests "Build tests" OFF) - - set (PACKAGE_NAME "jemalloc") - project (${PACKAGE_NAME} C) -@@ -711,12 +712,8 @@ endif() - - # The original library, delivery product - set(LIBJEMALLOCLIB jemalloc${install_suffix}) --add_library(${LIBJEMALLOCLIB} STATIC ${C_SRCS}) -- --# Now add shared library. Needed for integration tests --# and a benchmark --set(LIBJEMALLOCSO jemallocso${install_suffix}) --add_library(${LIBJEMALLOCSO} SHARED ${C_SRCS}) -+set(LIBJEMALLOCSO ${LIBJEMALLOCLIB}) -+add_library(${LIBJEMALLOCLIB} ${C_SRCS}) - - if(WIN32) - # May want to replace /d2Zi+ to /Zo -@@ -745,8 +745,6 @@ if(WIN32) - # either impport or export which is both wrong for a static library - set_target_properties(${LIBJEMALLOCLIB} - PROPERTIES -- COMPILE_DEFINITIONS -- "JEMALLOC_EXPORT=" - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG - ${PROJECT_BINARY_DIR}/Debug - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE -@@ -754,6 +752,9 @@ if(WIN32) - COMPILE_PDB_NAME - ${LIBJEMALLOCLIB} - ) -+ if(NOT BUILD_SHARED_LIBS) -+ target_compile_definitions(${LIBJEMALLOCLIB} "JEMALLOC_EXPORT=") -+ endif() - - endif() - -@@ -825,6 +822,14 @@ if(C_UTIL_INTEGRATION_DEFS) - "${C_UTIL_INTEGRATION_DEFS}") - endif() - -+install(FILES include/jemalloc/jemalloc${install_suffix}.h -+ DESTINATION include/jemalloc) -+ -+install(TARGETS ${LIBJEMALLOCSO} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+if (build-tests) - ################################################################## - # Common source for Unit, Integration and stress test libraries - set(C_TESTLIB_SRCS -@@ -1028,4 +1033,4 @@ foreach(sourcefile ${TESTS_INTEGRATION}) - add_test(NAME ${exename} COMMAND ${exename}) - add_dependencies(check ${exename}) - endforeach(sourcefile ${TESTS_UNIT}) -- -+endif() diff --git a/external_imported/vcpkg/ports/jemalloc/fix-configure-ac.patch b/external_imported/vcpkg/ports/jemalloc/fix-configure-ac.patch new file mode 100644 index 000000000..7799dfb9e --- /dev/null +++ b/external_imported/vcpkg/ports/jemalloc/fix-configure-ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index f6d25f334..3115504e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1592,7 +1592,7 @@ fi + [enable_uaf_detection="0"] + ) + if test "x$enable_uaf_detection" = "x1" ; then +- AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ]) ++ AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ], ["enable UAF"]) + fi + AC_SUBST([enable_uaf_detection]) + diff --git a/external_imported/vcpkg/ports/jemalloc/fix-static-build.patch b/external_imported/vcpkg/ports/jemalloc/fix-static-build.patch deleted file mode 100644 index 3ede809a8..000000000 --- a/external_imported/vcpkg/ports/jemalloc/fix-static-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b8959a..55e6a5f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -826,10 +826,16 @@ endif() - install(FILES include/jemalloc/jemalloc${install_suffix}.h - DESTINATION include/jemalloc) - --install(TARGETS ${LIBJEMALLOCSO} -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+if (without-export) -+ install(TARGETS ${C_JETLIB} -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+else() -+ install(TARGETS ${LIBJEMALLOCSO} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+endif() - if (build-tests) - ################################################################## - # Common source for Unit, Integration and stress test libraries diff --git a/external_imported/vcpkg/ports/jemalloc/fix-utilities.patch b/external_imported/vcpkg/ports/jemalloc/fix-utilities.patch deleted file mode 100644 index 32c39e0b3..000000000 --- a/external_imported/vcpkg/ports/jemalloc/fix-utilities.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Utilities.cmake b/Utilities.cmake -index 562e948..d2d3530 100644 ---- a/Utilities.cmake -+++ b/Utilities.cmake -@@ -633,9 +633,11 @@ file(TO_NATIVE_PATH "${file_path}" ntv_file_path) - # This converts #undefs into #cmakedefines so configure_file can handle it - set(PS_CMD - "Get-Content \"${ntv_file_path}\" | --ForEach { -+ForEach { - if($_ -match '^#undef[ \t]*[^ \t]*') -- { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}}" -+ { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_} -+} | -+Set-Content \"${ntv_file_path}.cmake\"" - ) - - if(EXISTS ${file_path}) -@@ -646,9 +648,8 @@ if(EXISTS ${file_path}) - # Convert autoconf .in into a cmake .in - execute_process(COMMAND powershell -Command "${PS_CMD}" - RESULT_VARIABLE error_level -- ERROR_VARIABLE error_output -- OUTPUT_FILE ${file_path}.cmake) -- -+ ERROR_VARIABLE error_output) -+ - if(NOT ${error_level} EQUAL 0) - message(FATAL_ERROR "Powershell completed with ${error_level} : ${error_output}") - endif() diff --git a/external_imported/vcpkg/ports/jemalloc/portfile.cmake b/external_imported/vcpkg/ports/jemalloc/portfile.cmake index 013634577..36f0834e1 100644 --- a/external_imported/vcpkg/ports/jemalloc/portfile.cmake +++ b/external_imported/vcpkg/ports/jemalloc/portfile.cmake @@ -1,35 +1,56 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO jemalloc/jemalloc-cmake - REF jemalloc-cmake.4.3.1 - SHA512 e94b62ec3a53acc0ab5acb247d7646bc172108e80f592bb41c2dd50d181cbbeb33d623adf28415ffc0a0e2de3818af2dfe4c04af75ac891ef5042bc5bb186886 + REPO jemalloc/jemalloc + REF 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c + SHA512 527bfbf5db9a5c2b7b04df4785b6ae9d445cff8cb17298bf3e550c88890d2bd7953642d8efaa417580610508279b527d3a3b9e227d17394fd2013c88cb7ae75a HEAD_REF master PATCHES - fix-cmakelists.patch - fix-utilities.patch - fix-static-build.patch + fix-configure-ac.patch + preprocessor.patch ) - -if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(BUILD_STATIC_LIBRARY OFF) -else() - set(BUILD_STATIC_LIBRARY ON) +if(VCPKG_TARGET_IS_WINDOWS) + set(opts "ac_cv_search_log=none required" "--without-private-namespace") endif() -vcpkg_configure_cmake( - DISABLE_PARALLEL_CONFIGURE - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -Dwithout-export=${BUILD_STATIC_LIBRARY} + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + NO_WRAPPERS + OPTIONS ${opts} ) -vcpkg_install_cmake() +vcpkg_install_make() + +if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/jemalloc/jemalloc.h" "" "\"msvc_compat/strings.h\"") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/bin/jemalloc.dll") + endif() + if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/jemalloc.dll") + endif() + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jemalloc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jemalloc/COPYING ${CURRENT_PACKAGES_DIR}/share/jemalloc/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/jemalloc/preprocessor.patch b/external_imported/vcpkg/ports/jemalloc/preprocessor.patch new file mode 100644 index 000000000..6e6e2d140 --- /dev/null +++ b/external_imported/vcpkg/ports/jemalloc/preprocessor.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 3115504e2..ffb504b08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -749,6 +749,7 @@ case "${host}" in + so="dll" + if test "x$je_cv_msvc" = "xyes" ; then + importlib="lib" ++ JE_APPEND_VS(CPPFLAGS, -DJEMALLOC_NO_PRIVATE_NAMESPACE) + DSO_LDFLAGS="-LD" + EXTRA_LDFLAGS="-link -DEBUG" + CTARGET='-Fo$@' diff --git a/external_imported/vcpkg/ports/jemalloc/vcpkg.json b/external_imported/vcpkg/ports/jemalloc/vcpkg.json index c23bdcaa8..007e05b93 100644 --- a/external_imported/vcpkg/ports/jemalloc/vcpkg.json +++ b/external_imported/vcpkg/ports/jemalloc/vcpkg.json @@ -1,7 +1,8 @@ { "name": "jemalloc", - "version-string": "4.3.1", - "port-version": 5, + "version": "5.3.0", + "port-version": 1, "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", - "homepage": "https://github.com/jemalloc/jemalloc-cmake" + "homepage": "https://jemalloc.net/", + "license": "BSD-2-Clause" } diff --git a/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch b/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch new file mode 100644 index 000000000..85641a7d5 --- /dev/null +++ b/external_imported/vcpkg/ports/json-c/fix-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9741b45f9..11b397024 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -281,7 +281,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h") + configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in ${PROJECT_BINARY_DIR}/json_config.h) + message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h") + +-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") ++if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") + if ("${DISABLE_WERROR}" STREQUAL "OFF") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") +@@ -297,7 +297,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL + endif() + + add_definitions(-D_GNU_SOURCE) +-elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") ++elseif (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DEBUG") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") diff --git a/external_imported/vcpkg/ports/json-c/portfile.cmake b/external_imported/vcpkg/ports/json-c/portfile.cmake index d0893ebee..582a1783c 100644 --- a/external_imported/vcpkg/ports/json-c/portfile.cmake +++ b/external_imported/vcpkg/ports/json-c/portfile.cmake @@ -1,24 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO json-c/json-c - REF eae040a84a479ccad1d1c48314345c51ecf1a4a4 - SHA512 18d8a31b341830b04676cad13fbc0608fb75a323522161ac8fd0bb5058db82c1c261d504696a1e12f4b03eb0967632885580ff81d808adf2f1dff7e32d131ba0 + REF d28ac67dde77566f53a97f22b4ea7cb36afe6582 + SHA512 30063c8e32eb82e170647363055119f2f7eab19e1c3152673b966f41ed07e0349c3d6141b215b9912f9e84c2e06677b3d7ac949f720c7ebc2c95d692dc3881fe HEAD_REF master PATCHES pkgconfig.patch + fix-clang-cl.patch ) -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() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/json-c/vcpkg.json b/external_imported/vcpkg/ports/json-c/vcpkg.json index ff61b336e..8d6086e87 100644 --- a/external_imported/vcpkg/ports/json-c/vcpkg.json +++ b/external_imported/vcpkg/ports/json-c/vcpkg.json @@ -1,7 +1,18 @@ { "name": "json-c", - "version-string": "2019-09-10", + "version-date": "2022-06-26", "port-version": 2, "description": "A JSON implementation in C", - "homepage": "https://github.com/json-c/json-c" + "homepage": "https://github.com/json-c/json-c", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/jsoncons/portfile.cmake b/external_imported/vcpkg/ports/jsoncons/portfile.cmake index e31a55bef..7e323e4f8 100644 --- a/external_imported/vcpkg/ports/jsoncons/portfile.cmake +++ b/external_imported/vcpkg/ports/jsoncons/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF 1120e26743ad89621497ebd37acd61cf81152828 # v0.168.3 - SHA512 12842c0eda9709b8b8010540a482c6dd08d5b979d8f9469a663fb68b402db9f786cfa00856f8ef9396273a0fa488df581f4da008ef3f2ad3ae989bf317a77cd1 + REF dff2d7d64ca03de27e79347d6473483f95c066d3 # v0.168.7 + SHA512 e388dbc5f9ee0f8fc36bda46f9a68210c2467a8e3f91ae6b57b0e0bc78b732287cb3e36ffa5ee5147f434deeabf3ea4456897a89b868befeb757df88297ec002 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJSONCONS_BUILD_TESTS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/jsoncons/vcpkg.json b/external_imported/vcpkg/ports/jsoncons/vcpkg.json index f13f250b0..8fd4ab51d 100644 --- a/external_imported/vcpkg/ports/jsoncons/vcpkg.json +++ b/external_imported/vcpkg/ports/jsoncons/vcpkg.json @@ -1,7 +1,17 @@ { "name": "jsoncons", - "version-string": "0.168.3", - "port-version": 1, + "version": "0.168.7", "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" + "homepage": "https://github.com/danielaparker/jsoncons", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch b/external_imported/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch index a2e1105b7..029fd007a 100644 --- a/external_imported/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch +++ b/external_imported/vcpkg/ports/jsonnet/0003-use-upstream-nlohmann-json.patch @@ -1,5 +1,5 @@ diff --git a/core/vm.cpp b/core/vm.cpp -index 0cf06fa..d65a6d7 100644 +index 4617363..e328df5 100644 --- a/core/vm.cpp +++ b/core/vm.cpp @@ -23,7 +23,7 @@ limitations under the License. @@ -10,4 +10,4 @@ index 0cf06fa..d65a6d7 100644 +#include "nlohmann/json.hpp" #include "md5.h" #include "parser.h" - #include "state.h" + #include "ryml_std.hpp" // include this before any other ryml header diff --git a/external_imported/vcpkg/ports/jsonnet/0004-incorporate-md5.patch b/external_imported/vcpkg/ports/jsonnet/0004-incorporate-md5.patch index 830fb8d98..c56f1489c 100644 --- a/external_imported/vcpkg/ports/jsonnet/0004-incorporate-md5.patch +++ b/external_imported/vcpkg/ports/jsonnet/0004-incorporate-md5.patch @@ -1,4 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index a152fa9..e8a0efa 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS @@ -22,20 +23,20 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt if (BUILD_SHARED_BINARIES) add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) -add_dependencies(libjsonnet md5 stdlib) --target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) +-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) +add_dependencies(libjsonnet stdlib) -+target_link_libraries(libjsonnet nlohmann_json::nlohmann_json) ++target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml) file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") -@@ -54,8 +56,8 @@ endif() +@@ -56,8 +58,8 @@ endif() if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet_static md5 stdlib) -- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json) +- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json ryml) + add_dependencies(libjsonnet_static stdlib) -+ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json) ++ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml) set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") target_include_directories(libjsonnet_static INTERFACE diff --git a/external_imported/vcpkg/ports/jsonnet/0005-use-upstream-rapidyaml.patch b/external_imported/vcpkg/ports/jsonnet/0005-use-upstream-rapidyaml.patch new file mode 100644 index 000000000..732a3f254 --- /dev/null +++ b/external_imported/vcpkg/ports/jsonnet/0005-use-upstream-rapidyaml.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23a8114..f430146 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ option(BUILD_STATIC_LIBS "Build a static libjsonnet." ON) + option(BUILD_SHARED_BINARIES "Link binaries to the shared libjsonnet instead of the static one." OFF) + option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF) + option(USE_SYSTEM_JSON "Use the system-provided json library" OFF) ++option(USE_SYSTEM_RYML "Use the system-provided rapidyaml library" OFF) + set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING + "Output artifacts directory.") + +@@ -104,6 +105,11 @@ if(USE_SYSTEM_JSON) + else() + add_subdirectory(third_party/json) + endif() ++if(USE_SYSTEM_RYML) ++ find_package(ryml CONFIG REQUIRED) ++else() ++ add_subdirectory(third_party/rapidyaml/rapidyaml ryml) ++endif() + + # Look for libraries in global output path. + link_directories(${GLOBAL_OUTPUT_PATH}) +@@ -124,7 +130,6 @@ endif() + add_subdirectory(include) + add_subdirectory(stdlib) + add_subdirectory(third_party/md5) +-add_subdirectory(third_party/rapidyaml/rapidyaml ryml) + add_subdirectory(core) + add_subdirectory(cpp) + add_subdirectory(cmd) +diff --git a/core/vm.cpp b/core/vm.cpp +index e328df5..2cafbb7 100644 +--- a/core/vm.cpp ++++ b/core/vm.cpp +@@ -26,8 +26,8 @@ limitations under the License. + #include "nlohmann/json.hpp" + #include "md5.h" + #include "parser.h" +-#include "ryml_std.hpp" // include this before any other ryml header +-#include "ryml.hpp" ++#include "ryml/ryml_std.hpp" // include this before any other ryml header ++#include "ryml/ryml.hpp" + #include "state.h" + #include "static_analysis.h" + #include "string_utils.h" diff --git a/external_imported/vcpkg/ports/jsonnet/001-enable-msvc.patch b/external_imported/vcpkg/ports/jsonnet/001-enable-msvc.patch index d5ec55149..cbbcccc5e 100644 --- a/external_imported/vcpkg/ports/jsonnet/001-enable-msvc.patch +++ b/external_imported/vcpkg/ports/jsonnet/001-enable-msvc.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 385ea82..ebd12b6 100644 +index 5df20ca..23a8114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ @@ -40,6 +40,7 @@ index c032f02..d80d2a0 100644 + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) endif() diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index e62a858..3b7afda 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE @@ -49,7 +50,7 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) +add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) @@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet PUBLIC_HEADER "${LIB_HEADER}") diff --git a/external_imported/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch b/external_imported/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch index 51b63134b..73004735f 100644 --- a/external_imported/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch +++ b/external_imported/vcpkg/ports/jsonnet/002-fix-dependency-and-install.patch @@ -1,4 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 3b7afda..a152fa9 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE @@ -8,8 +9,8 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +if (BUILD_SHARED_BINARIES) add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) -@@ -48,6 +49,7 @@ install(TARGETS libjsonnet + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) +@@ -50,6 +51,7 @@ install(TARGETS libjsonnet PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") target_include_directories(libjsonnet INTERFACE $) @@ -17,13 +18,14 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. -@@ -102,3 +104,5 @@ if (BUILD_TESTS) +@@ -106,3 +108,5 @@ if (BUILD_TESTS) add_test(jsonnet_test_snippet ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET}) endif() + +install(FILES ${LIB_HEADER} DESTINATION include) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index eb7686c..326125c 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE @@ -46,7 +48,7 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. -@@ -38,6 +39,7 @@ else() +@@ -42,6 +43,7 @@ else() add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) endif() diff --git a/external_imported/vcpkg/ports/jsonnet/portfile.cmake b/external_imported/vcpkg/ports/jsonnet/portfile.cmake index f7821c1b4..d6b69831d 100644 --- a/external_imported/vcpkg/ports/jsonnet/portfile.cmake +++ b/external_imported/vcpkg/ports/jsonnet/portfile.cmake @@ -5,17 +5,18 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF v0.17.0 - SHA512 D3EE6947163D8ABCED504FF37ECF365C0311164CBF243D4C635D34944F0831CA9FCE2470ACF00EB9A218F82A2E553B3F885DB9BD21BB9DCEFBD707FA0202925D + REF v0.18.0 + SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1 HEAD_REF master PATCHES 001-enable-msvc.patch 002-fix-dependency-and-install.patch 0003-use-upstream-nlohmann-json.patch 0004-incorporate-md5.patch + 0005-use-upstream-rapidyaml.patch ) -# see https://github.com/google/jsonnet/blob/v0.17.0/Makefile#L214 +# see https://github.com/google/jsonnet/blob/v0.18.0/Makefile#L220 if(VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_PATH pwsh) vcpkg_execute_required_process( @@ -31,13 +32,8 @@ else() ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(BUILD_SHARED ON) - set(BUILD_STATIC OFF) -else() - set(BUILD_SHARED OFF) - set(BUILD_STATIC ON) -endif() +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}" @@ -48,6 +44,7 @@ vcpkg_cmake_configure( -DBUILD_JSONNETFMT=OFF -DBUILD_TESTS=OFF -DUSE_SYSTEM_JSON=ON + -DUSE_SYSTEM_RYML=ON ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/jsonnet/vcpkg.json b/external_imported/vcpkg/ports/jsonnet/vcpkg.json index 92984b1dd..d22359496 100644 --- a/external_imported/vcpkg/ports/jsonnet/vcpkg.json +++ b/external_imported/vcpkg/ports/jsonnet/vcpkg.json @@ -1,11 +1,13 @@ { "name": "jsonnet", - "version": "0.17.0", + "version": "0.18.0", + "port-version": 1, "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", - "supports": "!(windows & !static)", + "license": "Apache-2.0", "dependencies": [ "nlohmann-json", + "ryml", { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/jwt-cpp/portfile.cmake b/external_imported/vcpkg/ports/jwt-cpp/portfile.cmake index d501753be..904acd0d1 100644 --- a/external_imported/vcpkg/ports/jwt-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/jwt-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Thalhammer/jwt-cpp - REF 60122bbd8e6b9009c4633c1a33ea94c5b682034a # v0.5.1 - SHA512 ae905e217824d21ec9f098f562d993fbae71b2223e65f3bbcc29d352af61f2aa09b5c6b12c7d94742901a1374f9683335d3b4934c25b11500b710398331f6cb4 + REF 4a537e969891dde542ad8b1a4a214955a83be29f # v0.6.0 + SHA512 eeeb6adb7f94b699a020b5622b9dbb6c677d92779b57bfb2298b331a5cf69d9112d0b123f0c2ca235ecd96df6d32fcf44e85e144fa414aeff8fd67e3b87576d2 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/jwt-cpp/vcpkg.json b/external_imported/vcpkg/ports/jwt-cpp/vcpkg.json index 8f1471c37..254d8564f 100644 --- a/external_imported/vcpkg/ports/jwt-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/jwt-cpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "jwt-cpp", - "version-semver": "0.5.1", - "port-version": 1, + "version-semver": "0.6.0", "description": "A header only library for creating and validating json web tokens in c++", "homepage": "https://github.com/Thalhammer/jwt-cpp", + "license": "MIT", "dependencies": [ "picojson" ] diff --git a/external_imported/vcpkg/ports/jxrlib/portfile.cmake b/external_imported/vcpkg/ports/jxrlib/portfile.cmake index a15541b99..cdfe1fd1c 100644 --- a/external_imported/vcpkg/ports/jxrlib/portfile.cmake +++ b/external_imported/vcpkg/ports/jxrlib/portfile.cmake @@ -8,28 +8,27 @@ 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}) -if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux) +if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES iOS) # The file guiddef.h is part of the Windows SDK, # we then remove the local copy shipped with jxrlib - file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) + file(REMOVE "${SOURCE_PATH}/common/include/guiddef.h") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) #install FindJXR.cmake file -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") # 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/external_imported/vcpkg/ports/jxrlib/vcpkg.json b/external_imported/vcpkg/ports/jxrlib/vcpkg.json index bdd2c9eb1..5e3506329 100644 --- a/external_imported/vcpkg/ports/jxrlib/vcpkg.json +++ b/external_imported/vcpkg/ports/jxrlib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "jxrlib", "version": "2019.10.9", - "port-version": 3, + "port-version": 4, "description": "Open source implementation of the jpegxr image format standard.", - "homepage": "https://github.com/4creators/jxrlib" + "homepage": "https://github.com/4creators/jxrlib", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/kangaru/portfile.cmake b/external_imported/vcpkg/ports/kangaru/portfile.cmake index 1204f8554..a97d1dcba 100644 --- a/external_imported/vcpkg/ports/kangaru/portfile.cmake +++ b/external_imported/vcpkg/ports/kangaru/portfile.cmake @@ -1,27 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru - REF 8da8f0d5a434a6fb2f317022221ea0809914d4a6 # v4.2.4 - SHA512 e5cfdad793db3b3d5ff093e4120a5131000677504eed09c02817c9a49699c044a88183413ad7b09946abb0258df34fe444078c375a5bf70589345d2aa2c2283b + REF v4.3.1 + SHA512 5c1c6081b266089ad4ef310f4782505db5c514adce87091dd8164a6da71fc7ef72c0992c32e9ec3c991aa7a2ca43f1d96f2f524c7198bf899876af214fea28f3 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DKANGARU_EXPORT=Off -DKANGARU_TEST=Off -DKANGARU_REVERSE_DESTRUCTION=On +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hashtypeid KANGARU_HASH_TYPE_ID ) -vcpkg_install_cmake() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKANGARU_EXPORT=OFF + -DKANGARU_TEST=OFF + -DKANGARU_REVERSE_DESTRUCTION=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kangaru) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kangaru) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" ) - # Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/kangaru/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/kangaru/LICENSE ${CURRENT_PACKAGES_DIR}/share/kangaru/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/kangaru/vcpkg.json b/external_imported/vcpkg/ports/kangaru/vcpkg.json index 411c67133..b0b2d4d02 100644 --- a/external_imported/vcpkg/ports/kangaru/vcpkg.json +++ b/external_imported/vcpkg/ports/kangaru/vcpkg.json @@ -1,6 +1,22 @@ { "name": "kangaru", - "version-string": "4.2.4", - "port-version": 1, - "description": "A dependency injection container for C++11, C++14 and later" + "version": "4.3.1", + "description": "A dependency injection container for C++11, C++14 and later", + "homepage": "https://github.com/gracicot/kangaru", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "hashtypeid": { + "description": "Enable hash based type id" + } + } } diff --git a/external_imported/vcpkg/ports/kf5archive/portfile.cmake b/external_imported/vcpkg/ports/kf5archive/portfile.cmake index ec0c2dd98..3b47cecbf 100644 --- a/external_imported/vcpkg/ports/kf5archive/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5archive/portfile.cmake @@ -37,4 +37,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5archive/vcpkg.json b/external_imported/vcpkg/ports/kf5archive/vcpkg.json index a6a778d87..9818287d6 100644 --- a/external_imported/vcpkg/ports/kf5archive/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5archive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5archive", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "license": "LGPL-2.0-or-later", diff --git a/external_imported/vcpkg/ports/kf5attica/portfile.cmake b/external_imported/vcpkg/ports/kf5attica/portfile.cmake index ebb31c98c..3d9f135d5 100644 --- a/external_imported/vcpkg/ports/kf5attica/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5attica/portfile.cmake @@ -28,4 +28,5 @@ endif() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5attica/vcpkg.json b/external_imported/vcpkg/ports/kf5attica/vcpkg.json index 2f38ba3ee..718f71a0e 100644 --- a/external_imported/vcpkg/ports/kf5attica/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5attica/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5attica", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5auth/portfile.cmake b/external_imported/vcpkg/ports/kf5auth/portfile.cmake index 2c75a4bfc..ae3108fd0 100644 --- a/external_imported/vcpkg/ports/kf5auth/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5auth/portfile.cmake @@ -27,4 +27,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5auth/vcpkg.json b/external_imported/vcpkg/ports/kf5auth/vcpkg.json index e821fee90..84bf200cc 100644 --- a/external_imported/vcpkg/ports/kf5auth/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5auth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5auth", "version": "5.89.0", + "port-version": 1, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5bookmarks/portfile.cmake b/external_imported/vcpkg/ports/kf5bookmarks/portfile.cmake index 159f79ffa..63412053f 100644 --- a/external_imported/vcpkg/ports/kf5bookmarks/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5bookmarks/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5bookmarks/vcpkg.json b/external_imported/vcpkg/ports/kf5bookmarks/vcpkg.json index 5064aa9ee..2d2183a44 100644 --- a/external_imported/vcpkg/ports/kf5bookmarks/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5bookmarks", "version": "5.89.0", + "port-version": 1, "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5codecs/portfile.cmake b/external_imported/vcpkg/ports/kf5codecs/portfile.cmake index 538664fa9..7e08427f9 100644 --- a/external_imported/vcpkg/ports/kf5codecs/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5codecs/portfile.cmake @@ -9,13 +9,11 @@ vcpkg_from_github( # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") -find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF - "-DGperf_EXECUTABLE=${GPERF_EXE}" + "-DGperf_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}" ) vcpkg_cmake_install() @@ -30,4 +28,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5codecs/vcpkg.json b/external_imported/vcpkg/ports/kf5codecs/vcpkg.json index 3e53561c2..d49539c60 100644 --- a/external_imported/vcpkg/ports/kf5codecs/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5codecs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5codecs", "version": "5.89.0", + "port-version": 2, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5completion/portfile.cmake b/external_imported/vcpkg/ports/kf5completion/portfile.cmake index a66913e1a..e146854b7 100644 --- a/external_imported/vcpkg/ports/kf5completion/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5completion/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5completion/vcpkg.json b/external_imported/vcpkg/ports/kf5completion/vcpkg.json index a5619c4b0..a79c2de7f 100644 --- a/external_imported/vcpkg/ports/kf5completion/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5completion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5completion", "version": "5.89.0", + "port-version": 1, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5config/portfile.cmake b/external_imported/vcpkg/ports/kf5config/portfile.cmake index 3abf46595..fe56daabe 100644 --- a/external_imported/vcpkg/ports/kf5config/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5config/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -45,4 +45,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5config/vcpkg.json b/external_imported/vcpkg/ports/kf5config/vcpkg.json index 2e3c6fe3b..62f993d99 100644 --- a/external_imported/vcpkg/ports/kf5config/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5config", "version": "5.89.0", + "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5configwidgets/portfile.cmake b/external_imported/vcpkg/ports/kf5configwidgets/portfile.cmake index e314320d7..c001ee19f 100644 --- a/external_imported/vcpkg/ports/kf5configwidgets/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5configwidgets/portfile.cmake @@ -36,4 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5configwidgets/vcpkg.json b/external_imported/vcpkg/ports/kf5configwidgets/vcpkg.json index a844fb521..8cdefd7f6 100644 --- a/external_imported/vcpkg/ports/kf5configwidgets/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5configwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5configwidgets", "version": "5.89.0", + "port-version": 1, "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5coreaddons/portfile.cmake b/external_imported/vcpkg/ports/kf5coreaddons/portfile.cmake index 36cb5cc9b..99a9c6e38 100644 --- a/external_imported/vcpkg/ports/kf5coreaddons/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5coreaddons/portfile.cmake @@ -29,9 +29,12 @@ file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share" file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data/kf5") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/data/kf5") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5coreaddons/vcpkg.json b/external_imported/vcpkg/ports/kf5coreaddons/vcpkg.json index 7ea1f782b..d637c07e6 100644 --- a/external_imported/vcpkg/ports/kf5coreaddons/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5coreaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5coreaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5crash/portfile.cmake b/external_imported/vcpkg/ports/kf5crash/portfile.cmake index 8cf3567ad..32eb2960a 100644 --- a/external_imported/vcpkg/ports/kf5crash/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5crash/portfile.cmake @@ -26,4 +26,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5crash/vcpkg.json b/external_imported/vcpkg/ports/kf5crash/vcpkg.json index f4588397e..512dca04d 100644 --- a/external_imported/vcpkg/ports/kf5crash/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5crash/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5crash", "version": "5.89.0", + "port-version": 1, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5dbusaddons/portfile.cmake b/external_imported/vcpkg/ports/kf5dbusaddons/portfile.cmake index c3e125188..f2640ff4b 100644 --- a/external_imported/vcpkg/ports/kf5dbusaddons/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5dbusaddons/portfile.cmake @@ -30,4 +30,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5dbusaddons/vcpkg.json b/external_imported/vcpkg/ports/kf5dbusaddons/vcpkg.json index 6249aa2e0..e4e0856d6 100644 --- a/external_imported/vcpkg/ports/kf5dbusaddons/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.89.0", + "port-version": 1, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5declarative/portfile.cmake b/external_imported/vcpkg/ports/kf5declarative/portfile.cmake index 07b1b54e2..33b4c840d 100644 --- a/external_imported/vcpkg/ports/kf5declarative/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5declarative/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY + "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -31,10 +31,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Declarative CONFIG_PATH lib/cmake/KF5Declarative) vcpkg_copy_pdbs() -vcpkg_copy_tools( - TOOL_NAMES kpackagelauncherqml - AUTO_CLEAN -) +vcpkg_copy_tools(TOOL_NAMES kpackagelauncherqml AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -43,4 +40,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5declarative/vcpkg.json b/external_imported/vcpkg/ports/kf5declarative/vcpkg.json index 5407b3989..856bff788 100644 --- a/external_imported/vcpkg/ports/kf5declarative/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5declarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5declarative", "version": "5.89.0", + "port-version": 1, "description": "Integration of QML and KDE work spaces", "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5diagram/portfile.cmake b/external_imported/vcpkg/ports/kf5diagram/portfile.cmake index 06278643c..23caaa589 100644 --- a/external_imported/vcpkg/ports/kf5diagram/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5diagram/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.GPL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL.txt") diff --git a/external_imported/vcpkg/ports/kf5diagram/vcpkg.json b/external_imported/vcpkg/ports/kf5diagram/vcpkg.json index 0388001e5..07677eeb0 100644 --- a/external_imported/vcpkg/ports/kf5diagram/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5diagram/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5diagram", "version": "2.8.0", + "port-version": 1, "description": "Powerful libraries (KChart, KGantt) for creating business diagrams", "homepage": "https://api.kde.org/kdiagram/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5globalaccel/make_x11_required.patch b/external_imported/vcpkg/ports/kf5globalaccel/make_x11_required.patch new file mode 100644 index 000000000..797fef219 --- /dev/null +++ b/external_imported/vcpkg/ports/kf5globalaccel/make_x11_required.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f78b454..4858674 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,19 +48,19 @@ find_package(KF5DBusAddons ${KF_DEP_VERSION} REQUIRED) + find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED) + + # no X11 stuff on mac +-if (NOT APPLE) +- find_package(XCB MODULE COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) ++if (NOT APPLE AND ENABLE_X11EXTRAS) ++ find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) + set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" + URL "http://xcb.freedesktop.org" + TYPE OPTIONAL + ) + +- find_package(X11) ++ find_package(X11 REQUIRED) + endif() + + set(HAVE_X11 0) + +-if(X11_FOUND AND XCB_XCB_FOUND) ++if(X11_FOUND AND XCB_XCB_FOUND AND ENABLE_X11EXTRAS) + set(HAVE_X11 1) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + endif() diff --git a/external_imported/vcpkg/ports/kf5globalaccel/portfile.cmake b/external_imported/vcpkg/ports/kf5globalaccel/portfile.cmake index 3b0b1d070..9cdf648c4 100644 --- a/external_imported/vcpkg/ports/kf5globalaccel/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5globalaccel/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v5.89.0 SHA512 824e4d6204189290dcc542ef3004ad2e2e2f83620dbf381ab78edbef996f412996709b9b49b72aad7c23deeeb6be274906b4cbbbd49498be081330e89c5674de HEAD_REF master + PATCHES "make_x11_required.patch" ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -13,16 +14,14 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DENABLE_X11EXTRAS=${VCPKG_TARGET_IS_LINUX} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) vcpkg_copy_pdbs() -vcpkg_copy_tools( - TOOL_NAMES kglobalaccel5 - AUTO_CLEAN - ) +vcpkg_copy_tools(TOOL_NAMES kglobalaccel5 AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -30,4 +29,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5globalaccel/vcpkg.json b/external_imported/vcpkg/ports/kf5globalaccel/vcpkg.json index dbc60bfaa..7cfc9ad20 100644 --- a/external_imported/vcpkg/ports/kf5globalaccel/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5globalaccel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5globalaccel", "version": "5.89.0", + "port-version": 3, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5guiaddons/portfile.cmake b/external_imported/vcpkg/ports/kf5guiaddons/portfile.cmake index 07048be6d..d7b5dc225 100644 --- a/external_imported/vcpkg/ports/kf5guiaddons/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5guiaddons/portfile.cmake @@ -10,13 +10,9 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - wayland WITH_WAYLAND + wayland WITH_WAYLAND ) -if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) - message(FATAL_ERROR "Feature wayland is only supported on Linux.") -endif() - # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") @@ -41,4 +37,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5guiaddons/vcpkg.json b/external_imported/vcpkg/ports/kf5guiaddons/vcpkg.json index ca00997c9..a49729532 100644 --- a/external_imported/vcpkg/ports/kf5guiaddons/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5guiaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ @@ -42,7 +43,10 @@ "wayland": { "description": "Linux-only. Build with support for KeySequenceEditor inhibiting shortcuts on Wayland", "dependencies": [ - "qt5-wayland" + { + "name": "qt5-wayland", + "platform": "linux" + } ] } } diff --git a/external_imported/vcpkg/ports/kf5holidays/portfile.cmake b/external_imported/vcpkg/ports/kf5holidays/portfile.cmake index df9d162c8..b5a38a216 100644 --- a/external_imported/vcpkg/ports/kf5holidays/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5holidays/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5holidays/vcpkg.json b/external_imported/vcpkg/ports/kf5holidays/vcpkg.json index 5055e2a83..67ba469d7 100644 --- a/external_imported/vcpkg/ports/kf5holidays/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.89.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/external_imported/vcpkg/ports/kf5i18n/portfile.cmake b/external_imported/vcpkg/ports/kf5i18n/portfile.cmake index 078c5a5ad..8ccdc010c 100644 --- a/external_imported/vcpkg/ports/kf5i18n/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5i18n/portfile.cmake @@ -35,4 +35,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5i18n/vcpkg.json b/external_imported/vcpkg/ports/kf5i18n/vcpkg.json index 6aeeada80..6734fac4e 100644 --- a/external_imported/vcpkg/ports/kf5i18n/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.89.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5iconthemes/portfile.cmake b/external_imported/vcpkg/ports/kf5iconthemes/portfile.cmake index 9486d26fb..d6f86c38d 100644 --- a/external_imported/vcpkg/ports/kf5iconthemes/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5iconthemes/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_from_github( ) vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - designerplugin BUILD_DESIGNERPLUGIN - ) + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN +) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") @@ -34,10 +34,7 @@ vcpkg_copy_tools( ) if(VCPKG_TARGET_IS_OSX) - vcpkg_copy_tools( - TOOL_NAMES ksvg2icns - AUTO_CLEAN - ) + vcpkg_copy_tools(TOOL_NAMES ksvg2icns AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -46,4 +43,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5iconthemes/vcpkg.json b/external_imported/vcpkg/ports/kf5iconthemes/vcpkg.json index a7e496cd0..5fcb2aebd 100644 --- a/external_imported/vcpkg/ports/kf5iconthemes/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5iconthemes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5iconthemes", "version": "5.89.0", + "port-version": 1, "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5itemmodels/portfile.cmake b/external_imported/vcpkg/ports/kf5itemmodels/portfile.cmake index 04c74eda4..83c9771c5 100644 --- a/external_imported/vcpkg/ports/kf5itemmodels/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5itemmodels/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5itemmodels/vcpkg.json b/external_imported/vcpkg/ports/kf5itemmodels/vcpkg.json index f289009c7..3e3f3c942 100644 --- a/external_imported/vcpkg/ports/kf5itemmodels/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemmodels", "version": "5.89.0", + "port-version": 1, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5itemviews/portfile.cmake b/external_imported/vcpkg/ports/kf5itemviews/portfile.cmake index f1efb9e1c..317afdfd2 100644 --- a/external_imported/vcpkg/ports/kf5itemviews/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5itemviews/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5itemviews/vcpkg.json b/external_imported/vcpkg/ports/kf5itemviews/vcpkg.json index 444aa1f79..4ba26c11a 100644 --- a/external_imported/vcpkg/ports/kf5itemviews/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemviews", "version": "5.89.0", + "port-version": 1, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5jobwidgets/portfile.cmake b/external_imported/vcpkg/ports/kf5jobwidgets/portfile.cmake index e34c97193..15dfd7db2 100644 --- a/external_imported/vcpkg/ports/kf5jobwidgets/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5jobwidgets/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5jobwidgets/vcpkg.json b/external_imported/vcpkg/ports/kf5jobwidgets/vcpkg.json index 8a6164212..08b88645b 100644 --- a/external_imported/vcpkg/ports/kf5jobwidgets/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5jobwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5jobwidgets", "version": "5.89.0", + "port-version": 1, "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5kcmutils/portfile.cmake b/external_imported/vcpkg/ports/kf5kcmutils/portfile.cmake index da0a49637..cf4e90f91 100644 --- a/external_imported/vcpkg/ports/kf5kcmutils/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5kcmutils/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5kcmutils/vcpkg.json b/external_imported/vcpkg/ports/kf5kcmutils/vcpkg.json index 85309cd38..2ebfa63ac 100644 --- a/external_imported/vcpkg/ports/kf5kcmutils/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5kcmutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5kcmutils", "version": "5.89.0", + "port-version": 1, "description": "Utilities for KDE System Settings modules", "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5kio/portfile.cmake b/external_imported/vcpkg/ports/kf5kio/portfile.cmake index 12fdb5916..50ef6e4ab 100644 --- a/external_imported/vcpkg/ports/kf5kio/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5kio/portfile.cmake @@ -62,4 +62,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5kio/vcpkg.json b/external_imported/vcpkg/ports/kf5kio/vcpkg.json index 3f06846fc..bf45064c2 100644 --- a/external_imported/vcpkg/ports/kf5kio/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5kio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5kio", "version": "5.89.0", + "port-version": 1, "description": "Network transparent access to files and data", "homepage": "https://api.kde.org/frameworks/kio/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5newstuff/portfile.cmake b/external_imported/vcpkg/ports/kf5newstuff/portfile.cmake index ddb0527c2..02d07443a 100644 --- a/external_imported/vcpkg/ports/kf5newstuff/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5newstuff/portfile.cmake @@ -30,9 +30,12 @@ vcpkg_copy_tools( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/data/kf5/kmoretools/presets-kmoretools/_README.md") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/data/kf5/kmoretools/presets-kmoretools/_README.md") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5newstuff/vcpkg.json b/external_imported/vcpkg/ports/kf5newstuff/vcpkg.json index a435e8b05..3d7590e9a 100644 --- a/external_imported/vcpkg/ports/kf5newstuff/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5newstuff", "version": "5.89.0", + "port-version": 1, "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5notifications/portfile.cmake b/external_imported/vcpkg/ports/kf5notifications/portfile.cmake index e44c59b76..85ac8866a 100644 --- a/external_imported/vcpkg/ports/kf5notifications/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5notifications/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5notifications/vcpkg.json b/external_imported/vcpkg/ports/kf5notifications/vcpkg.json index 1299e13af..250c5fd07 100644 --- a/external_imported/vcpkg/ports/kf5notifications/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5notifications/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5notifications", "version": "5.89.0", + "port-version": 1, "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5package/portfile.cmake b/external_imported/vcpkg/ports/kf5package/portfile.cmake index f58344ed0..8fed3f408 100644 --- a/external_imported/vcpkg/ports/kf5package/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5package/portfile.cmake @@ -29,4 +29,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5package/vcpkg.json b/external_imported/vcpkg/ports/kf5package/vcpkg.json index 30d6ea179..05fdc67b2 100644 --- a/external_imported/vcpkg/ports/kf5package/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5package/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5package", "version": "5.89.0", + "port-version": 1, "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5plotting/portfile.cmake b/external_imported/vcpkg/ports/kf5plotting/portfile.cmake index cd05b7ff5..548bcf6ba 100644 --- a/external_imported/vcpkg/ports/kf5plotting/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5plotting/portfile.cmake @@ -23,4 +23,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5plotting/vcpkg.json b/external_imported/vcpkg/ports/kf5plotting/vcpkg.json index 6a085aacc..314db70e4 100644 --- a/external_imported/vcpkg/ports/kf5plotting/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.89.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5service/portfile.cmake b/external_imported/vcpkg/ports/kf5service/portfile.cmake index afaebd0eb..609da2552 100644 --- a/external_imported/vcpkg/ports/kf5service/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5service/portfile.cmake @@ -56,4 +56,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5service/vcpkg.json b/external_imported/vcpkg/ports/kf5service/vcpkg.json index a7f375e61..8d155fbea 100644 --- a/external_imported/vcpkg/ports/kf5service/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5service/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5service", "version": "5.89.0", + "port-version": 1, "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5solid/portfile.cmake b/external_imported/vcpkg/ports/kf5solid/portfile.cmake index cc4f0358a..f0c78a068 100644 --- a/external_imported/vcpkg/ports/kf5solid/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5solid/portfile.cmake @@ -38,7 +38,7 @@ file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: fa vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount + "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount ) vcpkg_cmake_configure( @@ -55,7 +55,7 @@ vcpkg_copy_pdbs() vcpkg_copy_tools( TOOL_NAMES solid-hardware5 AUTO_CLEAN - ) +) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -64,4 +64,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5solid/vcpkg.json b/external_imported/vcpkg/ports/kf5solid/vcpkg.json index ec477c5b4..c7b4735d0 100644 --- a/external_imported/vcpkg/ports/kf5solid/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5solid/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5solid", "version": "5.89.0", + "port-version": 1, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5sonnet/portfile.cmake b/external_imported/vcpkg/ports/kf5sonnet/portfile.cmake index f981c077c..1bfb51f58 100644 --- a/external_imported/vcpkg/ports/kf5sonnet/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5sonnet/portfile.cmake @@ -44,4 +44,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5sonnet/vcpkg.json b/external_imported/vcpkg/ports/kf5sonnet/vcpkg.json index 194bb46b2..1d2330e70 100644 --- a/external_imported/vcpkg/ports/kf5sonnet/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5sonnet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5sonnet", "version": "5.89.0", + "port-version": 1, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake b/external_imported/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake index 9cb527951..6d5003ae7 100644 --- a/external_imported/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5syntaxhighlighting/portfile.cmake @@ -36,4 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json b/external_imported/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json index 51784515b..a29d3617e 100644 --- a/external_imported/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.89.0", + "port-version": 1, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5textwidgets/portfile.cmake b/external_imported/vcpkg/ports/kf5textwidgets/portfile.cmake index bf3e1ad90..c8f4dc07d 100644 --- a/external_imported/vcpkg/ports/kf5textwidgets/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5textwidgets/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5textwidgets/vcpkg.json b/external_imported/vcpkg/ports/kf5textwidgets/vcpkg.json index 82b0da989..9393a42b7 100644 --- a/external_imported/vcpkg/ports/kf5textwidgets/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5textwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5textwidgets", "version": "5.89.0", + "port-version": 1, "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5wallet/portfile.cmake b/external_imported/vcpkg/ports/kf5wallet/portfile.cmake index 61db39fa1..2849f9d8c 100644 --- a/external_imported/vcpkg/ports/kf5wallet/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5wallet/portfile.cmake @@ -28,4 +28,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5wallet/vcpkg.json b/external_imported/vcpkg/ports/kf5wallet/vcpkg.json index eaf4d1253..fdc33a3ee 100644 --- a/external_imported/vcpkg/ports/kf5wallet/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5wallet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5wallet", "version": "5.89.0", + "port-version": 1, "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5widgetsaddons/portfile.cmake b/external_imported/vcpkg/ports/kf5widgetsaddons/portfile.cmake index dacd9aab5..4d6e88866 100644 --- a/external_imported/vcpkg/ports/kf5widgetsaddons/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5widgetsaddons/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5widgetsaddons/vcpkg.json b/external_imported/vcpkg/ports/kf5widgetsaddons/vcpkg.json index 7dd41877e..8b850b13c 100644 --- a/external_imported/vcpkg/ports/kf5widgetsaddons/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5windowsystem/portfile.cmake b/external_imported/vcpkg/ports/kf5windowsystem/portfile.cmake index 999383d7e..c2c441a60 100644 --- a/external_imported/vcpkg/ports/kf5windowsystem/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5windowsystem/portfile.cmake @@ -32,4 +32,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/KF5/KWindowSystem/config-kwindowsystem.h" "${CURRENT_PACKAGES_DIR}/" "") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5windowsystem/vcpkg.json b/external_imported/vcpkg/ports/kf5windowsystem/vcpkg.json index d16a10e55..341e25cb2 100644 --- a/external_imported/vcpkg/ports/kf5windowsystem/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5windowsystem", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kf5xmlgui/portfile.cmake b/external_imported/vcpkg/ports/kf5xmlgui/portfile.cmake index d3a9143db..df3614de9 100644 --- a/external_imported/vcpkg/ports/kf5xmlgui/portfile.cmake +++ b/external_imported/vcpkg/ports/kf5xmlgui/portfile.cmake @@ -41,4 +41,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/kf5xmlgui/vcpkg.json b/external_imported/vcpkg/ports/kf5xmlgui/vcpkg.json index 72fe1dcd7..67bf4cec6 100644 --- a/external_imported/vcpkg/ports/kf5xmlgui/vcpkg.json +++ b/external_imported/vcpkg/ports/kf5xmlgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5xmlgui", "version": "5.89.0", + "port-version": 1, "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/external_imported/vcpkg/ports/kfr/vcpkg.json b/external_imported/vcpkg/ports/kfr/vcpkg.json index 913744529..c60a6a11e 100644 --- a/external_imported/vcpkg/ports/kfr/vcpkg.json +++ b/external_imported/vcpkg/ports/kfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kfr", "version-semver": "4.2.1", - "port-version": 1, + "port-version": 2, "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", "license": "GPL-2.0", diff --git a/external_imported/vcpkg/ports/kinectsdk1/Config.cmake.in b/external_imported/vcpkg/ports/kinectsdk1/Config.cmake.in new file mode 100644 index 000000000..37b7a133a --- /dev/null +++ b/external_imported/vcpkg/ports/kinectsdk1/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk1_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) +get_filename_component(_kinectsdk1_root "${_kinectsdk1_root}" PATH) + +set(_kinectsdk1_rel_lib "${_kinectsdk1_root}/lib/Kinect10.lib") +set(_kinectsdk1_dbg_lib "${_kinectsdk1_root}/debug/lib/Kinect10.lib") +if (EXISTS "${_kinectsdk1_rel_lib}" OR EXISTS "${_kinectsdk1_dbg_lib}") + + add_library(unofficial::kinectsdk1::kinectsdk1 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk1::kinectsdk1 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk1_root}/include") + + if (EXISTS "${_kinectsdk1_rel_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk1_rel_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk1_dbg_lib}") + set_target_properties(unofficial::kinectsdk1::kinectsdk1 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk1_dbg_lib}") + set_property(TARGET unofficial::kinectsdk1::kinectsdk1 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk1_FOUND FALSE) + +endif() + +unset(_kinectsdk1_rel_lib) +unset(_kinectsdk1_dbg_lib) + +unset(_kinectsdk1_root) diff --git a/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake b/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake index 305f9d7bb..59c0ddf01 100644 --- a/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake +++ b/external_imported/vcpkg/ports/kinectsdk1/portfile.cmake @@ -1,4 +1,13 @@ set(KINECTSDK10_VERSION "v1.8") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ARCHITECTURE x86) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHITECTURE amd64) +else() + message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + vcpkg_download_distfile(KINECTSDK10_INSTALLER URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" FILENAME "KinectSDK-${KINECTSDK10_VERSION}-Setup.exe" @@ -10,23 +19,22 @@ vcpkg_find_acquire_program(DARK) set(KINECTSDK10_WIX_INSTALLER "${KINECTSDK10_INSTALLER}") set(KINECTSDK10_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") vcpkg_execute_required_process( - COMMAND ${DARK} -x ${KINECTSDK10_WIX_EXTRACT_DIR} ${KINECTSDK10_WIX_INSTALLER} + COMMAND "${DARK}" -x "${KINECTSDK10_WIX_EXTRACT_DIR}" "${KINECTSDK10_WIX_INSTALLER}" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_wix_installer + LOGNAME extract-wix-${TARGET_TRIPLET} ) -file(TO_NATIVE_PATH "${KINECTSDK10_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi" KINECTSDK10_MSI_INSTALLER) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}" KINECTSDK10_MSI_EXTRACT_DIR) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH) -set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) -file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK10_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK10_MSI_EXTRACT_DIR}\"") +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}") +set(KINECTSDK10_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi") vcpkg_execute_required_process( - COMMAND ${BATCH_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_msi_installer_${VCPKG_TARGET_ARCHITECTURE} + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK10_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} ) - -set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}") +set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}") file( INSTALL @@ -35,30 +43,24 @@ file( "${KINECTSDK10_DIR}/inc/NuiSensor.h" "${KINECTSDK10_DIR}/inc/NuiSkeleton.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(ARCHITECTURE x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ARCHITECTURE amd64) -else() - message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - file( INSTALL "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) file( INSTALL "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + # Handle copyright -file(INSTALL ${KINECTSDK10_DIR}/SDKEula.rtf DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json b/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json index 225fe460e..7d4a3a029 100644 --- a/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json +++ b/external_imported/vcpkg/ports/kinectsdk1/vcpkg.json @@ -1,7 +1,14 @@ { "name": "kinectsdk1", "version": "1.8", - "port-version": 4, + "port-version": 5, "description": "Kinect for Windows SDK for Kinect v1 sensor.", - "supports": "!arm" + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/kinectsdk2/Config.cmake.in b/external_imported/vcpkg/ports/kinectsdk2/Config.cmake.in new file mode 100644 index 000000000..04291aa09 --- /dev/null +++ b/external_imported/vcpkg/ports/kinectsdk2/Config.cmake.in @@ -0,0 +1,33 @@ + +get_filename_component(_kinectsdk2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) +get_filename_component(_kinectsdk2_root "${_kinectsdk2_root}" PATH) + +set(_kinectsdk2_rel_lib "${_kinectsdk2_root}/lib/Kinect20.lib") +set(_kinectsdk2_dbg_lib "${_kinectsdk2_root}/debug/lib/Kinect20.lib") +if (EXISTS "${_kinectsdk2_rel_lib}" OR EXISTS "${_kinectsdk2_dbg_lib}") + + add_library(unofficial::kinectsdk2::kinectsdk2 INTERFACE IMPORTED) + set_target_properties(unofficial::kinectsdk2::kinectsdk2 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_kinectsdk2_root}/include") + + if (EXISTS "${_kinectsdk2_rel_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_RELEASE "${_kinectsdk2_rel_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + endif() + if (EXISTS "${_kinectsdk2_dbg_lib}") + set_target_properties(unofficial::kinectsdk2::kinectsdk2 + PROPERTIES IMPORTED_LOCATION_DEBUG "${_kinectsdk2_dbg_lib}") + set_property(TARGET unofficial::kinectsdk2::kinectsdk2 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + endif() + +else() + + set(kinectsdk2_FOUND FALSE) + +endif() + +unset(_kinectsdk2_rel_lib) +unset(_kinectsdk2_dbg_lib) + +unset(_kinectsdk2_root) diff --git a/external_imported/vcpkg/ports/kinectsdk2/portfile.cmake b/external_imported/vcpkg/ports/kinectsdk2/portfile.cmake index 3ed210172..8e8e3e5c0 100644 --- a/external_imported/vcpkg/ports/kinectsdk2/portfile.cmake +++ b/external_imported/vcpkg/ports/kinectsdk2/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_buildpath_length_warning(37) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - set(KINECTSDK20_VERSION "v2.0_1409") vcpkg_download_distfile(KINECTSDK20_INSTALLER URLS "https://download.microsoft.com/download/F/2/D/F2D1012E-3BC6-49C5-B8B3-5ACFF58AF7B8/KinectSDK-${KINECTSDK20_VERSION}-Setup.exe" @@ -18,43 +14,43 @@ set(KINECTSDK20_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix") vcpkg_execute_required_process( COMMAND ${DARK} -x ${KINECTSDK20_WIX_EXTRACT_DIR} ${KINECTSDK20_WIX_INSTALLER} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_wix_installer + LOGNAME extract-wix-${TARGET_TRIPLET} ) -file(TO_NATIVE_PATH "${KINECTSDK20_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK20_VERSION}-x64.msi" KINECTSDK20_MSI_INSTALLER) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi" KINECTSDK20_MSI_EXTRACT_DIR) -file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH) -set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) -file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK20_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK20_MSI_EXTRACT_DIR}\"") +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64") +set(KINECTSDK20_MSI_INSTALLER "installer\\wix\\AttachedContainer\\KinectSDK-${KINECTSDK20_VERSION}-x64.msi") vcpkg_execute_required_process( - COMMAND ${BATCH_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME extract_msi_installer + COMMAND + "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" + x + "${KINECTSDK20_MSI_INSTALLER}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + LOGNAME extract-msi-${TARGET_TRIPLET} ) - -set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}") +set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/KinectSDK-${KINECTSDK20_VERSION}-x64/SourceDir/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}") file( INSTALL "${KINECTSDK20_DIR}/inc/" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) file( INSTALL "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) file( INSTALL "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + # Handle copyright -file(COPY "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/copyright) +file(INSTALL "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json b/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json index 5b065d28f..def818628 100644 --- a/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json +++ b/external_imported/vcpkg/ports/kinectsdk2/vcpkg.json @@ -1,7 +1,14 @@ { "name": "kinectsdk2", - "version-string": "2.0", - "port-version": 3, + "version": "2.0", + "port-version": 4, "description": "Kinect for Windows SDK for Kinect v2 sensor.", - "supports": "!arm" + "license": null, + "supports": "!arm & windows", + "dependencies": [ + { + "name": "vcpkg-tool-lessmsi", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch b/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch index 8dff4a59a..2a2bb0884 100644 --- a/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/external_imported/vcpkg/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0bdb708..356c160 100644 +index f1d37cf7..9cf43c75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -121,7 +121,6 @@ set(KTX_MAIN_SRC +@@ -174,7 +174,6 @@ set(KTX_MAIN_SRC lib/basisu/transcoder/basisu_transcoder.cpp lib/basisu/transcoder/basisu_transcoder.h lib/basisu/transcoder/basisu.h @@ -10,31 +10,30 @@ index 0bdb708..356c160 100644 lib/checkheader.c lib/dfdutils/createdfd.c lib/dfdutils/colourspaces.c -@@ -227,7 +226,6 @@ macro(commom_lib_settings lib write) +@@ -284,7 +283,6 @@ macro(commom_lib_settings lib write) $ - $ + $ - $ $ $ -@@ -309,6 +307,11 @@ macro(commom_lib_settings lib write) +@@ -370,6 +368,10 @@ macro(commom_lib_settings lib write) + target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2) endif() ++ # Use vcpkg zstd ++ find_package(zstd CONFIG REQUIRED) ++ target_link_libraries(${lib} PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) ++ if(WIN32) -+ find_package(zstd CONFIG REQUIRED) -+ target_link_libraries( -+ ${lib} -+ $,zstd::libzstd_shared,zstd::libzstd_static> -+ ) - # By wrapping in generator expression we force multi configuration generators (like Visual Studio) - # to take the exact path and not change it. - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$>) + # By wrapping in generator expression we force multi configuration + # generators (like Visual Studio) to take the exact path and not diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt -index 78dd110..e155896 100644 +index 492233a..8786d16 100644 --- a/lib/basisu/CMakeLists.txt +++ b/lib/basisu/CMakeLists.txt -@@ -118,7 +118,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} +@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} ) if (ZSTD) @@ -43,7 +42,7 @@ index 78dd110..e155896 100644 endif() if (APPLE) -@@ -137,6 +137,10 @@ else() +@@ -165,6 +165,10 @@ else() target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0) endif() @@ -52,13 +51,13 @@ index 78dd110..e155896 100644 +endif() + if (NOT MSVC) - target_link_libraries(basisu m pthread) - endif() + # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. + if (OPENCL_FOUND) diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt -index e365e1b..6e6a7a5 100644 +index 588d91b..0b38012 100644 --- a/lib/basisu/webgl/encoder/CMakeLists.txt +++ b/lib/basisu/webgl/encoder/CMakeLists.txt -@@ -36,9 +36,7 @@ if (EMSCRIPTEN) +@@ -34,9 +34,7 @@ if (EMSCRIPTEN) ) if (KTX2_ZSTANDARD) @@ -69,19 +68,19 @@ index e365e1b..6e6a7a5 100644 set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -58,6 +56,10 @@ if (EMSCRIPTEN) +@@ -56,6 +54,10 @@ if (EMSCRIPTEN) target_include_directories(basis_encoder.js PRIVATE ../../transcoder) + if(ZSTD_LIBRARIES) + target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES}) + endif() -+ ++ set_target_properties(basis_encoder.js PROPERTIES OUTPUT_NAME "basis_encoder" SUFFIX ".js" diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt -index 372653d..2e19ece 100644 +index 372653d..f75e3a3 100644 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt @@ -28,9 +28,7 @@ if (EMSCRIPTEN) @@ -95,14 +94,14 @@ index 372653d..2e19ece 100644 set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -44,7 +42,9 @@ if (EMSCRIPTEN) - target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} ) +@@ -45,6 +43,10 @@ if (EMSCRIPTEN) target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing) target_include_directories(basis_transcoder.js PRIVATE ../../transcoder) -- + + if(ZSTD_LIBRARIES) + target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES}) + endif() ++ set_target_properties(basis_transcoder.js PROPERTIES OUTPUT_NAME "basis_transcoder" SUFFIX ".js" diff --git a/external_imported/vcpkg/ports/ktx/portfile.cmake b/external_imported/vcpkg/ports/ktx/portfile.cmake index ab105302a..41438e128 100644 --- a/external_imported/vcpkg/ports/ktx/portfile.cmake +++ b/external_imported/vcpkg/ports/ktx/portfile.cmake @@ -1,10 +1,10 @@ -set(PORT_VERSION 4.0.0) +set(PORT_VERSION 4.1.0-rc2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software - REF v${PORT_VERSION} - SHA512 49787cf0230939ae0c737f6080ef483dd27ebd653c16525b469b078511ab72e85aecba9bffe71ed45ce1692e8448b845e60545c39f9333e6d216b20f56595faa + REF b995ac337276648afc3a5beaa6206995d2399bce #v${PORT_VERSION} + SHA512 522272226b56dce496c739f2657992e4b3e972a16f04168becf574ae6d6b15c3dec428854a5b7fee2e8167ce110cc258744778abe4b8fb20eab69c742c78b13e HEAD_REF master FILE_DISAMBIGUATOR 1 PATCHES diff --git a/external_imported/vcpkg/ports/ktx/vcpkg.json b/external_imported/vcpkg/ports/ktx/vcpkg.json index c2d458df2..4b9e036f6 100644 --- a/external_imported/vcpkg/ports/ktx/vcpkg.json +++ b/external_imported/vcpkg/ports/ktx/vcpkg.json @@ -1,10 +1,10 @@ { "name": "ktx", - "version": "4.0.0", - "port-version": 2, + "version-semver": "4.1.0-rc2", "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", - "supports": "!(uwp | x86 | arm64)", + "license": "Apache-2.0", + "supports": "!(uwp | x86 | (arm & !arm64))", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/kubazip/fix_targets.patch b/external_imported/vcpkg/ports/kubazip/fix_targets.patch index e5ffb8608..fc0a11e8f 100644 --- a/external_imported/vcpkg/ports/kubazip/fix_targets.patch +++ b/external_imported/vcpkg/ports/kubazip/fix_targets.patch @@ -1,25 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55dfc77..f0182f9 100644 +index cf86d70..c2bc2f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.4) + cmake_minimum_required(VERSION 3.14) -project(zip +project(kubazip LANGUAGES C - VERSION "0.1.19") + VERSION "0.2.3") set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -@@ -15,7 +15,7 @@ if (MSVC) - elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic") - endif (MSVC) - - # zip -@@ -37,7 +37,7 @@ endif() +@@ -46,11 +46,11 @@ endif() target_include_directories(${PROJECT_NAME} PUBLIC $ @@ -28,25 +19,23 @@ index 55dfc77..f0182f9 100644 ) # test -@@ -52,7 +52,7 @@ endif() - # Installation (https://github.com/forexample/package-example) { +-if (NOT CMAKE_DISABLE_TESTING) ++if (0) + enable_testing() + add_subdirectory(test) + endif() +@@ -69,12 +69,12 @@ if (MSVC) + elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic") + endif (MSVC) + #### set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -set(INCLUDE_INSTALL_DIR "include") +set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}") set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 04c2123..002cf5a 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.4) - set(test_out test.out) - - add_executable(${test_out} test.c) --target_link_libraries(${test_out} zip) -+target_link_libraries(${test_out} kubazip) - - add_test(NAME ${test_out} COMMAND ${test_out}) - diff --git a/external_imported/vcpkg/ports/kubazip/portfile.cmake b/external_imported/vcpkg/ports/kubazip/portfile.cmake index ba2f488e0..e08713a12 100644 --- a/external_imported/vcpkg/ports/kubazip/portfile.cmake +++ b/external_imported/vcpkg/ports/kubazip/portfile.cmake @@ -3,20 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kuba--/zip - REF 96924c94dabe362bbb1588aa70209e638e6fb35c - SHA512 bc3e9ecf39d54321314d09209f356a2491893591a016b1619abcdea8c1fb1fa8ba1f9858f4e758641df083ed237a2ec9f0af13e0f1d802502257644168ae8907 + REF 42151612e8546c55485ec38cf0d57e57e51a8abd #v0.2.4 + SHA512 9cbb7bcb8095c365c4529f06c883f3aa0c1038ed3aa6a0419dafb90355abf6e5cd02f7ffd5cbb54fe3893102bb21f568d415b71500630ad203a1f911b6e52ef5 HEAD_REF master PATCHES fix_targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kubazip) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kubazip) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/kubazip/vcpkg.json b/external_imported/vcpkg/ports/kubazip/vcpkg.json index 1eecb26ba..1d296ea8e 100644 --- a/external_imported/vcpkg/ports/kubazip/vcpkg.json +++ b/external_imported/vcpkg/ports/kubazip/vcpkg.json @@ -1,7 +1,17 @@ { "name": "kubazip", - "version-string": "0.1.19", - "port-version": 1, + "version": "0.2.4", "description": "A portable, simple zip library written in C", - "homepage": "https://github.com/kuba--/zip" + "homepage": "https://github.com/kuba--/zip", + "license": "Unlicense", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/lapack-reference/lapacke.patch b/external_imported/vcpkg/ports/lapack-reference/lapacke.patch new file mode 100644 index 000000000..964f0e319 --- /dev/null +++ b/external_imported/vcpkg/ports/lapack-reference/lapacke.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ee66f1..7cec7ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,8 +392,9 @@ endif() + set(LAPACK_INSTALL_EXPORT_NAME ${LAPACK_INSTALL_EXPORT_NAME_CACHE}) + unset(LAPACK_INSTALL_EXPORT_NAME_CACHE) + +-add_subdirectory(LAPACKE) +- ++if(LAPACKE) ++ add_subdirectory(LAPACKE) ++endif() + + #------------------------------------- + # BLAS++ / LAPACK++ diff --git a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake index 8e7490c8f..c536f3a6b 100644 --- a/external_imported/vcpkg/ports/lapack-reference/portfile.cmake +++ b/external_imported/vcpkg/ports/lapack-reference/portfile.cmake @@ -11,14 +11,16 @@ endif() include(vcpkg_find_fortran) SET(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) -set(lapack_ver 3.10.0) +set(lapack_ver 3.10.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "Reference-LAPACK/lapack" REF "v${lapack_ver}" - SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf + SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb HEAD_REF master + PATCHES + lapacke.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json index e52b1ef84..b2fe5d699 100644 --- a/external_imported/vcpkg/ports/lapack-reference/vcpkg.json +++ b/external_imported/vcpkg/ports/lapack-reference/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lapack-reference", - "version": "3.10.0", + "version": "3.10.1", "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", diff --git a/external_imported/vcpkg/ports/lcm/disable-docs.patch b/external_imported/vcpkg/ports/lcm/disable-docs.patch new file mode 100644 index 000000000..c69b90382 --- /dev/null +++ b/external_imported/vcpkg/ports/lcm/disable-docs.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d3a4c2..90833e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,6 @@ if(LCM_ENABLE_EXAMPLES) + endif() + + # Documentation (Main, C/C++, .NET) +-add_subdirectory(docs) + + # Java + lcm_option( diff --git a/external_imported/vcpkg/ports/lcm/portfile.cmake b/external_imported/vcpkg/ports/lcm/portfile.cmake index 74bca46d3..6b5246b3b 100644 --- a/external_imported/vcpkg/ports/lcm/portfile.cmake +++ b/external_imported/vcpkg/ports/lcm/portfile.cmake @@ -8,51 +8,40 @@ vcpkg_from_github( only-install-one-flavor.patch fix-build-error.patch glib.link.patch + disable-docs.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLCM_ENABLE_JAVA=OFF -DLCM_ENABLE_LUA=OFF -DLCM_ENABLE_PYTHON=OFF + -DLCM_ENABLE_GO=OFF -DLCM_ENABLE_TESTS=OFF + -DLCM_ENABLE_EXAMPLES=OFF -DLCM_INSTALL_M4MACROS=OFF -DLCM_INSTALL_PKGCONFIG=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/lcm/cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/lcm/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lcm" "${CURRENT_PACKAGES_DIR}/lib/lcm") endif() +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}/share/aclocal") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/java") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -if(EXES) - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/lcm) - file(REMOVE ${EXES}) -endif() -file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(DEBUG_EXES) - file(REMOVE ${DEBUG_EXES}) -endif() +vcpkg_copy_tools(TOOL_NAMES lcm-gen lcm-logger lcm-logplayer AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lcm) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lcm/vcpkg.json b/external_imported/vcpkg/ports/lcm/vcpkg.json index ec04fd87b..d450b1c6b 100644 --- a/external_imported/vcpkg/ports/lcm/vcpkg.json +++ b/external_imported/vcpkg/ports/lcm/vcpkg.json @@ -1,13 +1,23 @@ { "name": "lcm", "version": "1.4.0", - "port-version": 2, + "port-version": 4, "description": [ "Lightweight Communications and Marshalling (LCM)", "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." ], "homepage": "https://github.com/lcm-proj/lcm", + "license": "LGPL-2.1-or-later", + "supports": "!osx", "dependencies": [ - "glib" + "glib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/lcms/cpp17.patch b/external_imported/vcpkg/ports/lcms/cpp17.patch new file mode 100644 index 000000000..77da5bef1 --- /dev/null +++ b/external_imported/vcpkg/ports/lcms/cpp17.patch @@ -0,0 +1,13 @@ +diff --git a/include/lcms2.h b/include/lcms2.h +index 7e061ce7c..5d234c4e4 100644 +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -152,7 +152,7 @@ typedef double cmsFloat64Number; + #endif + + // Handle "register" keyword +-#if defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) ++#if __cplusplus >= 201703L || defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) + # define CMSREGISTER + #else + # define CMSREGISTER register diff --git a/external_imported/vcpkg/ports/lcms/portfile.cmake b/external_imported/vcpkg/ports/lcms/portfile.cmake index 78b8409ce..1facfa22d 100644 --- a/external_imported/vcpkg/ports/lcms/portfile.cmake +++ b/external_imported/vcpkg/ports/lcms/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES remove_library_directive.patch ${ADDITIONAL_PATCH} + cpp17.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/lcms/vcpkg.json b/external_imported/vcpkg/ports/lcms/vcpkg.json index 8a78ac8bb..718a2b5c2 100644 --- a/external_imported/vcpkg/ports/lcms/vcpkg.json +++ b/external_imported/vcpkg/ports/lcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcms", "version": "2.12", - "port-version": 3, + "port-version": 4, "description": "Little CMS.", "homepage": "https://github.com/mm2/Little-CMS", "dependencies": [ diff --git a/external_imported/vcpkg/ports/lerc/create_package.patch b/external_imported/vcpkg/ports/lerc/create_package.patch index 7b06c119b..559c44439 100644 --- a/external_imported/vcpkg/ports/lerc/create_package.patch +++ b/external_imported/vcpkg/ports/lerc/create_package.patch @@ -1,26 +1,24 @@ - CMakeLists.txt | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt index e90fcdd..17c79e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ add_library(LercLib ${SOURCES}) - target_link_libraries (LercLib) +@@ -26,12 +26,19 @@ add_library(LercLib ${SOURCES}) + endif() install( -- TARGETS LercLib -+ TARGETS LercLib EXPORT LercTargets + TARGETS Lerc ++ EXPORT LercTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -28,3 +28,9 @@ install( - FILES "include/Lerc_types.h" "include/Lerc_c_api.h" - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -+ ++target_include_directories(Lerc PUBLIC "$") +install(EXPORT LercTargets -+ FILE lercConfig.cmake -+ NAMESPACE Esri:: -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/lerc" ++ FILE unofficial-lerc-config.cmake ++ NAMESPACE unofficial::Lerc:: ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-lerc" +) + + # Configure and install pkgconfig file + configure_file(Lerc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Lerc.pc @ONLY) diff --git a/external_imported/vcpkg/ports/lerc/enable_static_build.patch b/external_imported/vcpkg/ports/lerc/enable_static_build.patch deleted file mode 100644 index 92f0d7852..000000000 --- a/external_imported/vcpkg/ports/lerc/enable_static_build.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d22ad11..e90fcdd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,7 +12,7 @@ file(GLOB SOURCES - ) - message(${SOURCES}) - --add_library(LercLib SHARED ${SOURCES}) -+add_library(LercLib ${SOURCES}) - - target_link_libraries (LercLib) - diff --git a/external_imported/vcpkg/ports/lerc/install_lib_to_archive_path.patch b/external_imported/vcpkg/ports/lerc/install_lib_to_archive_path.patch deleted file mode 100644 index 3262a7ca5..000000000 --- a/external_imported/vcpkg/ports/lerc/install_lib_to_archive_path.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ececeed..d22ad11 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ install( - TARGETS LercLib - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - diff --git a/external_imported/vcpkg/ports/lerc/portfile.cmake b/external_imported/vcpkg/ports/lerc/portfile.cmake index 5b3060f43..fed6e9a08 100644 --- a/external_imported/vcpkg/ports/lerc/portfile.cmake +++ b/external_imported/vcpkg/ports/lerc/portfile.cmake @@ -1,24 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Esri/lerc - REF v2.2 - SHA512 5ddf1e8f0c123d3c1329e980021e25e6ff9b79c96588115e5b48ba7637f0b2bf3ebb2ab6ebf94cfbde45ea1521f14405f669e23f0b74d9ae8f9b2cf80a908215 + REF v4.0.0 + SHA512 36fe453b6e732f6bed554d1c1c5cd4668aec63593d6de11f12b659c7b9cbc059ac9aaacc6cea483b3257d522f1b07e13c299914d08b1f8aeb0bb2cde42ba47cf HEAD_REF master PATCHES - "install_lib_to_archive_path.patch" - "enable_static_build.patch" "create_package.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lerc) +vcpkg_fixup_pkgconfig() -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Lerc_c_api.h" "defined(LERC_STATIC)" "1") +endif() 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}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lerc/vcpkg.json b/external_imported/vcpkg/ports/lerc/vcpkg.json index 6772a248b..f04fd9844 100644 --- a/external_imported/vcpkg/ports/lerc/vcpkg.json +++ b/external_imported/vcpkg/ports/lerc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lerc", - "version-string": "2.2", - "port-version": 2, + "version": "4.0", "description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type", - "homepage": "https://github.com/Esri/lerc" + "homepage": "https://github.com/Esri/lerc", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch b/external_imported/vcpkg/ports/libarchive/fix-deps.patch similarity index 62% rename from external_imported/vcpkg/ports/libarchive/fix-dependencies.patch rename to external_imported/vcpkg/ports/libarchive/fix-deps.patch index 573361c49..9298a5782 100644 --- a/external_imported/vcpkg/ports/libarchive/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/libarchive/fix-deps.patch @@ -1,27 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 39b5333..8164d8f 100644 +index d49db1b82..cbc2b7102 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -433,7 +433,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) - # Find BZip2 - # - IF(ENABLE_BZip2) -- FIND_PACKAGE(BZip2) -+ FIND_PACKAGE(BZip2 REQUIRED) - ELSE() - SET(BZIP2_FOUND FALSE) # Override cached value - ENDIF() -@@ -462,7 +462,8 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) - # Find LZMA - # - IF(ENABLE_LZMA) -- FIND_PACKAGE(LibLZMA) -+ FIND_PACKAGE(LibLZMA REQUIRED) -+ SET(LIBLZMA_LIBRARIES LibLZMA::LibLZMA) - ELSE() - SET(LIBLZMA_FOUND FALSE) # Override cached value - ENDIF() -@@ -470,6 +471,8 @@ ENDIF() +@@ -476,6 +476,8 @@ ENDIF() IF(LIBLZMA_FOUND) SET(HAVE_LIBLZMA 1) SET(HAVE_LZMA_H 1) @@ -30,10 +11,15 @@ index 39b5333..8164d8f 100644 CMAKE_PUSH_CHECK_STATE() INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) -@@ -555,22 +558,15 @@ IF(ENABLE_LZ4) - SET(LZ4_FIND_QUIETLY TRUE) - ENDIF (LZ4_INCLUDE_DIR) - +@@ -556,27 +558,15 @@ ENDIF(LIBB2_FOUND) + # Find LZ4 + # + IF(ENABLE_LZ4) +- IF (LZ4_INCLUDE_DIR) +- # Already in cache, be silent +- SET(LZ4_FIND_QUIETLY TRUE) +- ENDIF (LZ4_INCLUDE_DIR) +- - FIND_PATH(LZ4_INCLUDE_DIR lz4.h) - FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) - INCLUDE(FindPackageHandleStandardArgs) @@ -42,8 +28,7 @@ index 39b5333..8164d8f 100644 ELSE(ENABLE_LZ4) SET(LZ4_FOUND FALSE) # Override cached value ENDIF(ENABLE_LZ4) --IF(LZ4_FOUND) -+IF(lz4_FOUND) + IF(LZ4_FOUND) + SET(HAVE_LZ4HC_H 1) SET(HAVE_LIBLZ4 1) SET(HAVE_LZ4_H 1) @@ -57,10 +42,15 @@ index 39b5333..8164d8f 100644 # # TODO: test for static library. # -@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD) - SET(ZSTD_FIND_QUIETLY TRUE) - ENDIF (ZSTD_INCLUDE_DIR) - +@@ -587,31 +577,21 @@ MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY) + # Find Zstd + # + IF(ENABLE_ZSTD) +- IF (ZSTD_INCLUDE_DIR) +- # Already in cache, be silent +- SET(ZSTD_FIND_QUIETLY TRUE) +- ENDIF (ZSTD_INCLUDE_DIR) +- - FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) - FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) - INCLUDE(FindPackageHandleStandardArgs) @@ -70,59 +60,48 @@ index 39b5333..8164d8f 100644 SET(ZSTD_FOUND FALSE) # Override cached value ENDIF(ENABLE_ZSTD) -IF(ZSTD_FOUND) -+IF(zstd_FOUND) - SET(HAVE_ZSTD_H 1) +- SET(HAVE_ZSTD_H 1) - INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) - CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) - SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) -- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD) +- CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD) +- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD_COMPRESSOR) - # - # TODO: test for static library. - # - CMAKE_POP_CHECK_STATE() ++IF(zstd_FOUND) ++ SET(HAVE_ZSTD_H 1) + SET(HAVE_LIBZSTD 1) ++ SET(HAVE_LIBZSTD_COMPRESSOR 1) + IF(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) + ELSE(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) ++ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) ++ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) + ENDIF(TARGET zstd::libzstd_shared) ENDIF(ZSTD_FOUND) MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) -@@ -773,11 +742,11 @@ ENDIF(ENABLE_NETTLE) - # (Except on Mac, where OpenSSL is deprecated.) - # - IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") -- FIND_PACKAGE(OpenSSL) -- IF(OPENSSL_FOUND) -+ FIND_PACKAGE(OpenSSL REQUIRED) -+ IF(OpenSSL_FOUND) +@@ -783,8 +761,7 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) SET(HAVE_LIBCRYPTO 1) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) + LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) -+ message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") ENDIF(OPENSSL_FOUND) ELSE() SET(OPENSSL_FOUND FALSE) # Override cached value -@@ -896,7 +865,6 @@ main(int argc, char **argv) +@@ -903,7 +880,7 @@ main(int argc, char **argv) IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) - LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ++ #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) -@@ -1128,7 +1096,7 @@ ENDIF(ENABLE_ICONV) - # Find Libxml2 - # - IF(ENABLE_LIBXML2) -- FIND_PACKAGE(LibXml2) -+ FIND_PACKAGE(LibXml2 REQUIRED) - ELSE() - SET(LIBXML2_FOUND FALSE) - ENDIF() diff --git a/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch b/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch index 72ad81394..9003c1e2f 100644 --- a/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch +++ b/external_imported/vcpkg/ports/libarchive/pkgconfig-modules.patch @@ -61,7 +61,7 @@ index 7b6f0ad..18cf15c 100644 # @@ -581,6 +589,7 @@ IF(zstd_FOUND) LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) - SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) + SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) ENDIF(TARGET zstd::libzstd_shared) + STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libzstd") ENDIF(ZSTD_FOUND) @@ -91,8 +91,8 @@ index 7b6f0ad..18cf15c 100644 INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR}) LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR}) -@@ -753,6 +765,11 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") - IF(OpenSSL_FOUND) +@@ -753,5 +765,10 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + IF(OPENSSL_FOUND) SET(HAVE_LIBCRYPTO 1) LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) + IF(WIN32 AND NOT MINGW) @@ -100,7 +100,6 @@ index 7b6f0ad..18cf15c 100644 + ELSE() + STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libcrypto") + ENDIF() - message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") ENDIF(OPENSSL_FOUND) ELSE() @@ -767,6 +780,7 @@ IF(NOT OPENSSL_FOUND) @@ -111,10 +110,11 @@ index 7b6f0ad..18cf15c 100644 CMAKE_POP_CHECK_STATE() # Restore the state of the variables ENDIF(LIBMD_FOUND) ENDIF(NOT OPENSSL_FOUND) -@@ -872,6 +886,11 @@ main(int argc, char **argv) +@@ -872,7 +886,12 @@ main(int argc, char **argv) IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) + #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) + IF(WIN32 AND NOT MINGW) + LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libssl") + ELSE() diff --git a/external_imported/vcpkg/ports/libarchive/portfile.cmake b/external_imported/vcpkg/ports/libarchive/portfile.cmake index 5685a345b..5e82bfd8a 100644 --- a/external_imported/vcpkg/ports/libarchive/portfile.cmake +++ b/external_imported/vcpkg/ports/libarchive/portfile.cmake @@ -1,25 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive - REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2 - SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da + REF 6c3301111caa75c76e1b2acb1afb2d71341932ef #v3.6.1 + SHA512 2fd56ac20e4249807174a2ae29de1cbca55c8f8f247500845f56fd1fd9ebf48c17b8a25a93156df71df9526c0061415ec7d72a6b46bbaca776047e381a2321a7 HEAD_REF master PATCHES disable-warnings.patch fix-buildsystem.patch fix-cpu-set.patch - fix-dependencies.patch + fix-deps.patch pkgconfig-modules.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bzip2 ENABLE_BZip2 + bzip2 CMAKE_REQUIRE_FIND_PACKAGE_BZip2 libxml2 ENABLE_LIBXML2 + libxml2 CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 lz4 ENABLE_LZ4 + lz4 CMAKE_REQUIRE_FIND_PACKAGE_lz4 lzma ENABLE_LZMA + lzma CMAKE_REQUIRE_FIND_PACKAGE_LibLZMA lzo ENABLE_LZO openssl ENABLE_OPENSSL + openssl CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL zstd ENABLE_ZSTD ) diff --git a/external_imported/vcpkg/ports/libarchive/vcpkg.json b/external_imported/vcpkg/ports/libarchive/vcpkg.json index 0a0eb02d5..7a27e9a5d 100644 --- a/external_imported/vcpkg/ports/libarchive/vcpkg.json +++ b/external_imported/vcpkg/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", - "version-semver": "3.5.2", - "port-version": 5, + "version": "3.6.1", + "port-version": 1, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "license": null, diff --git a/external_imported/vcpkg/ports/libass/CMakeLists.txt b/external_imported/vcpkg/ports/libass/CMakeLists.txt index b2331d325..9fb8548cb 100644 --- a/external_imported/vcpkg/ports/libass/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libass/CMakeLists.txt @@ -1,38 +1,63 @@ cmake_minimum_required(VERSION 3.9) project(libass C CXX) -set(LIBASS_VERSION 0.15.1) +set(LIBASS_VERSION 0.16.0) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -if(WIN32) - add_compile_definitions(CONFIG_DIRECTWRITE) -elseif(APPLE) - add_compile_definitions(CONFIG_CORETEXT) -else() - add_compile_definitions(CONFIG_FONTCONFIG) -endif() - add_compile_definitions(CONFIG_FREETYPE) add_compile_definitions(CONFIG_FRIBIDI) add_compile_definitions(CONFIG_HARFBUZZ) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) -set(FONTCONFIG_LIBRARY) + +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) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + #dependency fribidi does not support uwp builds, link gdi32 directly + set(FONT_LIBRARY gdi32) + set(PKG_LIBS_LIBASS -lgdi32) elseif(APPLE) + add_compile_definitions(CONFIG_CORETEXT) list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") + + check_c_source_compiles( + " + #include + int main(void){ + CTFontDescriptorCopyAttribute(NULL, kCTFontURLAttribute); + return 0; + } + " + 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) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") find_package(Fontconfig REQUIRED) - set(FONTCONFIG_LIBRARY Fontconfig::Fontconfig) + set(FONT_LIBRARY Fontconfig::Fontconfig) + set(PKG_REQUIRES_LIBASS "fontconfig >= 2.10.92, ${PKG_REQUIRES_LIBASS}") +endif() + +if (NOT WIN32) + set(PKG_LIBS_LIBASS "${PKG_LIBS_LIBASS} -lm") endif() find_package(Freetype REQUIRED) @@ -45,8 +70,8 @@ find_path(HARFBUZZ_INCLUDE_DIR NAMES hb.h PATH_SUFFIXES harfbuzz) -find_path(DIRENT_INCLUDE_DIR - NAMES dirent.h) +# 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) @@ -64,7 +89,7 @@ target_link_libraries(ass PRIVATE Freetype::Freetype ${FRIBIDI_LIBRARY} ${HARFBUZZ_LIBRARY} - ${FONTCONFIG_LIBRARY}) + ${FONT_LIBRARY}) install(TARGETS ass RUNTIME DESTINATION bin @@ -77,13 +102,12 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) -if(WIN32 OR APPLE) - set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") +if(BUILD_SHARED_LIBS) + set(PKG_REQUIRES_PRIVATE ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PRIVATE ${PKG_LIBS_LIBASS}) else() - set(PKG_REQUIRES_PRIVATE "fontconfig >= 2.10.92, harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") -endif() -if (NOT WIN32) - set(PKG_LIBS_PRIVATE -lm) + set(PKG_REQUIRES_PUBLIC ${PKG_REQUIRES_LIBASS}) + set(PKG_LIBS_PUBLIC ${PKG_LIBS_LIBASS}) endif() configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/external_imported/vcpkg/ports/libass/config.h.in b/external_imported/vcpkg/ports/libass/config.h.in index b1e5b4b6b..ffc4c1b49 100644 --- a/external_imported/vcpkg/ports/libass/config.h.in +++ b/external_imported/vcpkg/ports/libass/config.h.in @@ -1 +1 @@ -#define CONFIG_SOURCEVERSION "tarball: 0.15.1" +#define CONFIG_SOURCEVERSION "tarball: 0.16.0" diff --git a/external_imported/vcpkg/ports/libass/portfile.cmake b/external_imported/vcpkg/ports/libass/portfile.cmake index e1a185a38..45cf6ad53 100644 --- a/external_imported/vcpkg/ports/libass/portfile.cmake +++ b/external_imported/vcpkg/ports/libass/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF 0.15.2 - SHA512 ae3ea533e57ab3c386ce457dbaa39a256801b7340649d5ff80a51410481e73ab194724744b97d85cb6d111798e45eee594bb22da2f1f3c547fe8e331e0690127 + REF 0.16.0 + SHA512 fea93b36d05cd69a5920b603951dd63f46b2434e0dcbb12414bf6e1e584bacc2743fbfc03682d0a672bbfe9bcc057452a942f9967d95a30e535bd3694e40fc7d HEAD_REF master ) @@ -15,11 +15,11 @@ 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) +) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libass/vcpkg.json b/external_imported/vcpkg/ports/libass/vcpkg.json index f4b282167..31d51e293 100644 --- a/external_imported/vcpkg/ports/libass/vcpkg.json +++ b/external_imported/vcpkg/ports/libass/vcpkg.json @@ -1,19 +1,20 @@ { "name": "libass", - "version": "0.15.2", + "version": "0.16.0", "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", "dependencies": [ - { - "name": "dirent", - "platform": "windows" - }, { "name": "fontconfig", "platform": "linux" }, "freetype", "fribidi", - "harfbuzz" + "harfbuzz", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake b/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake index 357a590f2..239de3c26 100644 --- a/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake +++ b/external_imported/vcpkg/ports/libatomic-ops/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + OPTIONS + -Denable_docs=OFF OPTIONS_DEBUG -Dinstall_headers=OFF ) @@ -17,8 +18,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME atomic_ops CONFIG_PATH lib/cmake/atomic_ops) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json b/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json index 7bbf9dcd6..46fcf653c 100644 --- a/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json +++ b/external_imported/vcpkg/ports/libatomic-ops/vcpkg.json @@ -1,7 +1,10 @@ { "name": "libatomic-ops", "version": "7.7.0", + "port-version": 1, "description": "The atomic_ops project (Atomic memory update operations portable implementation)", + "homepage": "https://github.com/ivmai/libatomic_ops", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch b/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch new file mode 100644 index 000000000..76e4d4b04 --- /dev/null +++ b/external_imported/vcpkg/ports/libavif/fix-compiler-warnings.patch @@ -0,0 +1,22 @@ +diff --git a/src/read.c b/src/read.c +index 8d39b07..6289fa4 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -940,7 +940,7 @@ static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const a + return AVIF_RESULT_BMFF_PARSE_FAILED; + } + startOffset += remainingOffset; +- extentSize -= remainingOffset; ++ extentSize -= (size_t)remainingOffset; + remainingOffset = 0; + } + } +@@ -3085,7 +3085,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp + + avifDecoderItem * item = avifMetaFindItem(decoder->data->meta, sample->itemID); + avifROData itemContents; +- avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, sample->offset, bytesToRead, &decoder->diag); ++ avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, (size_t)sample->offset, bytesToRead, &decoder->diag); + if (readResult != AVIF_RESULT_OK) { + return readResult; + } diff --git a/external_imported/vcpkg/ports/libavif/portfile.cmake b/external_imported/vcpkg/ports/libavif/portfile.cmake index 48081c53b..10a113074 100644 --- a/external_imported/vcpkg/ports/libavif/portfile.cmake +++ b/external_imported/vcpkg/ports/libavif/portfile.cmake @@ -1,15 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif - REF v0.9.2 - SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75 + REF f938f6b7dd412ffcbdab1808a265b6375dc7b037 #v0.10.1 + SHA512 d4e01edb9891df0b0abc4a1d621287bce6ba38248a7ae458abd73c268b000557a52a5aa6be1fc715b694c8e48166aee458a371d806d5f28160c50ff653420e79 HEAD_REF master PATCHES disable-source-utf8.patch + fix-compiler-warnings.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DAVIF_CODEC_AOM=ON -DAVIF_BUILD_APPS=OFF @@ -26,8 +27,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() # Remove duplicate files -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") # 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/external_imported/vcpkg/ports/libavif/vcpkg.json b/external_imported/vcpkg/ports/libavif/vcpkg.json index dbad25be0..4b84963e1 100644 --- a/external_imported/vcpkg/ports/libavif/vcpkg.json +++ b/external_imported/vcpkg/ports/libavif/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libavif", - "version-semver": "0.9.2", - "port-version": 1, + "version-semver": "0.10.1", "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", + "license": "BSD-2-Clause AND Apache-2.0", "dependencies": [ "aom", "libyuv", diff --git a/external_imported/vcpkg/ports/libbf/portfile.cmake b/external_imported/vcpkg/ports/libbf/portfile.cmake index a50abed94..7aa235a24 100644 --- a/external_imported/vcpkg/ports/libbf/portfile.cmake +++ b/external_imported/vcpkg/ports/libbf/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libbf does not support MSVC") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mavam/libbf @@ -10,16 +6,13 @@ 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(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/libbf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libbf/vcpkg.json b/external_imported/vcpkg/ports/libbf/vcpkg.json index 1b184fddf..ec43ed92a 100644 --- a/external_imported/vcpkg/ports/libbf/vcpkg.json +++ b/external_imported/vcpkg/ports/libbf/vcpkg.json @@ -1,6 +1,14 @@ { "name": "libbf", - "version-string": "1.0.0", - "port-version": 2, - "description": "Bloom filters for C++11." + "version": "1.0.0", + "port-version": 3, + "description": "Bloom filters for C++11.", + "license": "BSD-3-Clause", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libcaer/portfile.cmake b/external_imported/vcpkg/ports/libcaer/portfile.cmake new file mode 100644 index 000000000..5cc697d5e --- /dev/null +++ b/external_imported/vcpkg/ports/libcaer/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation/ + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/libcaer + REF 933dfa60a138091afb03014f8c24183bab7bba4e + SHA512 6e74e308833ca3c923b318a42bab30edb04f763cdd5b243701416b72278d7315fdd8a62ebb87b704212507f76c3e45bc9728df17ea2d1eab5133dfcf550c8c35 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DENABLE_OPENCV=ON + -DEXAMPLES_INSTALL=OFF + -DBUILD_CONFIG_VCPKG=ON +) +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "libcaer" CONFIG_PATH "share/libcaer") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libcaer/vcpkg.json b/external_imported/vcpkg/ports/libcaer/vcpkg.json new file mode 100644 index 000000000..7518099fa --- /dev/null +++ b/external_imported/vcpkg/ports/libcaer/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "libcaer", + "version-date": "2022-07-25", + "port-version": 1, + "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", + "dependencies": [ + "libusb", + "opencv4", + "pkgconf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/libcbor/portfile.cmake b/external_imported/vcpkg/ports/libcbor/portfile.cmake index 252a70868..dfdd89a84 100644 --- a/external_imported/vcpkg/ports/libcbor/portfile.cmake +++ b/external_imported/vcpkg/ports/libcbor/portfile.cmake @@ -1,29 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PJK/libcbor - REF v0.8.0 - SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc + REF v0.9.0 + SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DWITH_TESTS=OFF -DWITH_EXAMPLES=OFF -DVCPKG_VERBOSE=ON - ) + -DSANITIZE=OFF + -DCBOR_CUSTOM_ALLOC=ON +) -vcpkg_build_cmake() -vcpkg_install_cmake() +vcpkg_cmake_build() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Add Cmake Packagefile -file(COPY ${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libcbor/vcpkg.json b/external_imported/vcpkg/ports/libcbor/vcpkg.json index 90c54499d..25d7c8c5e 100644 --- a/external_imported/vcpkg/ports/libcbor/vcpkg.json +++ b/external_imported/vcpkg/ports/libcbor/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcbor", - "version": "0.8.0", - "port-version": 1, + "version": "0.9.0", "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format", - "homepage": "https://github.com/PJK/libcbor" + "homepage": "https://github.com/PJK/libcbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libcds/vcpkg.json b/external_imported/vcpkg/ports/libcds/vcpkg.json index 2464e61ce..ceb4e56a2 100644 --- a/external_imported/vcpkg/ports/libcds/vcpkg.json +++ b/external_imported/vcpkg/ports/libcds/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libcds", - "version-string": "2.3.3", - "port-version": 1, + "version": "2.3.3", + "port-version": 2, "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" diff --git a/external_imported/vcpkg/ports/libcerf/portfile.cmake b/external_imported/vcpkg/ports/libcerf/portfile.cmake index 1054bf5c8..aada71bd4 100644 --- a/external_imported/vcpkg/ports/libcerf/portfile.cmake +++ b/external_imported/vcpkg/ports/libcerf/portfile.cmake @@ -16,18 +16,22 @@ vcpkg_extract_source_archive_ex( PATCHES 001-fix-static-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DCERF_CPP=ON -DLIB_MAN=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libcerf" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libcerf/vcpkg.json b/external_imported/vcpkg/ports/libcerf/vcpkg.json index 3d134faac..2788bc96d 100644 --- a/external_imported/vcpkg/ports/libcerf/vcpkg.json +++ b/external_imported/vcpkg/ports/libcerf/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcerf", - "version-string": "1.13", - "port-version": 2, + "version": "1.13", + "port-version": 3, "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" + "homepage": "https://jugit.fz-juelich.de/mlz/libcerf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libcopp/fix-x86-windows.patch b/external_imported/vcpkg/ports/libcopp/fix-x86-windows.patch new file mode 100644 index 000000000..2e68b0879 --- /dev/null +++ b/external_imported/vcpkg/ports/libcopp/fix-x86-windows.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,12 +11,17 @@ + libcopp + VERSION "1.4.1" + DESCRIPTION "Cross-platform coroutine library in C++ ." + HOMEPAGE_URL "https://libcopp.atframe.work" + LANGUAGES C CXX ASM) + ++# libcopp requires x86 to be called i386 ++if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") ++ set(CMAKE_SYSTEM_PROCESSOR i386) ++endif() ++ + # ###################################################################################################################### + include("${PROJECT_SOURCE_DIR}/project/cmake/ProjectBuildOption.cmake") + + # # ############################################################################# + echowithcolor(COLOR GREEN "-- Build Type: ${CMAKE_BUILD_TYPE}") + diff --git a/external_imported/vcpkg/ports/libcopp/portfile.cmake b/external_imported/vcpkg/ports/libcopp/portfile.cmake index c989a2da6..1433a7f7c 100644 --- a/external_imported/vcpkg/ports/libcopp/portfile.cmake +++ b/external_imported/vcpkg/ports/libcopp/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF 1.4.1 SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae HEAD_REF v2 + PATCHES fix-x86-windows.patch ) # atframework/cmake-toolset needed as a submodule for configure cmake diff --git a/external_imported/vcpkg/ports/libcopp/vcpkg.json b/external_imported/vcpkg/ports/libcopp/vcpkg.json index 1f6ff2c84..5e1d7bc73 100644 --- a/external_imported/vcpkg/ports/libcopp/vcpkg.json +++ b/external_imported/vcpkg/ports/libcopp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcopp", "version-semver": "1.4.1", - "port-version": 1, + "port-version": 2, "maintainers": "owent ", "description": "A cross-platfrom coroutine library for C++", "homepage": "https://github.com/owent/libcopp", diff --git a/external_imported/vcpkg/ports/libcuckoo/portfile.cmake b/external_imported/vcpkg/ports/libcuckoo/portfile.cmake index 67c8f445e..0d4e9870c 100644 --- a/external_imported/vcpkg/ports/libcuckoo/portfile.cmake +++ b/external_imported/vcpkg/ports/libcuckoo/portfile.cmake @@ -1,16 +1,16 @@ -# Header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efficient/libcuckoo - REF 8785773896d74f72b6224e59d37f5f8c3c1e022a - SHA512 e47f8fd132ee2acf347ee375759f96235cd090fdb825792f994ff5eb4d8fed55b8e8bea8d293ec96c1a5f1b46d19c6648eaf2482e482b7b9c0d6dc734bc2121d + REF ea8c36c65bf9cf83aaf6b0db971248c6ae3686cf + SHA512 5c36ebf6047afb3fa980049dc2e38b8e34443d40cff7ba9b7ee1fa8b78ff3dd92b2d0a346667a71eec6d0bfc917b3080c883146f97681f20f71ce618eac3f37f HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +# header-only library +set(VCPKG_BUILD_TYPE release) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF @@ -19,11 +19,8 @@ vcpkg_configure_cmake( -DBUILD_UNIVERSAL_BENCHMARK=OFF ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libcuckoo/vcpkg.json b/external_imported/vcpkg/ports/libcuckoo/vcpkg.json index 49f4312ea..bdec46152 100644 --- a/external_imported/vcpkg/ports/libcuckoo/vcpkg.json +++ b/external_imported/vcpkg/ports/libcuckoo/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libcuckoo", - "version-string": "0.3", - "port-version": 1, + "version": "0.3.1", "description": "A high-performance, concurrent hash table", - "homepage": "https://github.com/efficient/libcuckoo" + "homepage": "https://github.com/efficient/libcuckoo", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch b/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch index 9c8e45f2f..25eb2905f 100644 --- a/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/external_imported/vcpkg/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c0e59d1..1d71e38 100644 +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(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -197,12 +196,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +@@ -200,12 +199,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) @@ -22,11 +22,12 @@ index c0e59d1..1d71e38 100644 if(SCTP_DEBUG) add_definitions(-DSCTP_DEBUG) endif() ++ +if(0) - option(sctp_build_programs 0) - option(sctp_build_shared_lib 0) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -@@ -214,8 +214,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + 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) @@ -37,7 +38,7 @@ index c0e59d1..1d71e38 100644 ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -239,16 +240,18 @@ target_include_directories(datachannel PUBLIC +@@ -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) @@ -58,18 +59,3 @@ index c0e59d1..1d71e38 100644 if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -351,11 +354,11 @@ else() - target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) - else() -- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) -+ find_package(LibJuice CONFIG REQUIRED) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) - target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) -- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) -- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) -+ target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) - endif() - endif() - diff --git a/external_imported/vcpkg/ports/libdatachannel/portfile.cmake b/external_imported/vcpkg/ports/libdatachannel/portfile.cmake index b41e17cc5..a81a4c1c8 100644 --- a/external_imported/vcpkg/ports/libdatachannel/portfile.cmake +++ b/external_imported/vcpkg/ports/libdatachannel/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4 - SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454 + REF 04cf4738961f55ba3f0aa39b4a61342f66bb3781 #v0.17.10 + SHA512 766650c091326b7fcca2627fa5957db303a1157f8d514cce07fc15f539152683919b29ea23a486e755915b8225d678648c05a2fb60a5d7f05786e4d93f1ff409 HEAD_REF master PATCHES ${PATCHES} @@ -27,6 +27,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DUSE_SYSTEM_SRTP=ON + -DUSE_SYSTEM_JUICE=ON -DNO_EXAMPLES=ON -DNO_TESTS=ON ) diff --git a/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch index 023bf888e..560040a4e 100644 --- a/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch +++ b/external_imported/vcpkg/ports/libdatachannel/uwp-warnings.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b79b458..790bf95 100644 +index 4347b6a..e3d6d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) +@@ -394,6 +394,9 @@ if(WARNINGS_AS_ERRORS) endif() endif() diff --git a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json index 3f67b93a4..2fefee9e0 100644 --- a/external_imported/vcpkg/ports/libdatachannel/vcpkg.json +++ b/external_imported/vcpkg/ports/libdatachannel/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libdatachannel", - "version-semver": "0.16.4", - "port-version": 1, + "version-semver": "0.17.10", "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": "LGPL-2.1-only", "dependencies": [ "libjuice", "openssl", diff --git a/external_imported/vcpkg/ports/libdc1394/fix-macosx.patch b/external_imported/vcpkg/ports/libdc1394/fix-macosx.patch new file mode 100644 index 000000000..9e626e149 --- /dev/null +++ b/external_imported/vcpkg/ports/libdc1394/fix-macosx.patch @@ -0,0 +1,11 @@ +--- a/dc1394/macosx/Makefile.in ++++ b/dc1394/macosx/Makefile.in +@@ -119,7 +119,7 @@ AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I.@am__isrc@/.. -I.@am__isrc@/../.. + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f diff --git a/external_imported/vcpkg/ports/libdc1394/portfile.cmake b/external_imported/vcpkg/ports/libdc1394/portfile.cmake index 2cc7f3d33..64856f91f 100644 --- a/external_imported/vcpkg/ports/libdc1394/portfile.cmake +++ b/external_imported/vcpkg/ports/libdc1394/portfile.cmake @@ -6,17 +6,26 @@ vcpkg_from_sourceforge( REF "${LIBDC1394_VER}" FILENAME "libdc1394-${LIBDC1394_VER}.tar.gz" SHA512 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 + PATCHES + fix-macosx.patch ) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS "--disable-examples" + OPTIONS + "--disable-examples" + ac_cv_lib_raw1394_raw1394_channel_modify=no + ac_cv_path_SDL_CONFIG=no ) vcpkg_install_make() + +file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdc1394-2.pc" "\nRequires.private: libusb-1.0\n") +if(NOT VCPKG_BUILD_TYPE) + file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdc1394-2.pc" "\nRequires.private: libusb-1.0\n") +endif() vcpkg_fixup_pkgconfig() 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/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libdc1394/vcpkg.json b/external_imported/vcpkg/ports/libdc1394/vcpkg.json index d48cd5a55..34ff812ba 100644 --- a/external_imported/vcpkg/ports/libdc1394/vcpkg.json +++ b/external_imported/vcpkg/ports/libdc1394/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libdc1394", "version": "2.2.6", + "port-version": 1, "description": "libdc1394 is a library that provides a complete high level application programming interface (API) for developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specifications (also known as the IIDC or DCAM Specifications).", "homepage": "https://damien.douxchamps.net/ieee1394/libdc1394", "supports": "!windows", "dependencies": [ - "sdl1" + "libusb" ] } diff --git a/external_imported/vcpkg/ports/libe57/portfile.cmake b/external_imported/vcpkg/ports/libe57/portfile.cmake index c260430d6..afb1b4af4 100644 --- a/external_imported/vcpkg/ports/libe57/portfile.cmake +++ b/external_imported/vcpkg/ports/libe57/portfile.cmake @@ -1,5 +1,5 @@ set(VERSION 1.1.332) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -13,11 +13,10 @@ vcpkg_from_sourceforge( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/libe57) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/libe57") vcpkg_cmake_install() vcpkg_cmake_config_fixup() @@ -28,5 +27,7 @@ vcpkg_copy_tools( AUTO_CLEAN ) -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(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/CHANGES.TXT") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/e57refimpl/README.TXT") diff --git a/external_imported/vcpkg/ports/libe57/vcpkg.json b/external_imported/vcpkg/ports/libe57/vcpkg.json index eb35fdaab..03f74169f 100644 --- a/external_imported/vcpkg/ports/libe57/vcpkg.json +++ b/external_imported/vcpkg/ports/libe57/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libe57", "version-semver": "1.1.332", - "port-version": 1, + "port-version": 2, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/libffi/CMakeLists.txt b/external_imported/vcpkg/ports/libffi/CMakeLists.txt index f69edfc89..ca4fe1631 100644 --- a/external_imported/vcpkg/ports/libffi/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libffi/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # config variables for ffi.h.in set(VERSION 3.4.2) -set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64) +set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64 mips64el) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) @@ -29,6 +29,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUA set(TARGET X86_WIN64) elseif(lower_system_processor MATCHES "arm64|aarch64") set(TARGET ARM64) +elseif(lower_system_processor MATCHES "mips64") + set(TARGET MIPS64) elseif(lower_system_processor MATCHES "arm") set(TARGET ARM) elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) @@ -43,7 +45,7 @@ else() message(FATAL_ERROR "Cannot determine target. Please consult ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac and add your platform to this CMake file.") endif() -if("${TARGET}" STREQUAL "X86_64") +if("${TARGET}" STREQUAL "X86_64" OR "${TARGET}" STREQUAL "MIPS64") set(HAVE_LONG_DOUBLE 1) else() set(HAVE_LONG_DOUBLE 0) @@ -58,6 +60,8 @@ if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") file(COPY src/aarch64/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) elseif ("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") file(COPY src/arm/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) +elseif ("${TARGET}" MATCHES "MIPS") + file(COPY src/mips/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) else() file(COPY src/x86/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) endif() @@ -85,6 +89,10 @@ elseif("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") set(FFI_SOURCES ${FFI_SOURCES} src/arm/ffi.c) +elseif("${TARGET}" MATCHES "MIPS") + set(FFI_SOURCES + ${FFI_SOURCES} + src/mips/ffi.c) else() set(FFI_SOURCES ${FFI_SOURCES} @@ -189,6 +197,8 @@ elseif("${TARGET}" STREQUAL "ARM_WIN64") endif() elseif("${TARGET}" STREQUAL "ARM64") add_assembly(src/aarch64/sysv.S) +elseif("${TARGET}" MATCHES "MIPS") + add_assembly(src/mips/n32.S) else() message(FATAL_ERROR "Target not implemented") endif() diff --git a/external_imported/vcpkg/ports/libffi/portfile.cmake b/external_imported/vcpkg/ports/libffi/portfile.cmake index 7e397e685..81bce85ba 100644 --- a/external_imported/vcpkg/ports/libffi/portfile.cmake +++ b/external_imported/vcpkg/ports/libffi/portfile.cmake @@ -3,7 +3,7 @@ set(VERSION 3.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libffi/libffi - REF v${VERSION} + REF "v${VERSION}" SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388 HEAD_REF master ) @@ -13,9 +13,8 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURC vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h + "-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h" OPTIONS_DEBUG -DFFI_SKIP_HEADERS=ON ) diff --git a/external_imported/vcpkg/ports/libffi/vcpkg.json b/external_imported/vcpkg/ports/libffi/vcpkg.json index 83130d841..aeaad6d63 100644 --- a/external_imported/vcpkg/ports/libffi/vcpkg.json +++ b/external_imported/vcpkg/ports/libffi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 4, + "port-version": 6, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libflac/portfile.cmake b/external_imported/vcpkg/ports/libflac/portfile.cmake index cb88d8525..39e605592 100644 --- a/external_imported/vcpkg/ports/libflac/portfile.cmake +++ b/external_imported/vcpkg/ports/libflac/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/flac - REF ce6dd6b5732e319ef60716d9cc9af6a836a4011a - SHA512 d0d3b5451f8d74aa0a0832fbe95cca55597ce9654765a95adaac98ecd0da9e803b98551a40a3fb3fd5b86bc5f40cd1a791127c03da5322e7f01e7fa761171a21 + REF 1151c93e992bb8c7c6394e04aa880d711c531c7f #1.3.4 + SHA512 ebf8de3dbd8fc2153af2f4a05ecc04817570233c30e0ec1fbdbc99f810860801b951248ca6404152cba4038f5839985f4076bcee477c00fd23bd583a45b89b17 HEAD_REF master PATCHES uwp-library-console.patch @@ -19,39 +19,37 @@ else() endif() if("asm" IN_LIST FEATURES) - if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Feature asm only supports x86 architecture.") - endif() - VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) + GET_FILENAME_COMPONENT(NASM_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path("${NASM_PATH}") endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - asm WITH_ASM + FEATURES + asm WITH_ASM ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF - -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) + -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR} + -DINSTALL_MANPAGES=OFF +) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME FLAC CONFIG_PATH share/FLAC/cmake) -vcpkg_fixup_cmake_targets( - CONFIG_PATH share/FLAC/cmake - TARGET_PATH share/FLAC -) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/LICENSE") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC/export.h" @@ -72,18 +70,15 @@ else() "#if 1" ) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac.pc" "Version:" "Version: 1.3.3") + if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac.pc" " -lm" "") -endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/flac++.pc" "Version:" "Version: 1.3.3") -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" "Version:" "Version: 1.3.3") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac++.pc" "Version:" "Version: 1.3.3") - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" " -lm" "") + + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/flac.pc" " -lm" "") endif() endif() + vcpkg_fixup_pkgconfig() # This license (BSD) is relevant only for library - if someone would want to install diff --git a/external_imported/vcpkg/ports/libflac/vcpkg.json b/external_imported/vcpkg/ports/libflac/vcpkg.json index f2fc15189..ee275816a 100644 --- a/external_imported/vcpkg/ports/libflac/vcpkg.json +++ b/external_imported/vcpkg/ports/libflac/vcpkg.json @@ -1,15 +1,25 @@ { "name": "libflac", - "version": "1.3.3", - "port-version": 7, + "version": "1.3.4", + "port-version": 1, "description": "Library for manipulating FLAC files", "homepage": "https://xiph.org/flac/", + "license": "GFDL-1.2-or-later", "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "asm": { - "description": "Use any assembly optimization routines" + "description": "Use any assembly optimization routines", + "supports": "x86" } } } diff --git a/external_imported/vcpkg/ports/libfontenc/build.patch b/external_imported/vcpkg/ports/libfontenc/build.patch new file mode 100644 index 000000000..c5e1b7501 --- /dev/null +++ b/external_imported/vcpkg/ports/libfontenc/build.patch @@ -0,0 +1,38 @@ +diff --git a/src/encparse.c b/src/encparse.c +index 548110ede..61952b9ce 100644 +--- a/src/encparse.c ++++ b/src/encparse.c +@@ -28,12 +28,16 @@ THE SOFTWARE. + to be pure ASCII. Bloody ``Code Set Independence''. */ + + #include ++#ifndef _MSC_VER + #include ++#else ++#define strcasecmp _stricmp ++#endif + #include + + #include + +-#include "zlib.h" ++#include + typedef gzFile FontFilePtr; + + #define FontFileGetc(f) gzgetc(f) +diff --git a/src/fontenc.c b/src/fontenc.c +index c4ccd5eb0..e87d1089d 100644 +--- a/src/fontenc.c ++++ b/src/fontenc.c +@@ -23,7 +23,11 @@ THE SOFTWARE. + /* Backend-independent encoding code */ + + #include ++#ifndef _MSC_VER + #include ++#else ++#define strcasecmp _stricmp ++#endif + #include + + #define FALSE 0 diff --git a/external_imported/vcpkg/ports/libfontenc/configure.ac.patch b/external_imported/vcpkg/ports/libfontenc/configure.ac.patch new file mode 100644 index 000000000..2a9fa85a8 --- /dev/null +++ b/external_imported/vcpkg/ports/libfontenc/configure.ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index cadc653a0..aa645af81 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,7 +47,7 @@ XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings]) + # zlib + AC_CHECK_HEADER([zlib.h], [], + AC_MSG_FAILURE([zlib.h is required to compile libfontenc])) +-AC_CHECK_LIB(z, gzclose, [], ++AC_SEARCH_LIBS(gzclose, [z zlib zlibd], [], + AC_MSG_FAILURE([zlib is required to compile libfontenc])) + + # Obtain compiler/linker options for depedencies diff --git a/external_imported/vcpkg/ports/libfontenc/portfile.cmake b/external_imported/vcpkg/ports/libfontenc/portfile.cmake new file mode 100644 index 000000000..9b29d4893 --- /dev/null +++ b/external_imported/vcpkg/ports/libfontenc/portfile.cmake @@ -0,0 +1,32 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfontenc + REF 2baea13978759d1a011fc6d739465893b554d30a #1.1.4 + SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e + HEAD_REF master + PATCHES configure.ac.patch + build.patch +) +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libfontenc/vcpkg.json b/external_imported/vcpkg/ports/libfontenc/vcpkg.json new file mode 100644 index 000000000..c34079afe --- /dev/null +++ b/external_imported/vcpkg/ports/libfontenc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libfontenc", + "version": "1.1.4", + "description": "X font encoding library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libfontenc", + "license": null, + "dependencies": [ + "font-util", + "xorg-macros", + "xproto", + "zlib" + ] +} diff --git a/external_imported/vcpkg/ports/libfreenect2/fix-macbuild.patch b/external_imported/vcpkg/ports/libfreenect2/fix-macbuild.patch new file mode 100644 index 000000000..cb675a669 --- /dev/null +++ b/external_imported/vcpkg/ports/libfreenect2/fix-macbuild.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aedc576..4f16abc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -165,6 +165,8 @@ SET(LIBFREENECT2_DLLS + SET(HAVE_VideoToolbox "no (Apple only)") + IF(APPLE) + FIND_LIBRARY(VIDEOTOOLBOX_LIBRARY VideoToolbox) ++ FIND_LIBRARY(CF_LIBRARY CoreFoundation) ++ FIND_LIBRARY(IOK_LIBRARY IOKit) + + SET(HAVE_VideoToolbox no) + IF(VIDEOTOOLBOX_LIBRARY) +@@ -184,6 +186,8 @@ IF(APPLE) + ${COREFOUNDATION_LIBRARY} + ${COREMEDIA_LIBRARY} + ${COREVIDEO_LIBRARY} ++ ${CF_LIBRARY} ++ ${IOK_LIBRARY} + ) + ENDIF(VIDEOTOOLBOX_LIBRARY) + ENDIF(APPLE) diff --git a/external_imported/vcpkg/ports/libfreenect2/portfile.cmake b/external_imported/vcpkg/ports/libfreenect2/portfile.cmake index ba35cee15..a235bc592 100644 --- a/external_imported/vcpkg/ports/libfreenect2/portfile.cmake +++ b/external_imported/vcpkg/ports/libfreenect2/portfile.cmake @@ -4,41 +4,39 @@ vcpkg_from_github( REF v0.2.0 SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666 HEAD_REF master - PATCHES fix-dependency-libusb.patch + PATCHES + fix-dependency-libusb.patch + fix-macbuild.patch ) -file(READ ${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake FINDLIBUSB) +file(READ "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" FINDLIBUSB) string(REPLACE "(WIN32)" "(WIN32_DISABLE)" FINDLIBUSB "${FINDLIBUSB}") -file(WRITE ${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake "${FINDLIBUSB}") - -file(READ ${SOURCE_PATH}/examples/CMakeLists.txt EXAMPLECMAKE) -string(REPLACE "(WIN32)" - "(WIN32_DISABLE)" EXAMPLECMAKE "${EXAMPLECMAKE}") -file(WRITE ${SOURCE_PATH}/examples/CMakeLists.txt "${EXAMPLECMAKE}") +file(WRITE "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" "${FINDLIBUSB}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - opengl ENABLE_OPENGL - opencl ENABLE_OPENCL + FEATURES + opengl ENABLE_OPENGL + opencl ENABLE_OPENCL + openni2 BUILD_OPENNI2_DRIVER ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_CUDA=OFF - # FEATURES + -DBUILD_EXAMPLES=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/freenect2 TARGET_PATH share/freenect2) +vcpkg_cmake_config_fixup(PACKAGE_NAME freenect2 CONFIG_PATH lib/cmake/freenect2) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/GPL2 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libfreenect2/vcpkg.json b/external_imported/vcpkg/ports/libfreenect2/vcpkg.json index fda7d64da..cbeaef735 100644 --- a/external_imported/vcpkg/ports/libfreenect2/vcpkg.json +++ b/external_imported/vcpkg/ports/libfreenect2/vcpkg.json @@ -1,12 +1,21 @@ { "name": "libfreenect2", - "version-string": "0.2.0", - "port-version": 7, + "version": "0.2.0", + "port-version": 9, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", + "license": "GPL-2.0-only", "dependencies": [ "libjpeg-turbo", - "libusb" + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "opengl" @@ -24,6 +33,12 @@ "glfw3", "opengl" ] + }, + "openni2": { + "description": "OpenNI2 support for libfreenect2", + "dependencies": [ + "openni2" + ] } } } diff --git a/external_imported/vcpkg/ports/libfs/portfile.cmake b/external_imported/vcpkg/ports/libfs/portfile.cmake new file mode 100644 index 000000000..75b3c6db4 --- /dev/null +++ b/external_imported/vcpkg/ports/libfs/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfs + REF 02de7390e58f00a3701f656a2b205dc6c8dafb58 # 1.0.8 + SHA512 7395434c20cebc45213122c12dc272773d100ade606d6fb2cacf94e2d102c9869124a89dbd0ddf2fa9128e8b238cf2f52b89d356b296e8d95ff352be48a4bc54 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libfs/vcpkg.json b/external_imported/vcpkg/ports/libfs/vcpkg.json new file mode 100644 index 000000000..8cbaa03cc --- /dev/null +++ b/external_imported/vcpkg/ports/libfs/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libfs", + "version": "1.0.8", + "description": "X Font Service client library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libfs", + "license": null, + "supports": "!windows", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto", + "xtrans" + ] +} diff --git a/external_imported/vcpkg/ports/libgcrypt/portfile.cmake b/external_imported/vcpkg/ports/libgcrypt/portfile.cmake index 774868592..b1fe32634 100644 --- a/external_imported/vcpkg/ports/libgcrypt/portfile.cmake +++ b/external_imported/vcpkg/ports/libgcrypt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.gnupg.org/libgcrypt.git - FETCH_REF libgcrypt-1.9.4 - REF 05422ca24a0391dad2a0b7790a904ce348819c10 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=05422ca24a0391dad2a0b7790a904ce348819c10 + FETCH_REF libgcrypt-1.10.1 + REF ae0e567820c37f9640440b3cff77d7c185aa6742 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=tag;h=a8a888c9d2ed8a25ff502b104860a1bac4c4f73c HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/libgcrypt/vcpkg.json b/external_imported/vcpkg/ports/libgcrypt/vcpkg.json index f70325d4f..af8486011 100644 --- a/external_imported/vcpkg/ports/libgcrypt/vcpkg.json +++ b/external_imported/vcpkg/ports/libgcrypt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgcrypt", - "version": "1.9.4", - "port-version": 2, + "version": "1.10.1", "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "supports": "linux | osx", diff --git a/external_imported/vcpkg/ports/libgd/0001-fix-cmake.patch b/external_imported/vcpkg/ports/libgd/0001-fix-cmake.patch index 4446eb60d..eec9d982f 100644 --- a/external_imported/vcpkg/ports/libgd/0001-fix-cmake.patch +++ b/external_imported/vcpkg/ports/libgd/0001-fix-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57cd95d..50d5b9a 100644 +index 6b3e5b3..cf80322 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -280,8 +280,10 @@ else (USE_EXT_GD) +@@ -298,8 +298,10 @@ else (USE_EXT_GD) add_subdirectory(src) endif (USE_EXT_GD) @@ -12,10 +12,10 @@ index 57cd95d..50d5b9a 100644 + add_subdirectory(tests) + add_subdirectory(examples) +endif() + add_subdirectory(docs) add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) - -@@ -298,7 +300,7 @@ else(WIN32) +@@ -317,7 +319,7 @@ else(WIN32) set(CPACK_GENERATOR TGZ) endif(WIN32) @@ -24,7 +24,7 @@ index 57cd95d..50d5b9a 100644 INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) -@@ -320,7 +322,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ +@@ -339,7 +341,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) @@ -34,34 +34,36 @@ index 57cd95d..50d5b9a 100644 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 509c422..97a2976 100644 +index 3839bc7..f7dabf7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS) +@@ -76,7 +76,7 @@ if (BUILD_STATIC_LIBS) if (UNIX) set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) endif() -endif() ++ if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "") add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES}) -@@ -117,6 +116,7 @@ if (MINGW OR MSYS) - set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) - endif() - endif (MINGW OR MSYS) -+endif() +@@ -90,6 +90,7 @@ if (WIN32 AND NOT MINGW AND NOT MSYS) + endif() - INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src") + ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) ++endif() -@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES + if (MINGW OR MSYS) + ADD_DEFINITIONS("-mms-bitfields") +@@ -127,7 +128,7 @@ SET(LIBS_PRIVATES + ${LIQ_LIBRARIES} ${WEBP_LIBRARIES} ) - +- +if(BUILD_PROGRAMS) set(GD_PROGRAMS gdcmpgif) if (PNG_FOUND) -@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS}) +@@ -168,6 +169,9 @@ foreach(program ${GD_PROGRAMS}) endif() endforeach(program) @@ -71,12 +73,12 @@ index 509c422..97a2976 100644 set(GD_INSTALL_TARGETS ${GD_PROGRAMS}) if (BUILD_SHARED_LIBS) set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB}) -@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} +@@ -180,7 +184,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(PROGRAMS bdftogd DESTINATION bin) + install(FILES - entities.h gd.h + gd_color_map.h diff --git a/external_imported/vcpkg/ports/libgd/fix_msvc_build.patch b/external_imported/vcpkg/ports/libgd/fix_msvc_build.patch index e46a81f89..d9ad10965 100644 --- a/external_imported/vcpkg/ports/libgd/fix_msvc_build.patch +++ b/external_imported/vcpkg/ports/libgd/fix_msvc_build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17ddf6b..7fe1e6b 100644 +index 6b3e5b3..966ddb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ else (USE_EXT_GD) +@@ -134,7 +134,7 @@ else (USE_EXT_GD) endif (ENABLE_ICONV) IF (ENABLE_WEBP) @@ -12,10 +12,10 @@ index 17ddf6b..7fe1e6b 100644 IF (ENABLE_HEIF) diff --git a/src/config.h.cmake b/src/config.h.cmake -index 2b46a17..af98d23 100644 +index 0542942..e9cfde1 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake -@@ -139,3 +139,8 @@ +@@ -142,3 +142,8 @@ /* Version number of package */ #cmakedefine VERSION @@ -25,37 +25,3 @@ index 2b46a17..af98d23 100644 + #define SSIZE_MAX MAXSSIZE_T +#endif \ No newline at end of file -diff --git a/src/gd_intern.h b/src/gd_intern.h -index f8f3b5d..380f4db 100644 ---- a/src/gd_intern.h -+++ b/src/gd_intern.h -@@ -29,6 +29,14 @@ - # endif - #endif - -+#ifdef _MSC_VER -+#define ssize_t SSIZE_T -+#define MAXSIZE_T ((SIZE_T)~ ((SIZE_T)0)) -+#define MAXSSIZE_T ((SSIZE_T) (MAXSIZE_T >> 1)) -+#define MINSSIZE_T ((SSIZE_T)~MAXSSIZE_T) -+#define SSIZE_MAX MAXSSIZE_T -+#endif -+ - #include "gd.h" - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff --git a/src/getopt.c b/src/getopt.c -index 8651b87..00bccde 100644 ---- a/src/getopt.c -+++ b/src/getopt.c -@@ -33,7 +33,10 @@ - #include - #include - #include -+ -+#ifndef _WIN32 - #include -+#endif - - int opterr = 1, /* if error message should be printed */ - optind = 1, /* index into parent argv vector */ diff --git a/external_imported/vcpkg/ports/libgd/intrin.patch b/external_imported/vcpkg/ports/libgd/intrin.patch deleted file mode 100644 index b228773f0..000000000 --- a/external_imported/vcpkg/ports/libgd/intrin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c -index ce27220..8895072 100644 ---- a/src/gd_interpolation.c -+++ b/src/gd_interpolation.c -@@ -75,7 +75,7 @@ TODO: - - #ifdef _MSC_VER - # pragma optimize("t", on) --# include -+# include - #endif - - static gdImagePtr gdImageScaleBilinear(gdImagePtr im, diff --git a/external_imported/vcpkg/ports/libgd/no-write-source-dir.patch b/external_imported/vcpkg/ports/libgd/no-write-source-dir.patch deleted file mode 100644 index 4cc17dbef..000000000 --- a/external_imported/vcpkg/ports/libgd/no-write-source-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50d5b9a..17ddf6b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -248,7 +248,8 @@ else (USE_EXT_GD) - CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) - CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) - -- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) -+ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) -+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) - - option(BUILD_SHARED_LIBS "Build shared libs" ON) - option(BUILD_STATIC_LIBS "Build static libs" OFF) diff --git a/external_imported/vcpkg/ports/libgd/portfile.cmake b/external_imported/vcpkg/ports/libgd/portfile.cmake index 4477e791c..7b7283d71 100644 --- a/external_imported/vcpkg/ports/libgd/portfile.cmake +++ b/external_imported/vcpkg/ports/libgd/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgd/libgd - REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2 - SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa + REF b5319a41286107b53daa0e08e402aa1819764bdc # gd-2.3.3 + SHA512 b4c6ca1d9575048de35a38b0db69e7380e160293133c1f72ae570f83ce614d4f2fd2615d217f7a0023e2265652c1089561b906beabca56c15e6ec0250e4394b2 HEAD_REF master PATCHES 0001-fix-cmake.patch - no-write-source-dir.patch - intrin.patch fix_msvc_build.patch ) @@ -30,20 +28,15 @@ vcpkg_check_features( fontconfig ENABLE_FONTCONFIG ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(LIBGD_SHARED_LIBS ON) - set(LIBGD_STATIC_LIBS OFF) -else() - set(LIBGD_SHARED_LIBS OFF) - set(LIBGD_STATIC_LIBS ON) -endif() +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} - -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS} - -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} + -DLIBGD_SHARED_LIBS=${BUILD_SHARED} + -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DBUILD_TEST=OFF ) diff --git a/external_imported/vcpkg/ports/libgd/vcpkg.json b/external_imported/vcpkg/ports/libgd/vcpkg.json index 34ae61fac..c07809ef7 100644 --- a/external_imported/vcpkg/ports/libgd/vcpkg.json +++ b/external_imported/vcpkg/ports/libgd/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libgd", - "version-semver": "2.3.2", - "port-version": 1, + "version-semver": "2.3.3", "description": "Open source code library for the dynamic creation of images by programmers.", "homepage": "https://github.com/libgd/libgd", + "license": "GD", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libgeotiff/portfile.cmake b/external_imported/vcpkg/ports/libgeotiff/portfile.cmake index d6cc3d755..072a8da74 100644 --- a/external_imported/vcpkg/ports/libgeotiff/portfile.cmake +++ b/external_imported/vcpkg/ports/libgeotiff/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES cmakelists.patch skip-doc-install.patch + public-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/external_imported/vcpkg/ports/libgeotiff/public-dependencies.patch b/external_imported/vcpkg/ports/libgeotiff/public-dependencies.patch new file mode 100644 index 000000000..c2729732a --- /dev/null +++ b/external_imported/vcpkg/ports/libgeotiff/public-dependencies.patch @@ -0,0 +1,47 @@ +diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt +index 1840258..fcf2dd0 100644 +--- a/libgeotiff/CMakeLists.txt ++++ b/libgeotiff/CMakeLists.txt +@@ -311,17 +311,18 @@ endif() + SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES + OUTPUT_NAME ${GEOTIFF_LIB_NAME}) + +-set(CONFIG_DEPENDENCIES "") ++set(CONFIG_PUBLIC_DEPENDENCIES "") ++set(CONFIG_PRIVATE_DEPENDENCIES "") + if(TARGET TIFF::TIFF) + set(TIFF_LIBRARIES TIFF::TIFF) +- string(APPEND CONFIG_DEPENDENCIES " find_dependency(TIFF)\n") ++ string(APPEND CONFIG_PUBLIC_DEPENDENCIES "find_dependency(TIFF)\n") + endif() + target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC + ${TIFF_LIBRARIES}) + + if(TARGET PROJ::proj) + set(PROJ_LIBRARIES PROJ::proj) +- string(APPEND CONFIG_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") ++ string(APPEND CONFIG_PRIVATE_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") + endif() + target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE + ${PROJ_LIBRARIES}) +diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in +index 3690489..87de991 100644 +--- a/libgeotiff/cmake/project-config.cmake.in ++++ b/libgeotiff/cmake/project-config.cmake.in +@@ -22,13 +22,14 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin") + unset (_ROOT) + unset (_DIR) + ++include(CMakeFindDependencyMacro) ++@CONFIG_PUBLIC_DEPENDENCIES@ + set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) + if("@BUILD_SHARED_LIBS@") + set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) + else() + set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) +- include(CMakeFindDependencyMacro) +-@CONFIG_DEPENDENCIES@ ++@CONFIG_PRIVATE_DEPENDENCIES@ + endif() + + if(NOT @PROJECT_NAME@_FIND_QUIETLY) diff --git a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json index fc3ed37f7..d6def89ba 100644 --- a/external_imported/vcpkg/ports/libgeotiff/vcpkg.json +++ b/external_imported/vcpkg/ports/libgeotiff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgeotiff", "version": "1.7.1", + "port-version": 1, "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", "license": "MIT", diff --git a/external_imported/vcpkg/ports/libgo/Add-target-include-directory.patch b/external_imported/vcpkg/ports/libgo/Add-target-include-directory.patch new file mode 100644 index 000000000..fe4dffea1 --- /dev/null +++ b/external_imported/vcpkg/ports/libgo/Add-target-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e21eee0..017cc7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,6 +176,8 @@ if (WIN32) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") + endif() + ++TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE $) ++ + install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Config" + LIBRARY DESTINATION lib diff --git a/external_imported/vcpkg/ports/libgo/portfile.cmake b/external_imported/vcpkg/ports/libgo/portfile.cmake index e51f060e2..826a162b4 100644 --- a/external_imported/vcpkg/ports/libgo/portfile.cmake +++ b/external_imported/vcpkg/ports/libgo/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES cmake.patch + Add-target-include-directory.patch ) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/libgo/vcpkg.json b/external_imported/vcpkg/ports/libgo/vcpkg.json index 94c6818d1..c8be7a4ca 100644 --- a/external_imported/vcpkg/ports/libgo/vcpkg.json +++ b/external_imported/vcpkg/ports/libgo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libgo", "version": "3.1", - "port-version": 4, + "port-version": 5, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", + "license": "MIT", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/libgpg-error/TargetPlatformMinVersion.patch b/external_imported/vcpkg/ports/libgpg-error/TargetPlatformMinVersion.patch new file mode 100644 index 000000000..fe8288ff3 --- /dev/null +++ b/external_imported/vcpkg/ports/libgpg-error/TargetPlatformMinVersion.patch @@ -0,0 +1,12 @@ +diff --git a/SMP/libgpg-error_winrt.vcxproj b/SMP/llibgpg-error_winrt.vcxproj +index e1acf679..f9c302be 100644 +--- a/SMP/libgpg-error_winrt.vcxproj ++++ b/SMP/libgpg-error_winrt.vcxproj +@@ -3,6 +3,7 @@ + + {AA4A762D-A8D7-4F68-9B79-FBE63C6BE105} + gpg-error ++ 10.0.17200.0 + + + diff --git a/external_imported/vcpkg/ports/libgpg-error/portfile.cmake b/external_imported/vcpkg/ports/libgpg-error/portfile.cmake index cc795c59d..ef9bf510d 100644 --- a/external_imported/vcpkg/ports/libgpg-error/portfile.cmake +++ b/external_imported/vcpkg/ports/libgpg-error/portfile.cmake @@ -11,6 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PATCHES outdir.patch runtime.patch + TargetPlatformMinVersion.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/external_imported/vcpkg/ports/libgpg-error/vcpkg.json b/external_imported/vcpkg/ports/libgpg-error/vcpkg.json index 8132e6b2d..1af3d6592 100644 --- a/external_imported/vcpkg/ports/libgpg-error/vcpkg.json +++ b/external_imported/vcpkg/ports/libgpg-error/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgpg-error", "version": "1.42", - "port-version": 3, + "port-version": 4, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" diff --git a/external_imported/vcpkg/ports/libgpiod/portfile.cmake b/external_imported/vcpkg/ports/libgpiod/portfile.cmake index 68ee7eff0..bffa9e8b6 100644 --- a/external_imported/vcpkg/ports/libgpiod/portfile.cmake +++ b/external_imported/vcpkg/ports/libgpiod/portfile.cmake @@ -17,26 +17,32 @@ vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING STREQUAL "TRUE") - list(APPEND OPTIONS CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}) - if (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS "CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if (VCPKG_TARGET_IS_LINUX AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) list(APPEND OPTIONS ac_cv_func_malloc_0_nonnull=yes) list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes) endif() endif() +if ("cxx-bindings" IN_LIST FEATURES) + set(USE_CXX_BINDINGS yes) +else() + set(USE_CXX_BINDINGS no) +endif() + vcpkg_configure_make( AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} --enable-tools=no --enable-tests=no - --enable-bindings-cxx=no + --enable-bindings-cxx=${USE_CXX_BINDINGS} --enable-bindings-python=no ) vcpkg_install_make() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libgpiod/vcpkg.json b/external_imported/vcpkg/ports/libgpiod/vcpkg.json index bbbca0c71..11d6da378 100644 --- a/external_imported/vcpkg/ports/libgpiod/vcpkg.json +++ b/external_imported/vcpkg/ports/libgpiod/vcpkg.json @@ -1,14 +1,20 @@ { "name": "libgpiod", "version": "1.6.3", + "port-version": 2, "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", - "supports": "linux & (x64 | arm64)", + "supports": "linux & (x64 | arm)", "dependencies": [ { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-get-vars", "host": true } - ] + ], + "features": { + "cxx-bindings": { + "description": "Make available cxx bindings" + } + } } diff --git a/external_imported/vcpkg/ports/libharu/add-boolean-typedef.patch b/external_imported/vcpkg/ports/libharu/add-boolean-typedef.patch deleted file mode 100644 index 7768ed301..000000000 --- a/external_imported/vcpkg/ports/libharu/add-boolean-typedef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/hpdf.h b/include/hpdf.h -index 1cf0dd9..cce9b59 100644 ---- a/include/hpdf.h -+++ b/include/hpdf.h -@@ -54,6 +54,7 @@ - #include "hpdf_types.h" - - typedef void *HPDF_HANDLE; -+typedef HPDF_HANDLE HPDF_Boolean; - typedef HPDF_HANDLE HPDF_Doc; - typedef HPDF_HANDLE HPDF_Page; - typedef HPDF_HANDLE HPDF_Pages; diff --git a/external_imported/vcpkg/ports/libharu/export-targets.patch b/external_imported/vcpkg/ports/libharu/export-targets.patch new file mode 100644 index 000000000..3e7b62c96 --- /dev/null +++ b/external_imported/vcpkg/ports/libharu/export-targets.patch @@ -0,0 +1,29 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4ca0f14..02ad1ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -87,9 +87,23 @@ if(UNIX AND NOT APPLE) + target_link_libraries (haru ${M_LIB}) + endif() + ++if(LIBHPDF_SHARED) ++ if(WIN32 AND NOT CYGWIN) ++ set_target_properties(haru PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ endif(WIN32 AND NOT CYGWIN) ++endif(LIBHPDF_SHARED) ++ ++target_include_directories(haru PUBLIC $ $) ++ + install( +- TARGETS ++ TARGETS haru ++ EXPORT unofficial-libharu-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) ++ ++install(EXPORT unofficial-libharu-config ++ NAMESPACE unofficial::libharu:: ++ DESTINATION share/unofficial-libharu ++) diff --git a/external_imported/vcpkg/ports/libharu/fix-build-fail.patch b/external_imported/vcpkg/ports/libharu/fix-build-fail.patch deleted file mode 100644 index 2f7066575..000000000 --- a/external_imported/vcpkg/ports/libharu/fix-build-fail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9d2a604..be8e964 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -79,11 +79,11 @@ if(LIBHPDF_STATIC) - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin - ) -- if(WIN32 AND NOT CYGWIN) -- foreach(addlib ${ADDITIONAL_LIBRARIES}) -- install(FILES ${addlib} DESTINATION lib) -- endforeach(addlib) -- endif(WIN32 AND NOT CYGWIN) -+ #if(WIN32 AND NOT CYGWIN) -+ #foreach(addlib ${ADDITIONAL_LIBRARIES}) -+ #install(FILES ${addlib} DESTINATION lib) -+ #endforeach(addlib) -+ #endif(WIN32 AND NOT CYGWIN) - endif(LIBHPDF_STATIC) - if(LIBHPDF_SHARED) - add_library(${LIBHPDF_NAME} SHARED ${LIBHPDF_SRCS}) diff --git a/external_imported/vcpkg/ports/libharu/fix-include-path.patch b/external_imported/vcpkg/ports/libharu/fix-include-path.patch new file mode 100644 index 000000000..83ef8f324 --- /dev/null +++ b/external_imported/vcpkg/ports/libharu/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14ed67d..57673c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,7 +126,7 @@ set( + ) + + # install header files +-install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ${haru_HDRS} DESTINATION include/) + + # install various files + install(FILES README.md CHANGES INSTALL DESTINATION .) diff --git a/external_imported/vcpkg/ports/libharu/portfile.cmake b/external_imported/vcpkg/ports/libharu/portfile.cmake index 20c595254..819bfff64 100644 --- a/external_imported/vcpkg/ports/libharu/portfile.cmake +++ b/external_imported/vcpkg/ports/libharu/portfile.cmake @@ -1,26 +1,12 @@ -if("notiffsymbols" IN_LIST FEATURES) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(DISABLETIFF tiff.patch) - endif() -endif() -vcpkg_download_distfile(SHADING_PR - URLS "https://github.com/libharu/libharu/pull/157.diff" - FILENAME "libharu-shading-pr-157.patch" - SHA512 f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libharu/libharu - REF d84867ebf9f3de6afd661d2cdaff102457fbc371 - SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99 + REF 6997cf775b2345e3db82ac774fe2931faf348458 #2.4.0-rc1 + SHA512 758753b0f977c6b9f0b6309958e1edfba491851682c9b04cead6ebebc9af726fdec7265f36ca1b1e80f1849f9b4a43ad329a688b4844eb911c64d42a92cd7823 HEAD_REF master PATCHES - fix-build-fail.patch - add-boolean-typedef.patch - # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature. - ${SHADING_PR} - ${DISABLETIFF} + fix-include-path.patch + export-targets.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -40,34 +26,19 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib") - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib") - endif() - else() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.a") - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a") - endif() - endif() -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libharu) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/README" + "${CURRENT_PACKAGES_DIR}/debug/README.md" "${CURRENT_PACKAGES_DIR}/debug/CHANGES" "${CURRENT_PACKAGES_DIR}/debug/INSTALL" - "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/README.md" "${CURRENT_PACKAGES_DIR}/CHANGES" "${CURRENT_PACKAGES_DIR}/INSTALL" ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf.h" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") string(REPLACE "#ifdef HPDF_DLL\n" "#if 1\n" _contents "${_contents}") @@ -85,4 +56,4 @@ endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libharu/tiff.patch b/external_imported/vcpkg/ports/libharu/tiff.patch deleted file mode 100644 index 2aabbe32e..000000000 --- a/external_imported/vcpkg/ports/libharu/tiff.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c -index 2937fc90d..a1a35d0ed 100644 ---- a/src/hpdf_image_ccitt.c -+++ b/src/hpdf_image_ccitt.c -@@ -21,7 +21,6 @@ - #include - #include - --#define G3CODES - #include "t4.h" - - typedef unsigned int uint32; -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 354ca7526..ee301d9af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -99,6 +99,8 @@ if(PNG_FOUND) - set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES}) - endif(PNG_FOUND) - -+find_package(TIFF REQUIRED) -+list(APPEND ADDITIONAL_LIBRARIES TIFF::TIFF) - - # ======================================================================= - # configure header files, add compiler flags diff --git a/external_imported/vcpkg/ports/libharu/vcpkg.json b/external_imported/vcpkg/ports/libharu/vcpkg.json index 76537e89f..442551d6e 100644 --- a/external_imported/vcpkg/ports/libharu/vcpkg.json +++ b/external_imported/vcpkg/ports/libharu/vcpkg.json @@ -1,26 +1,19 @@ { "name": "libharu", - "version-string": "2017-08-15", - "port-version": 10, + "version-semver": "2.4.0-rc1", "description": "libharu - free PDF library", "homepage": "https://github.com/libharu/libharu", + "license": "Zlib", "dependencies": [ "libpng", { "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" - ], - "default-features": [ - "notiffsymbols" - ], - "features": { - "notiffsymbols": { - "description": "disable symbols also defined by the tiff port", - "dependencies": [ - "tiff" - ] - } - } + ] } diff --git a/external_imported/vcpkg/ports/libheif/portfile.cmake b/external_imported/vcpkg/ports/libheif/portfile.cmake index bde4f5b17..3dd1631c2 100644 --- a/external_imported/vcpkg/ports/libheif/portfile.cmake +++ b/external_imported/vcpkg/ports/libheif/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 56c8a2613370562fc330af2c70c1510aa5fd9ff6 #v1.12.0 - SHA512 11ac7f32d1f49963046b1a4479a41f39004475211563ba7f41b2398f07f7b4d90339ea663e528b3cc80deeef1fff374987208d48b447116a806564ef05487e97 + REF 5fb52b6134d5e034b51637a86c6e8a7418b35df1 #v1.13.0 + SHA512 e1ebd5eb7ae436a604ae3bb50ea4d53b8efb97388081a0876c161927a8b31c48c03899075423048d3f10055332bf7f3472bb8a06b6d32312de1d88fbda760421 HEAD_REF master PATCHES gdk-pixbuf.patch @@ -26,11 +26,13 @@ endif() vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "defined(_MSC_VER) && !defined(LIBHEIF_STATIC_BUILD)" "defined(_WIN32)") else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "defined(_MSC_VER) && !defined(LIBHEIF_STATIC_BUILD)" "0") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "#ifdef LIBHEIF_EXPORTS" "#if 0") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libheif/vcpkg.json b/external_imported/vcpkg/ports/libheif/vcpkg.json index 957f728f4..8acc80c86 100644 --- a/external_imported/vcpkg/ports/libheif/vcpkg.json +++ b/external_imported/vcpkg/ports/libheif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libheif", - "version": "1.12.0", - "port-version": 3, + "version": "1.13.0", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake index 5393b9ca5..e805e844f 100644 --- a/external_imported/vcpkg/ports/libhsplasma/portfile.cmake +++ b/external_imported/vcpkg/ports/libhsplasma/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO H-uru/libhsplasma - REF e435db76f86a0258ccd6f62a8bcd1f8b42d4f22d #2021.06.08 - SHA512 ebd53633f22662793613c689b5a07f6149ed2b437c42a024e7c14a18d4411356edb11c95c08e1215dde443988fd1e4bcdd8d35fc30ca2545f507d6a61565cc69 + REF 2327302a62b891f551b5f6daf899cf86997dce72 # 2022.05.19 + SHA512 89755e502e4a66a56013e3ff52c8d0c2350e5681be49c1b47f580591e3c3da24c587dee5af4f9524ea43f2d86f24ecef611d62d6045b293eb8d09cd5f0ac3d18 HEAD_REF master ) @@ -27,4 +27,5 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libhsplasma/vcpkg.json b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json index 92bc718ae..44639e11c 100644 --- a/external_imported/vcpkg/ports/libhsplasma/vcpkg.json +++ b/external_imported/vcpkg/ports/libhsplasma/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libhsplasma", - "version-string": "2021.06.08", - "port-version": 1, + "version-date": "2022-05-19", "description": "Cross-platform Plasma data and network library", "homepage": "https://github.com/H-uru/libhsplasma", + "license": "GPL-3.0-or-later", "supports": "!(arm | uwp)", "dependencies": [ "libjpeg-turbo", diff --git a/external_imported/vcpkg/ports/libhv/fix-find_package.patch b/external_imported/vcpkg/ports/libhv/fix-find_package.patch deleted file mode 100644 index 6ec8b7078..000000000 --- a/external_imported/vcpkg/ports/libhv/fix-find_package.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd9d1c3..e707884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,7 +112,10 @@ endif() - - if(WITH_OPENSSL) - add_definitions(-DWITH_OPENSSL) -- set(LIBS ${LIBS} ssl crypto) -+ find_package(OpenSSL REQUIRED) -+ if(OpenSSL_FOUND) -+ set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto) -+ endif() - endif() - - if(WITH_GNUTLS) -@@ -197,6 +200,7 @@ if(BUILD_STATIC) - add_library(hv_static STATIC ${LIBHV_SRCS}) - target_compile_definitions(hv_static PRIVATE HV_STATICLIB) - target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) -+ target_link_libraries(hv_static ${LIBS}) - install(TARGETS hv_static DESTINATION lib) - add_custom_target(libhv_static DEPENDS hv_static) - endif() diff --git a/external_imported/vcpkg/ports/libhv/fix-include_header.patch b/external_imported/vcpkg/ports/libhv/fix-include_header.patch new file mode 100644 index 000000000..8f15c6d63 --- /dev/null +++ b/external_imported/vcpkg/ports/libhv/fix-include_header.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 59e9b41..f0a162e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS}) + if(BUILD_SHARED) + add_library(hv SHARED ${LIBHV_SRCS}) + target_compile_definitions(hv PRIVATE HV_DYNAMICLIB) +- target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS}) ++ target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) + target_link_libraries(hv ${LIBS}) + install(TARGETS hv + EXPORT libhvConfig +@@ -228,7 +228,7 @@ endif() + if(BUILD_STATIC) + add_library(hv_static STATIC ${LIBHV_SRCS}) + target_compile_definitions(hv_static PRIVATE HV_STATICLIB) +- target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) ++ target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) + target_link_libraries(hv_static ${LIBS}) + install(TARGETS hv_static + EXPORT libhvConfig diff --git a/external_imported/vcpkg/ports/libhv/portfile.cmake b/external_imported/vcpkg/ports/libhv/portfile.cmake index b45624499..e41aa827f 100644 --- a/external_imported/vcpkg/ports/libhv/portfile.cmake +++ b/external_imported/vcpkg/ports/libhv/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.2.4 - SHA512 5732800970180294DCEB329F25D22B1A7178739A2A5A2CE32E030F4FD38055A6298797D26E7FF5525AC662059FF0AAEDB8ABC200E0BA9E4EEBEB5846FB53F4D0 + REF 8d14d1a6cd4accbda9e081716a59395b523303f6 #v1.2.6 + SHA512 d40063f2b2f8191965fd4434b80a17f505819a20fd63aefa63c08663d0acc82d086338f0382ab70289dff0417a8ec922f993d36c4007a1a13c7ce34d71018f83 HEAD_REF master PATCHES - fix-find_package.patch + fix-include_header.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -29,16 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/bin/hv.dll") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/hv.dll") -endif() diff --git a/external_imported/vcpkg/ports/libhv/vcpkg.json b/external_imported/vcpkg/ports/libhv/vcpkg.json index f337b9acd..01450d3cd 100644 --- a/external_imported/vcpkg/ports/libhv/vcpkg.json +++ b/external_imported/vcpkg/ports/libhv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libhv", - "version": "1.2.4", - "port-version": 1, + "version": "1.2.6", "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", "license": "BSD-3-Clause", @@ -10,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/external_imported/vcpkg/ports/libhydrogen/no-arch.patch b/external_imported/vcpkg/ports/libhydrogen/no-arch.patch new file mode 100644 index 000000000..2649010b3 --- /dev/null +++ b/external_imported/vcpkg/ports/libhydrogen/no-arch.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91e2bf1..7333479 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,6 @@ set(arduino_files "library.properties") + + # Compile options + +-get_setting(target_arch STRING "Target system architecture (fed to the compiler's -march=XXX).") +-if(NOT target_arch AND NOT CMAKE_CROSSCOMPILING) +- set(target_arch native) +-endif() +- + get_setting(target_device STRING "Target device identifier (defines HYDRO_TARGET_DEVICE_XXX).") + + set(compile_options +@@ -52,7 +47,7 @@ set(compile_options + # ---- Definitions ---- + $<$:-DHYDRO_TARGET_DEVICE_${target_device}> + # ---- Optimizations ---- +- -Os $<$:-march=${target_arch}> -fno-exceptions ++ -Os -fno-exceptions + # ---- Warnings ---- + -Wall + -Wextra diff --git a/external_imported/vcpkg/ports/libhydrogen/portfile.cmake b/external_imported/vcpkg/ports/libhydrogen/portfile.cmake index 3a59970fe..e2870abac 100644 --- a/external_imported/vcpkg/ports/libhydrogen/portfile.cmake +++ b/external_imported/vcpkg/ports/libhydrogen/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libhydrogen - REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02 - SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931 + REF 9f9d504bb5a97bc98ee52529726d41c027df76ad #2022-06-21 + SHA512 f4dabc0b399c8850563c8a967209db537fdf787deaef46899a5484bc89bffb31581312940549784defe4c42d057309aaabd402831a7c3a94b04a00d47a07736c HEAD_REF master + PATCHES + remove-tests.patch + no-arch.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/libhydrogen/remove-tests.patch b/external_imported/vcpkg/ports/libhydrogen/remove-tests.patch new file mode 100644 index 000000000..399e883ff --- /dev/null +++ b/external_imported/vcpkg/ports/libhydrogen/remove-tests.patch @@ -0,0 +1,30 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -139,12 +139,13 @@ + # Tests + + set(tests_executable "${PROJECT_NAME}-tests") + set(tests_run_target "${PROJECT_NAME}-run-tests") + set(tests_run_file "${PROJECT_BINARY_DIR}/${tests_run_target}.done") + ++if(0) + enable_testing() + add_executable("${tests_executable}" ${test_files}) + target_compile_options("${tests_executable}" PRIVATE ${compile_options}) + target_link_libraries("${tests_executable}" "${PROJECT_NAME}") + add_test(NAME "${tests_executable}" COMMAND "${tests_executable}") + +@@ -166,12 +167,13 @@ + COMMAND "${CMAKE_COMMAND}" + ARGS -E touch "${tests_run_file}" + WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" + VERBATIM) + add_custom_target("${tests_run_target}" ALL DEPENDS "${tests_run_file}" VERBATIM) + endif() ++endif() + + # Generate Arduino package + + set(arduino_package_file "${PROJECT_BINARY_DIR}/hydrogen-crypto.zip") + + # Use the relative versions of the file path lists or else the full paths will end up in the diff --git a/external_imported/vcpkg/ports/libhydrogen/vcpkg.json b/external_imported/vcpkg/ports/libhydrogen/vcpkg.json index f76895c40..8251ad463 100644 --- a/external_imported/vcpkg/ports/libhydrogen/vcpkg.json +++ b/external_imported/vcpkg/ports/libhydrogen/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libhydrogen", - "version-date": "2021-12-02", + "version-date": "2022-06-21", "description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments", "homepage": "https://github.com/jedisct1/libhydrogen", + "license": "ISC", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libice/fix_build.patch b/external_imported/vcpkg/ports/libice/fix_build.patch new file mode 100644 index 000000000..3d936ac2e --- /dev/null +++ b/external_imported/vcpkg/ports/libice/fix_build.patch @@ -0,0 +1,34 @@ +diff --git a/src/error.c b/src/error.c +index 055452ec3..0ce530a96 100644 +--- a/src/error.c ++++ b/src/error.c +@@ -32,7 +32,11 @@ Author: Ralph Mor, X Consortium + #include + #include "ICElibint.h" + #include ++#ifdef HAVE_UNISTD_H + #include ++#elif _MSC_VER ++#include ++#endif + #include + + void +diff --git a/src/iceauth.c b/src/iceauth.c +index 147efc76c..ea6d1a67b 100644 +--- a/src/iceauth.c ++++ b/src/iceauth.c +@@ -38,8 +38,12 @@ Author: Ralph Mor, X Consortium + #ifdef HAVE_LIBBSD + #include /* for arc4random_buf() */ + #endif +- ++#ifdef HAVE_UNISTD_H + #include ++#elif _MSC_VER ++#include ++#define ITIMER_REAL ++#endif + + static int was_called_state; + diff --git a/external_imported/vcpkg/ports/libice/portfile.cmake b/external_imported/vcpkg/ports/libice/portfile.cmake new file mode 100644 index 000000000..e0edd0975 --- /dev/null +++ b/external_imported/vcpkg/ports/libice/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libice + REF 8e6a14c63d6b73cde87cb331439f2a4d19cba5b9 # 1.0.10 + SHA512 ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040 + HEAD_REF master + PATCHES fix_build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libice/vcpkg.json b/external_imported/vcpkg/ports/libice/vcpkg.json new file mode 100644 index 000000000..f216bd2e2 --- /dev/null +++ b/external_imported/vcpkg/ports/libice/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libice", + "version": "1.0.10", + "description": "Inter-Client Exchange Library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libice", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "libx11", + "xorg-macros", + "xproto", + "xtrans" + ] +} diff --git a/external_imported/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch b/external_imported/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch index 0c90e50ef..5c79d25c4 100644 --- a/external_imported/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch +++ b/external_imported/vcpkg/ports/libiconv/0002-Config-for-MSVC.patch @@ -11,4 +11,17 @@ index 6dc011b..158ccdd 100644 # ifdef mbstate_t # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) # define mbsinit(ps) 1 - \ No newline at end of file +diff --git a/srclib/fcntl.c b/srclib/fcntl.c +index f9753c4..02fc8be 100644 +--- a/srclib/fcntl.c ++++ b/srclib/fcntl.c +@@ -37,6 +37,9 @@ + /* Get declarations of the native Windows API functions. */ + # define WIN32_LEAN_AND_MEAN + # include ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif + + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW diff --git a/external_imported/vcpkg/ports/libiconv/portfile.cmake b/external_imported/vcpkg/ports/libiconv/portfile.cmake index 3cca1b292..9794211de 100644 --- a/external_imported/vcpkg/ports/libiconv/portfile.cmake +++ b/external_imported/vcpkg/ports/libiconv/portfile.cmake @@ -5,17 +5,17 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) return() endif() -set(LIBICONV_VERSION 1.16) +set(LIBICONV_VERSION 1.17) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" - SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7 + SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIBICONV_VERSION} + ARCHIVE "${ARCHIVE}" + REF "${LIBICONV_VERSION}" PATCHES 0002-Config-for-MSVC.patch 0003-Add-export.patch @@ -50,4 +50,19 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains un # Please keep, the default usage is broken file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(READ "${SOURCE_PATH}/COPYING.LIB" copying_lib) +file(READ "${SOURCE_PATH}/COPYING" copying_tool) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" " +The libiconv and libcharset libraries and their header files are under LGPL, +see COPYING.LIB below. + +The iconv program and the documentation are under GPL, see COPYING below. + +# COPYING.LIB + +${copying_lib} + +# COPYING + +${copying_tool} +") diff --git a/external_imported/vcpkg/ports/libiconv/vcpkg.json b/external_imported/vcpkg/ports/libiconv/vcpkg.json index b567aee18..5314ec6cc 100644 --- a/external_imported/vcpkg/ports/libiconv/vcpkg.json +++ b/external_imported/vcpkg/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", - "version": "1.16", - "port-version": 13, + "version": "1.17", "description": "GNU Unicode text conversion", - "homepage": "https://www.gnu.org/software/libiconv/" + "homepage": "https://www.gnu.org/software/libiconv/", + "license": null } diff --git a/external_imported/vcpkg/ports/libigl/portfile.cmake b/external_imported/vcpkg/ports/libigl/portfile.cmake index 345aa4cc7..4c722d070 100644 --- a/external_imported/vcpkg/ports/libigl/portfile.cmake +++ b/external_imported/vcpkg/ports/libigl/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199 xml LIBIGL_WITH_XML #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone. + cgal LIBIGL_WITH_CGAL ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/libigl/vcpkg.json b/external_imported/vcpkg/ports/libigl/vcpkg.json index c74ff015f..fca500d19 100644 --- a/external_imported/vcpkg/ports/libigl/vcpkg.json +++ b/external_imported/vcpkg/ports/libigl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libigl", "version": "2.3.0", - "port-version": 1, + "port-version": 2, "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", "supports": "!(arm | uwp)", "dependencies": [ "eigen3", @@ -17,6 +18,12 @@ } ], "features": { + "cgal": { + "description": "Build with cgal", + "dependencies": [ + "cgal" + ] + }, "embree": { "description": "Build with embree", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libilbc/absl.patch b/external_imported/vcpkg/ports/libilbc/absl.patch new file mode 100644 index 000000000..3a41c222b --- /dev/null +++ b/external_imported/vcpkg/ports/libilbc/absl.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 016b46d37..4caa88fce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,14 +50,12 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + set(CMAKE_CXX_STANDARD 14) + +-if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_RELEASE "-O2") + endif() +-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2") +@@ -146,7 +144,8 @@ endif() + ## Configure input files + ############################################################################# + +-include_directories(. abseil-cpp ${CMAKE_CURRENT_BINARY_DIR}) ++find_package(absl REQUIRED) ++include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) + + set(ilbc_source_files + modules/audio_coding/codecs/ilbc/abs_quant.c +@@ -310,6 +310,7 @@ add_library(ilbc ${ilbc_source_files}) + generate_export_header(ilbc) + set_target_properties(ilbc PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 3) + set_target_properties(ilbc PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++target_link_libraries(ilbc PRIVATE absl::core_headers) + + add_executable(ilbc_test modules/audio_coding/codecs/ilbc/test/iLBC_test.c) + target_link_libraries(ilbc_test ilbc) diff --git a/external_imported/vcpkg/ports/libilbc/portfile.cmake b/external_imported/vcpkg/ports/libilbc/portfile.cmake index c833ebd6f..d72ff632e 100644 --- a/external_imported/vcpkg/ports/libilbc/portfile.cmake +++ b/external_imported/vcpkg/ports/libilbc/portfile.cmake @@ -1,33 +1,29 @@ -set(ILBC_VERSION 3.0.3) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/TimothyGu/libilbc/releases/download/v${ILBC_VERSION}/libilbc-${ILBC_VERSION}.zip" - FILENAME "libilbc-${ILBC_VERSION}.zip" - SHA512 a5755db093529f6a3fd8fd47da63b57cffff1d3babef443d92f7c5a250ce8d1585adfba525c4037b142d9f00f1675a5054c172bf936be280dfcc22ed553c94c6 -) - -vcpkg_extract_source_archive_ex( +set(ILBC_VERSION 3.0.4) +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${ILBC_VERSION} - PATCHES do-not-build-ilbc_test.patch + REPO TimothyGu/libilbc + REF cd064edf2c6c104a4e1fd87b34fd24cfa6dbe401 + SHA512 323d32dbd54d5ef624940432bf19c29f5ead6f40bc84aba4261f067dfdc40cf4000e383f4dca65cd3b745a354a119a9e515949a1466af89c300cd7bf95991675 + PATCHES + do-not-build-ilbc_test.patch + absl.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_INSTALL_DOCDIR=share/${PORT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ilbc_export.h "#ifdef ILBC_STATIC_DEFINE" "#if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ilbc_export.h" "#ifdef ILBC_STATIC_DEFINE" "#if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libilbc/vcpkg.json b/external_imported/vcpkg/ports/libilbc/vcpkg.json index 96daeb881..b3e0347b8 100644 --- a/external_imported/vcpkg/ports/libilbc/vcpkg.json +++ b/external_imported/vcpkg/ports/libilbc/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libilbc", - "version-string": "3.0.3", - "port-version": 1, + "version": "3.0.4", "description": "Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project.", "homepage": "https://github.com/TimothyGu/libilbc", - "supports": "!(arm & uwp)" + "license": "BSD-3-Clause", + "supports": "!(arm & uwp)", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libirecovery/vcpkg.json b/external_imported/vcpkg/ports/libirecovery/vcpkg.json index 8b5a6e942..f02d8db58 100644 --- a/external_imported/vcpkg/ports/libirecovery/vcpkg.json +++ b/external_imported/vcpkg/ports/libirecovery/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libirecovery", "version-string": "1.0.25", - "port-version": 3, + "port-version": 4, "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", + "supports": "!(windows & arm64)", "dependencies": [ "getopt", "libusbmuxd", diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake b/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake index 091af45bc..063edfb5d 100644 --- a/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake +++ b/external_imported/vcpkg/ports/libjpeg-turbo/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 - SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 + REF 2.1.4 + SHA512 d3e92d614168355827e0ed884ff847cc7df8f6f1fb7b673c6c99afdf61fdfc0372afe5d30fdbf5e743335e2a7a27ca9f510c67d213e5cb2315a8d946e9414575 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch @@ -15,7 +15,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) - set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF) + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON -DNEON_INTRINSICS=ON) else() set(LIBJPEGTURBO_SIMD -DWITH_SIMD=ON) vcpkg_find_acquire_program(NASM) diff --git a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json index 5365b8421..9fa07778d 100644 --- a/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json +++ b/external_imported/vcpkg/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libjpeg-turbo", - "version": "2.1.3", - "port-version": 2, + "version": "2.1.4", "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/external_imported/vcpkg/ports/libjuice/portfile.cmake b/external_imported/vcpkg/ports/libjuice/portfile.cmake index b29ef11c3..6a80b4417 100644 --- a/external_imported/vcpkg/ports/libjuice/portfile.cmake +++ b/external_imported/vcpkg/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF e2bb4df9c9a2d3a296312925f313bf6f26854010 #v0.9.8 - SHA512 98fa9cf8a1f22c0f43ef7b2dd438bdd299483384b8d81f1196d8a0fe7fa41c63df7d7acfb94b9af3b8edfe569aeb73b33569bea2557ed2d0a554ba3a81603c2f + REF 06bbfe93ab344e95797220d89b55c7204c3ffa9d #v1.0.4 + SHA512 9768942cc9a2938a70a159914eabd548a38afb525806b6967dd73288ec32f390ab42b9146586160f98955a26162d350277058bc69bf2c2a60fffa03da79684e2 HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/external_imported/vcpkg/ports/libjuice/vcpkg.json b/external_imported/vcpkg/ports/libjuice/vcpkg.json index 2e87efc9e..f7c62f28a 100644 --- a/external_imported/vcpkg/ports/libjuice/vcpkg.json +++ b/external_imported/vcpkg/ports/libjuice/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libjuice", - "version": "0.9.8", + "version": "1.0.4", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/liblas/fix-cmake-config.patch b/external_imported/vcpkg/ports/liblas/fix-cmake-config.patch new file mode 100644 index 000000000..53a819aea --- /dev/null +++ b/external_imported/vcpkg/ports/liblas/fix-cmake-config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in +index 175e997..8a55804 100644 +--- a/cmake/liblas-config.cmake.in ++++ b/cmake/liblas-config.cmake.in +@@ -19,6 +19,8 @@ set (libLAS_INCLUDE_DIRS "${PROJECT_ROOT_DIR}/include") + set (libLAS_LIBRARY_DIRS "${PROJECT_ROOT_DIR}/lib") + set (libLAS_BINARY_DIRS "${PROJECT_ROOT_DIR}/bin") + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF CONFIG) + include ("${_DIR}/liblas-depends.cmake") + if(WIN32) + set (libLAS_LIBRARIES liblas liblas_c) diff --git a/external_imported/vcpkg/ports/liblas/misc-fixes.patch b/external_imported/vcpkg/ports/liblas/misc-fixes.patch new file mode 100644 index 000000000..14f5ff6da --- /dev/null +++ b/external_imported/vcpkg/ports/liblas/misc-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d246a88..3da2106 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ + # + ############################################################################### + # libLAS general settings ++cmake_minimum_required(VERSION 3.7.0) + project(libLAS) + + +@@ -64,7 +65,6 @@ set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libLAS should do ru + + ############################################################################### + # CMake settings +-cmake_minimum_required(VERSION 2.6.0) + + set(CMAKE_COLOR_MAKEFILE ON) + +@@ -107,7 +107,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + + file(READ "doc/index.txt" README ) +-file(WRITE "README.txt" "${README}") + + ############################################################################### + # Platform and compiler specific settings +@@ -138,8 +137,6 @@ if(WIN32) + + endif() + +- set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH}) +- set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH}) + else() + + # Recommended C++ compilation flags +@@ -337,8 +334,6 @@ set(LIBLAS_DATA_DIR ${LIBLAS_DATA_SUBDIR}) + ############################################################################### + # Installation commands + +-install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt +- DESTINATION ${LIBLAS_DATA_DIR}/doc) + + ############################################################################### + # Processing of project directories +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index beb83e2..e328c95 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -160,7 +160,7 @@ install(TARGETS ${LIBLAS_UTILITIES} + ARCHIVE DESTINATION ${LIBLAS_LIB_DIR}) + + +-if(UNIX) ++if(0) + + set(LIBLAS_UTILS_RPATH ${CMAKE_INSTALL_PREFIX}/lib ${Boost_LIBRARY_DIRS}) + if(LASZIP_FOUND) diff --git a/external_imported/vcpkg/ports/liblas/portfile.cmake b/external_imported/vcpkg/ports/liblas/portfile.cmake index a50ede2f6..30976cb89 100644 --- a/external_imported/vcpkg/ports/liblas/portfile.cmake +++ b/external_imported/vcpkg/ports/liblas/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + set(VERSION 1.8.1) vcpkg_download_distfile(ARCHIVE @@ -8,44 +10,51 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch + fix-cmake-config.patch + misc-fixes.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_UTILITIES +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_OSGEO4W=OFF # Disable osgeo4w +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_OSGEO4W=OFF -DWITH_TESTS=OFF + OPTIONS_DEBUG -DWITH_UTILITIES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG} ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake) +vcpkg_cmake_install() if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS) + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(WITH_UTILITIES) + set(tools lasinfo lasblock las2las las2txt txt2las ts2las) + if(NOT WIN32) + list(APPEND tools las2col las2pg) + endif() + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) +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}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/liblas/usage b/external_imported/vcpkg/ports/liblas/usage new file mode 100644 index 000000000..871700547 --- /dev/null +++ b/external_imported/vcpkg/ports/liblas/usage @@ -0,0 +1,9 @@ +liblas provides CMake targets: + + # C API + find_package(libLAS CONFIG REQUIRED) + target_link_libraries(main PRIVATE $<$:lib>las_c) + + # C++ API + find_package(libLAS CONFIG REQUIRED) + target_link_libraries(main PRIVATE $<$:lib>las) diff --git a/external_imported/vcpkg/ports/liblas/vcpkg.json b/external_imported/vcpkg/ports/liblas/vcpkg.json index 049580bde..bfb042e37 100644 --- a/external_imported/vcpkg/ports/liblas/vcpkg.json +++ b/external_imported/vcpkg/ports/liblas/vcpkg.json @@ -1,8 +1,10 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 9, + "port-version": 10, "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", @@ -14,20 +16,25 @@ "boost-system", "boost-thread", "boost-uuid", - "libgeotiff" + "libgeotiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "jpeg": { - "description": "Support for jpeg", - "dependencies": [ - "libjpeg-turbo" - ] + "description": "This feature does nothing. It is retained for compatibility." + }, + "tools": { + "description": "Build utilities." }, "zlib": { - "description": "Support zlib for compression", - "dependencies": [ - "zlib" - ] + "description": "This feature does nothing. It is retained for compatibility." } } } diff --git a/external_imported/vcpkg/ports/liblbfgs/portfile.cmake b/external_imported/vcpkg/ports/liblbfgs/portfile.cmake index 5e7e34e55..a793a23d9 100644 --- a/external_imported/vcpkg/ports/liblbfgs/portfile.cmake +++ b/external_imported/vcpkg/ports/liblbfgs/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_from_github( message(STATUS "source path is : ${SOURCE_PATH}") -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} - PREFIX_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(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblbfgs RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/liblbfgs" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/liblbfgs/vcpkg.json b/external_imported/vcpkg/ports/liblbfgs/vcpkg.json index d648f8027..8525cd588 100644 --- a/external_imported/vcpkg/ports/liblbfgs/vcpkg.json +++ b/external_imported/vcpkg/ports/liblbfgs/vcpkg.json @@ -1,7 +1,13 @@ { "name": "liblbfgs", - "version-string": "1.10", - "port-version": 1, + "version": "1.10", + "port-version": 2, "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", - "homepage": "http://www.chokkan.org/software/liblbfgs/" + "homepage": "http://www.chokkan.org/software/liblbfgs/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/liblsquic/disable-asan.patch b/external_imported/vcpkg/ports/liblsquic/disable-asan.patch new file mode 100644 index 000000000..2b05d0ee3 --- /dev/null +++ b/external_imported/vcpkg/ports/liblsquic/disable-asan.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 65c4776..5d4086a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,12 +60,12 @@ ENDIF() + + IF(CMAKE_BUILD_TYPE STREQUAL "Debug") + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -O0 -g3") +- IF(CMAKE_C_COMPILER MATCHES "clang" AND +- NOT "$ENV{TRAVIS}" MATCHES "^true$" AND +- NOT "$ENV{EXTRA_CFLAGS}" MATCHES "-fsanitize") +- SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -fsanitize=address") +- SET(LIBS ${LIBS} -fsanitize=address) +- ENDIF() ++ # IF(CMAKE_C_COMPILER MATCHES "clang" AND ++ # NOT "$ENV{TRAVIS}" MATCHES "^true$" AND ++ # NOT "$ENV{EXTRA_CFLAGS}" MATCHES "-fsanitize") ++ # SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -fsanitize=address") ++ # SET(LIBS ${LIBS} -fsanitize=address) ++ # ENDIF() + # Uncomment to enable cleartext protocol mode (no crypto): + #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_ENABLE_HANDSHAKE_DISABLE=1") + ELSE() diff --git a/external_imported/vcpkg/ports/liblsquic/portfile.cmake b/external_imported/vcpkg/ports/liblsquic/portfile.cmake new file mode 100644 index 000000000..1d3276082 --- /dev/null +++ b/external_imported/vcpkg/ports/liblsquic/portfile.cmake @@ -0,0 +1,76 @@ +if(WIN32) + # The lib uses CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, at least until + # https://github.com/litespeedtech/lsquic/pull/371 or similar is merged + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO litespeedtech/lsquic + REF v3.1.1 + SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee + HEAD_REF master + PATCHES disable-asan.patch) + +# Submodules +vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH + REPO litespeedtech/ls-qpack + REF v2.3.0 + HEAD_REF master + SHA512 7f5a9dd15bcd32c1bfafbecc5cea4da30f50a852c02d2bd140a2baaafd80ccb822c1701b0d20699af6367e9c712f4fe019741507c44156e9897d25162de0b8b4 +) +if(NOT EXISTS "${SOURCE_PATH}/src/ls-hpack/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/src/liblsquic/ls-qpack") + file(RENAME "${LSQPACK_SOURCE_PATH}" "${SOURCE_PATH}/src/liblsquic/ls-qpack") +endif() + +vcpkg_from_github(OUT_SOURCE_PATH LSHPACK_SOURCE_PATH + REPO litespeedtech/ls-hpack + REF v2.3.0 + HEAD_REF master + SHA512 45866b18042125cbbd008eed2935a938a42e1682030aa52ff4a324ddbad7bf9bd483161352cc8988bae668e132ee8b4b043ddc09d9e0316a66aaefd927ae2d76 +) +if(NOT EXISTS "${SOURCE_PATH}/src/lshpack/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/src/lshpack") + file(RENAME "${LSHPACK_SOURCE_PATH}" "${SOURCE_PATH}/src/lshpack") +endif() + +# Configuration +vcpkg_find_acquire_program(PERL) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LSQUIC_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPERL=${PERL}" + "-DPERL_EXECUTABLE=${PERL}" + "-DLSQUIC_SHARED_LIB=${LSQUIC_SHARED_LIB}" + "-DBORINGSSL_INCLUDE=${CURRENT_INSTALLED_DIR}/include" + -DLSQUIC_BIN=OFF + -DLSQUIC_TESTS=OFF + OPTIONS_RELEASE + "-DBORINGSSL_LIB=${CURRENT_INSTALLED_DIR}/lib" + OPTIONS_DEBUG + "-DBORINGSSL_LIB=${CURRENT_INSTALLED_DIR}/debug/lib" + -DLSQUIC_DEVEL=ON +) + +vcpkg_cmake_install() +if(VCPKG_TARGET_IS_WINDOWS) + # Upstream removed installation of this header after merging changes + file(INSTALL "${SOURCE_PATH}/wincompat/vc_compat.h" DESTINATION "${CURRENT_INSTALLED_DIR}/include/lsquic") +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME lsquic) + +# Concatenate license files and install +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/LICENSE.chrome" +) + +file(INSTALL "${CURRENT_BUILDTREES_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Remove duplicated include directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + diff --git a/external_imported/vcpkg/ports/liblsquic/vcpkg.json b/external_imported/vcpkg/ports/liblsquic/vcpkg.json new file mode 100644 index 000000000..481a3bf16 --- /dev/null +++ b/external_imported/vcpkg/ports/liblsquic/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "liblsquic", + "version": "3.1.1", + "description": "An implementation of the QUIC and HTTP/3 protocols.", + "homepage": "https://github.com/litespeedtech/lsquic", + "license": "MIT AND BSD-3-Clause", + "supports": "!x86", + "dependencies": [ + "boringssl", + { + "name": "getopt", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/external_imported/vcpkg/ports/liblzma/build-tools.patch b/external_imported/vcpkg/ports/liblzma/build-tools.patch new file mode 100644 index 000000000..6ccfa2ce4 --- /dev/null +++ b/external_imported/vcpkg/ports/liblzma/build-tools.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cddbccb..63c8f3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -492,6 +492,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblzmaConfig.cmake" + COMPONENT liblzma_Development) + + ++if(BUILD_TOOLS) + ############################################################################# + # getopt_long + ############################################################################# +@@ -663,3 +664,4 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" + COMPONENT xz) + endif() ++endif() +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/liblzma/portfile.cmake b/external_imported/vcpkg/ports/liblzma/portfile.cmake index 7c1ce3b6e..052281e3f 100644 --- a/external_imported/vcpkg/ports/liblzma/portfile.cmake +++ b/external_imported/vcpkg/ports/liblzma/portfile.cmake @@ -9,10 +9,17 @@ vcpkg_from_github( fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. add_support_ios.patch # add install bundle info for support ios + build-tools.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake index 32ea80155..826cdba06 100644 --- a/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -13,7 +13,7 @@ if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND NOT CMAKE_DISA if(CMAKE_VERSION VERSION_LESS 3.16) # Older versions of FindLibLZMA.cmake need a single lib in LIBLZMA_LIBRARY. set(z_vcpkg_liblzma_fixup_needed 1) - set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}") + set(LIBLZMA_LIBRARY "${LIBLZMA_LIBRARY_RELEASE}" CACHE INTERNAL "") elseif(NOT TARGET LibLZMA::LibLZMA) set(z_vcpkg_liblzma_fixup_needed 1) endif() diff --git a/external_imported/vcpkg/ports/liblzma/vcpkg.json b/external_imported/vcpkg/ports/liblzma/vcpkg.json index c2c5a5a84..9d37b9a05 100644 --- a/external_imported/vcpkg/ports/liblzma/vcpkg.json +++ b/external_imported/vcpkg/ports/liblzma/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblzma", "version-semver": "5.2.5", - "port-version": 5, + "port-version": 6, "description": "Compression library with an API similar to that of zlib.", "homepage": "https://github.com/xz-mirror/xz", "license": null, @@ -14,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!windows, mingw" + } + } } diff --git a/external_imported/vcpkg/ports/libmariadb/arm64.patch b/external_imported/vcpkg/ports/libmariadb/arm64.patch deleted file mode 100644 index 4d8e9ac8d..000000000 --- a/external_imported/vcpkg/ports/libmariadb/arm64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 640a35bea..6c8d93250 100755 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -410,10 +410,6 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - - SIGN_TARGET(libmariadb) - --IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) -- SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") --ENDIF() -- - IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR - CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR - CMAKE_SYSTEM_NAME MATCHES "GNU") diff --git a/external_imported/vcpkg/ports/libmariadb/export-cmake-targets.patch b/external_imported/vcpkg/ports/libmariadb/export-cmake-targets.patch deleted file mode 100644 index 13c6c1a61..000000000 --- a/external_imported/vcpkg/ports/libmariadb/export-cmake-targets.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index c109a20..e1fa3f1 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -405,6 +405,7 @@ ELSE() - ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) - ENDIF() -+TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) - - TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - -@@ -453,13 +454,30 @@ ENDIF() - - INSTALL(TARGETS mariadbclient - COMPONENT Development -+ EXPORT unofficial-libmariadb-targets - LIBRARY DESTINATION lib) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries -+ EXPORT unofficial-libmariadb-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -+install(EXPORT unofficial-libmariadb-targets -+ NAMESPACE unofficial:: -+ DESTINATION share/unofficial-libmariadb -+) -+ -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" -+[[include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) -+if("@WITH_SSL@" STREQUAL "OPENSSL") -+ find_dependency(OpenSSL) -+endif() -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") -+]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) - - IF(0) - # On Windows, install PDB diff --git a/external_imported/vcpkg/ports/libmariadb/fix-CMakeLists.patch b/external_imported/vcpkg/ports/libmariadb/fix-CMakeLists.patch new file mode 100644 index 000000000..a31d9a617 --- /dev/null +++ b/external_imported/vcpkg/ports/libmariadb/fix-CMakeLists.patch @@ -0,0 +1,83 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 7faf827..d7300b0 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -417,13 +417,13 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) + TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) + + IF(UNIX) +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) +- SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) + ELSE() +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) + ENDIF() + ++TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) + TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + + SIGN_TARGET(libmariadb) +@@ -460,7 +460,9 @@ IF(WITH_MYSQLCOMPAT) + ENDIF() + ENDIF() + ++IF(0) + create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) ++ENDIF() + + SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION + ${CPACK_PACKAGE_VERSION_MAJOR} +@@ -470,13 +472,39 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++IF(VCPKG_MARIADBCLIENT) + INSTALL(TARGETS mariadbclient + COMPONENT Development +- DESTINATION ${INSTALL_LIBDIR}) +-IF(WIN32) ++ EXPORT unofficial-libmariadb-targets ++ LIBRARY DESTINATION lib) ++ELSE() ++ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) ++ENDIF() ++ ++IF(1) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries +- DESTINATION ${INSTALL_LIBDIR}) ++ EXPORT unofficial-libmariadb-targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++install(EXPORT unofficial-libmariadb-targets ++ NAMESPACE unofficial:: ++ DESTINATION share/unofficial-libmariadb ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++if("@WITH_SSL@" STREQUAL "OPENSSL") ++ find_dependency(OpenSSL) ++endif() ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) ++ + ELSE() + # in cmake 3.12+ we can use + #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} +@@ -488,7 +516,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} + COMPONENT Development NAMELINK_ONLY) + ENDIF() + +-IF(MSVC) ++IF(0) + # On Windows, install PDB + INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" + CONFIGURATIONS Debug RelWithDebInfo diff --git a/external_imported/vcpkg/ports/libmariadb/fix-InstallPath.patch b/external_imported/vcpkg/ports/libmariadb/fix-InstallPath.patch index c9794fc58..010fbb45d 100644 --- a/external_imported/vcpkg/ports/libmariadb/fix-InstallPath.patch +++ b/external_imported/vcpkg/ports/libmariadb/fix-InstallPath.patch @@ -11,47 +11,11 @@ index a82dbb7..e9005fa 100644 /* mysqld compile time options */ #ifndef MYSQL_CHARSET -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index bcfd4de..c109a20 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -398,10 +398,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) - TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) - - IF(UNIX) -- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) -+ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") - ELSE() -- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) -+ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) - ENDIF() - -@@ -453,13 +453,15 @@ ENDIF() - - INSTALL(TARGETS mariadbclient - COMPONENT Development -- DESTINATION ${INSTALL_LIBDIR}) -+ LIBRARY DESTINATION lib) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries -- DESTINATION ${INSTALL_LIBDIR}) -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - - --IF(MSVC) -+IF(0) - # On Windows, install PDB - INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" - CONFIGURATIONS Debug RelWithDebInfo diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in -index 5574943..fc1ca7c 100644 +index 36c0117..4184e4b 100644 --- a/mariadb_config/mariadb_config.c.in +++ b/mariadb_config/mariadb_config.c.in -@@ -210,7 +210,7 @@ end: +@@ -225,7 +225,7 @@ end: } if (!p || !p[0]) { diff --git a/external_imported/vcpkg/ports/libmariadb/no-extra-static-lib.patch b/external_imported/vcpkg/ports/libmariadb/no-extra-static-lib.patch deleted file mode 100644 index 333be1249..000000000 --- a/external_imported/vcpkg/ports/libmariadb/no-extra-static-lib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 39fa709..a726a6d 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -455,10 +455,14 @@ IF(NOT WIN32) - SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") - ENDIF() - -+if(VCPKG_MARIADBCLIENT) - INSTALL(TARGETS mariadbclient - COMPONENT Development - EXPORT unofficial-libmariadb-targets - LIBRARY DESTINATION lib) -+else() -+ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) -+endif() - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries - EXPORT unofficial-libmariadb-targets diff --git a/external_imported/vcpkg/ports/libmariadb/pkgconfig.patch b/external_imported/vcpkg/ports/libmariadb/pkgconfig.patch index a0cc1c18d..2851a8357 100644 --- a/external_imported/vcpkg/ports/libmariadb/pkgconfig.patch +++ b/external_imported/vcpkg/ports/libmariadb/pkgconfig.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0be0fb1..33565f5 100644 +index a109325..b56403c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -393,7 +393,7 @@ ENDIF() +@@ -420,7 +420,7 @@ ENDIF() INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(libmariadb) @@ -12,7 +12,7 @@ index 0be0fb1..33565f5 100644 ENDIF() diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt -index 70e619b..7a22fa1 100644 +index 743ae52..482a4cf 100644 --- a/mariadb_config/CMakeLists.txt +++ b/mariadb_config/CMakeLists.txt @@ -30,6 +30,15 @@ IF(${rllength} GREATER 0) @@ -41,7 +41,7 @@ index 70e619b..7a22fa1 100644 IF(CMAKE_SYSTEM_NAME MATCHES AIX) @@ -61,6 +71,7 @@ ENDIF() INSTALL(TARGETS mariadb_config - DESTINATION "bin" + DESTINATION "${INSTALL_BINDIR}" COMPONENT Development) +endif() diff --git a/external_imported/vcpkg/ports/libmariadb/portfile.cmake b/external_imported/vcpkg/ports/libmariadb/portfile.cmake index 5ec772680..281ad55d7 100644 --- a/external_imported/vcpkg/ports/libmariadb/portfile.cmake +++ b/external_imported/vcpkg/ports/libmariadb/portfile.cmake @@ -1,4 +1,4 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") endif() @@ -6,32 +6,26 @@ if("openssl" IN_LIST FEATURES AND "schannel" IN_LIST FEATURES) message(FATAL_ERROR "Only one SSL backend must be selected.") endif() -if("schannel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature schannel not supported on non-Windows platforms.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariadb-corporation/mariadb-connector-c - REF b2bb1b213c79169b7c994a99f21f47f11be465d4 # v3.1.15 - SHA512 51ebd2e9fd505eebc7691c60fe0b86cfc5368f8b370fba6c3ec8f5514319ef1e0de4910ad5e093cd7d5e5c7782120e22e8c85c94af9389fa4e240cedf012d755 - HEAD_REF 3.1 + REF 5e94e7c27ffad7e76665b1333a67975316b9c3c2 # v3.3.1 + SHA512 0f740f88f64037990bf9d4593574b147ee02adb1fbbeb03c0dec745f0ee27d7cf03417dd09546ab70e16b4465622b8567864dbb243de0a3a7ffaebe313f7c231 + HEAD_REF 3.3 PATCHES - arm64.patch md.patch disable-test-build.patch fix-InstallPath.patch fix-iconv.patch - export-cmake-targets.patch pkgconfig.patch - no-extra-static-lib.patch fix-openssl.patch + fix-CMakeLists.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - iconv WITH_ICONV - mariadbclient VCPKG_MARIADBCLIENT + FEATURES + iconv WITH_ICONV + mariadbclient VCPKG_MARIADBCLIENT ) if("openssl" IN_LIST FEATURES) @@ -46,7 +40,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong + -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong -DINSTALL_LIBDIR=lib -DINSTALL_PLUGINDIR=plugins/${PORT} -DWITH_UNIT_TESTS=OFF @@ -69,9 +63,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") endif() endif() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# copy license file file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libmariadb/vcpkg.json b/external_imported/vcpkg/ports/libmariadb/vcpkg.json index 6d0742e7f..0d40cc465 100644 --- a/external_imported/vcpkg/ports/libmariadb/vcpkg.json +++ b/external_imported/vcpkg/ports/libmariadb/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libmariadb", - "version-semver": "3.1.15", + "version-semver": "3.3.1", + "port-version": 1, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ { @@ -35,7 +37,8 @@ ] }, "schannel": { - "description": "SSL support (Secure Channel)" + "description": "SSL support (Secure Channel)", + "supports": "windows | mingw" }, "ssl": { "description": "Default SSL backend", diff --git a/external_imported/vcpkg/ports/libmicrodns/portfile.cmake b/external_imported/vcpkg/ports/libmicrodns/portfile.cmake new file mode 100644 index 000000000..87908a1f9 --- /dev/null +++ b/external_imported/vcpkg/ports/libmicrodns/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO videolabs/libmicrodns + REF 0.2.0 + SHA512 6389ad9edaf1af7c831e8c05e4800964b13cf0eed2063fa3675e7b87c49428ae7b68ac4ed1e742ed5d46ea3ded190e3de076e73ebf167422505257d7b1a03e25 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/libmicrodns/vcpkg.json b/external_imported/vcpkg/ports/libmicrodns/vcpkg.json new file mode 100644 index 000000000..b522539d5 --- /dev/null +++ b/external_imported/vcpkg/ports/libmicrodns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libmicrodns", + "version": "0.2.0", + "description": "Minimal mDNS resolver (and announcer) library", + "homepage": "https://github.com/videolabs/libmicrodns", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/libmodplug/portfile.cmake b/external_imported/vcpkg/ports/libmodplug/portfile.cmake index a7af03816..cbc4e4407 100644 --- a/external_imported/vcpkg/ports/libmodplug/portfile.cmake +++ b/external_imported/vcpkg/ports/libmodplug/portfile.cmake @@ -4,7 +4,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(STATIC_PATCH "001-automagically-define-modplug-static.patch") endif() -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Konstanty/libmodplug REF ${MODPLUG_HASH} @@ -17,14 +17,14 @@ vcpkg_from_github(ARCHIVE 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 ) -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_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libmodplug/vcpkg.json b/external_imported/vcpkg/ports/libmodplug/vcpkg.json index d5c841955..d9a4feaa5 100644 --- a/external_imported/vcpkg/ports/libmodplug/vcpkg.json +++ b/external_imported/vcpkg/ports/libmodplug/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libmodplug", - "version-string": "0.8.9.0", - "port-version": 9, + "version": "0.8.9.0", + "port-version": 10, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", - "supports": "!uwp" + "license": null, + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libmount/portfile.cmake b/external_imported/vcpkg/ports/libmount/portfile.cmake index 3feac3d30..b51870336 100644 --- a/external_imported/vcpkg/ports/libmount/portfile.cmake +++ b/external_imported/vcpkg/ports/libmount/portfile.cmake @@ -1,12 +1,11 @@ set(VERSION_MAJOR 2) -set(VERSION_MINOR 37) -set(VERSION_PATCH 2) -set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(VERSION_MINOR 38) +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) vcpkg_download_distfile(ARCHIVE URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION_MAJOR}.${VERSION_MINOR}/util-linux-${VERSION}.tar.xz" FILENAME "util-linux-${VERSION}.tar.xz" - SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d + SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/libmount/vcpkg.json b/external_imported/vcpkg/ports/libmount/vcpkg.json index 7b5383c89..ab45e1cea 100644 --- a/external_imported/vcpkg/ports/libmount/vcpkg.json +++ b/external_imported/vcpkg/ports/libmount/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libmount", - "version": "2.37.2", + "version": "2.38", "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", "supports": "linux" } diff --git a/external_imported/vcpkg/ports/libmt32emu/portfile.cmake b/external_imported/vcpkg/ports/libmt32emu/portfile.cmake index 9eea719a5..a7fc0a2c6 100644 --- a/external_imported/vcpkg/ports/libmt32emu/portfile.cmake +++ b/external_imported/vcpkg/ports/libmt32emu/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO munt/munt - REF 004800c20b1edaab921e08f69133fc2a4bd3b8e8 #vlibmt32emu_2_6_2 - SHA512 3a47c269d285f3930eefda4cae6f1c7e157fc4e88d7d64ad029542586b6592b32d5f9bf0e22344e27a21869aea2191051505f3727e52dff268cf2be4d52f15c3 + REF 08aba2f0018f4e7c2af855c268a97b8b84f8dc06 #vlibmt32emu_2_7_0 + SHA512 ef277767c6c18b1aa341b2e2cdac04c27bc19ef0aa2f1e0a4125c92128f64d5938eab53cf1d6bf2f9abaa5a59d14873e91e1518878165af48ac6b93c3e208aa5 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json index 115c3206e..45be996b2 100644 --- a/external_imported/vcpkg/ports/libmt32emu/vcpkg.json +++ b/external_imported/vcpkg/ports/libmt32emu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmt32emu", - "version": "2.6.2", + "version": "2.7.0", "description": "A MT-32 emulator", "homepage": "https://github.com/munt/munt/tree/master/mt32emu", "license": "GPL-2.0-or-later", diff --git a/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch b/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch new file mode 100644 index 000000000..87b0ba640 --- /dev/null +++ b/external_imported/vcpkg/ports/libmysql/Add-target-include-directories.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 88b53e7..f49e44d 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -179,6 +179,7 @@ MACRO(MERGE_LIBRARIES_SHARED) + 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) + ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE}) ++ TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) + + IF(ARG_EXCLUDE_FROM_ALL) + IF(NOT ARG_SKIP_INSTALL) diff --git a/external_imported/vcpkg/ports/libmysql/portfile.cmake b/external_imported/vcpkg/ports/libmysql/portfile.cmake index 5e3311131..f70ec00a6 100644 --- a/external_imported/vcpkg/ports/libmysql/portfile.cmake +++ b/external_imported/vcpkg/ports/libmysql/portfile.cmake @@ -2,10 +2,6 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") endif() -if (VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-server @@ -19,16 +15,18 @@ vcpkg_from_github( export-cmake-targets.patch 004-added-limits-include.patch openssl.patch + Add-target-include-directories.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") -set(STACK_DIRECTION) +set(STACK_DIRECTION "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(STACK_DIRECTION -DSTACK_DIRECTION=-1) endif() #Skip the version check for Visual Studio +set(FORCE_UNSUPPORTED_COMPILER "") if(VCPKG_TARGET_IS_WINDOWS) set(FORCE_UNSUPPORTED_COMPILER 1) endif() diff --git a/external_imported/vcpkg/ports/libmysql/vcpkg.json b/external_imported/vcpkg/ports/libmysql/vcpkg.json index 56880427e..15ae0c393 100644 --- a/external_imported/vcpkg/ports/libmysql/vcpkg.json +++ b/external_imported/vcpkg/ports/libmysql/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 6, + "port-version": 8, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", + "license": "GPL-2.0-or-later", "supports": "!(windows & x86) & !uwp", "dependencies": [ "boost-algorithm", @@ -14,6 +15,10 @@ "icu", "libevent", "lz4", + { + "name": "ncurses", + "platform": "!windows | mingw" + }, "openssl", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libnice/portfile.cmake b/external_imported/vcpkg/ports/libnice/portfile.cmake index 1f8596647..58ed00f05 100644 --- a/external_imported/vcpkg/ports/libnice/portfile.cmake +++ b/external_imported/vcpkg/ports/libnice/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_gitlab( ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc) -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)' @@ -35,6 +35,9 @@ vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES stunbdc stund AUTO_CLEAN) vcpkg_fixup_pkgconfig() -file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${SOURCE_PATH}/COPYING.MPL" 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" + "${SOURCE_PATH}/COPYING.LGPL" + "${SOURCE_PATH}/COPYING.MPL" +) diff --git a/external_imported/vcpkg/ports/libnice/vcpkg.json b/external_imported/vcpkg/ports/libnice/vcpkg.json index 59acb444c..4a278f10d 100644 --- a/external_imported/vcpkg/ports/libnice/vcpkg.json +++ b/external_imported/vcpkg/ports/libnice/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libnice", "version": "0.1.18", + "port-version": 1, "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", - "license": "LGPL-2.1-only", + "license": "LGPL-2.1-only AND MPL-1.1", "dependencies": [ "glib", { diff --git a/external_imported/vcpkg/ports/libopensp/opensp.pc.in b/external_imported/vcpkg/ports/libopensp/opensp.pc.in new file mode 100644 index 000000000..9ca06dce8 --- /dev/null +++ b/external_imported/vcpkg/ports/libopensp/opensp.pc.in @@ -0,0 +1,12 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include/OpenSP + +Name: opensp +Description: SGML parser algorithm library +Version: @OPENSP_VERSION@ +Libs: -L${libdir} -losp +Libs.private: @EXTRA_LIBS@ +Cflags: -I${includedir} +Cflags.private: \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libopensp/portfile.cmake b/external_imported/vcpkg/ports/libopensp/portfile.cmake index aa7fdadff..cf92ff86f 100644 --- a/external_imported/vcpkg/ports/libopensp/portfile.cmake +++ b/external_imported/vcpkg/ports/libopensp/portfile.cmake @@ -28,9 +28,9 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_cmake_install() else() - set(EXTRA_OPTS "") if(VCPKG_TARGET_IS_OSX) - list(APPEND EXTRA_OPTS "LDFLAGS=-framework CoreFoundation \$LDFLAGS") # libintl links to it + # libintl links to those + set(EXTRA_LIBS "-framework CoreFoundation -lintl -liconv") endif() vcpkg_configure_make( @@ -38,12 +38,13 @@ else() SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-doc-build - ${EXTRA_OPTS} + "LDFLAGS=${EXTRA_LIBS} \$LDFLAGS" ) vcpkg_install_make() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/opensp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opensp.pc" @ONLY) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -53,4 +54,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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/external_imported/vcpkg/ports/libopensp/vcpkg.json b/external_imported/vcpkg/ports/libopensp/vcpkg.json index b61ba7152..adf16ff17 100644 --- a/external_imported/vcpkg/ports/libopensp/vcpkg.json +++ b/external_imported/vcpkg/ports/libopensp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libopensp", "version": "1.5.2", + "port-version": 1, "description": "SGML parser algorithm", "homepage": "http://openjade.sourceforge.net", + "license": "MIT", "dependencies": [ { "name": "gettext", diff --git a/external_imported/vcpkg/ports/libopensp/windows_cmake_build.diff b/external_imported/vcpkg/ports/libopensp/windows_cmake_build.diff index 2c9e82537..bac0b152a 100644 --- a/external_imported/vcpkg/ports/libopensp/windows_cmake_build.diff +++ b/external_imported/vcpkg/ports/libopensp/windows_cmake_build.diff @@ -1,13 +1,9 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/CMakeLists.txt OpenSP-1.5.2/CMakeLists.txt --- OpenSP-1.5.2.orig/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 +++ OpenSP-1.5.2/CMakeLists.txt 2014-08-24 17:23:19.941495700 +0300 -@@ -0,0 +1,24 @@ +@@ -0,0 +1,20 @@ +project(opensp) + -+set (VERSION_MAJOR 1) -+set (VERSION_MINOR 5) -+set (VERSION_PATH 2) -+ +cmake_minimum_required(VERSION 2.6) + +include_directories( @@ -54,7 +50,7 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h #define SP_HAVE_SETMODE #define SP_DLLEXPORT __declspec(dllexport) #define SP_DLLIMPORT __declspec(dllimport) -@@ -301,15 +312,8 @@ +@@ -301,12 +312,5 @@ #define PATH_SEPARATOR ':' #endif @@ -66,12 +62,7 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h -#endif - // NOTE: This is processed as a Makefile, not as a header by autoconf. --#define SP_PACKAGE "OpenSP" --#define SP_VERSION "1.5.2" -+#define SP_PACKAGE "@PACKAGE@" -+#define SP_VERSION "@VERSION@" - - #endif /* not config_INCLUDED */ + #define SP_PACKAGE "OpenSP" diff -Nru -x '*~' OpenSP-1.5.2.orig/generic/SGMLApplication.h OpenSP-1.5.2/generic/SGMLApplication.h --- OpenSP-1.5.2.orig/generic/SGMLApplication.h 2005-05-14 12:17:41.000000000 +0300 +++ OpenSP-1.5.2/generic/SGMLApplication.h 2014-08-24 17:23:19.957120700 +0300 diff --git a/external_imported/vcpkg/ports/libosmium/portfile.cmake b/external_imported/vcpkg/ports/libosmium/portfile.cmake index f764134df..f0443e3d6 100644 --- a/external_imported/vcpkg/ports/libosmium/portfile.cmake +++ b/external_imported/vcpkg/ports/libosmium/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium - REF v2.17.1 - SHA512 08d1eb272b82364118b97213310e5d62fdbb071cfad74989bdc5bb25f9e14b067d53016d19bfed3972d3385343fc74edf86407860be83c59e74902cd1f26bb33 + REF v2.18.0 + SHA512 bfe4d5b08e284abb21280205437c62d260948c8585cc8d10f0c3496fd29df1ff6c6bc436283207f292d6a8af911835ebef64403c3fde2a262b55fde5296c13ce ) set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") diff --git a/external_imported/vcpkg/ports/libosmium/vcpkg.json b/external_imported/vcpkg/ports/libosmium/vcpkg.json index ffd7c5861..9f1a9dad5 100644 --- a/external_imported/vcpkg/ports/libosmium/vcpkg.json +++ b/external_imported/vcpkg/ports/libosmium/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libosmium", - "version-semver": "2.17.1", - "port-version": 1, + "version-semver": "2.18.0", "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", "license": "BSL-1.0", @@ -9,6 +8,7 @@ "boost", "bzip2", "expat", + "lz4", "proj", "protozero", "utfcpp", diff --git a/external_imported/vcpkg/ports/libpff/portfile.cmake b/external_imported/vcpkg/ports/libpff/portfile.cmake index 00be14f66..04e25f71f 100644 --- a/external_imported/vcpkg/ports/libpff/portfile.cmake +++ b/external_imported/vcpkg/ports/libpff/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(LIB_VERSION 20180714) -set(LIB_FILENAME libpff-experimental-${LIB_VERSION}.tar.gz) +set(LIB_VERSION 20211114) +set(LIB_FILENAME libpff-alpha-${LIB_VERSION}.tar.gz) # Release distribution file contains configured sources, while the source code in the repository does not. vcpkg_download_distfile(ARCHIVE URLS "https://github.com/libyal/libpff/releases/download/${LIB_VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 + SHA512 ad2cf4b0841c448b60738cd2f340868c0f11eb34167bfe5b093645a2a080d694e199afe4fef5eeea1016487820132be33f8e51910d2142ff032320ad2dbeb59d ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/libpff/vcpkg.json b/external_imported/vcpkg/ports/libpff/vcpkg.json index b8eaba407..079e4fa82 100644 --- a/external_imported/vcpkg/ports/libpff/vcpkg.json +++ b/external_imported/vcpkg/ports/libpff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpff", - "version-date": "2018-07-14", - "port-version": 3, + "version-date": "2021-11-14", "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", diff --git a/external_imported/vcpkg/ports/libpng/cmake.patch b/external_imported/vcpkg/ports/libpng/cmake.patch index f2eb6aa8e..f8cd527f5 100644 --- a/external_imported/vcpkg/ports/libpng/cmake.patch +++ b/external_imported/vcpkg/ports/libpng/cmake.patch @@ -1,8 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6451fcf..6599e1d 100644 +index a8e5100..0ccac52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,7 +44,7 @@ if(NOT PNG_BUILD_ZLIB) +@@ -40,11 +40,11 @@ option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF) + + if(NOT PNG_BUILD_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(${ZLIB_INCLUDE_DIR}) ++ set(ZLIB_LIBRARY ZLIB::ZLIB) endif() if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) @@ -11,37 +16,12 @@ index 6451fcf..6599e1d 100644 else() # libm is not needed and/or not available set(M_LIBRARY "") -@@ -551,21 +551,14 @@ endif() - - if(PNG_STATIC) - # does not work without changing name -- set(PNG_LIB_NAME_STATIC png_static) - add_library(png_static STATIC ${libpng_sources}) - add_dependencies(png_static genfiles) +@@ -557,7 +557,7 @@ if(PNG_STATIC) # MSVC doesn't use a different file extension for shared vs. static # libs. We are able to change OUTPUT_NAME to remove the _static # for all other platforms. - if(NOT MSVC) -- set_target_properties(png_static PROPERTIES -- OUTPUT_NAME "${PNG_LIB_NAME}" -- CLEAN_DIRECT_OUTPUT 1) -- else() -- set_target_properties(png_static PROPERTIES -- OUTPUT_NAME "${PNG_LIB_NAME}_static" -- CLEAN_DIRECT_OUTPUT 1) -- endif() -+ set_target_properties(png_static PROPERTIES -+ OUTPUT_NAME "${PNG_LIB_NAME}" -+ CLEAN_DIRECT_OUTPUT 1) - list(APPEND PNG_LIB_TARGETS png_static) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name -@@ -915,7 +908,7 @@ endif() - - # Create an export file that CMake users can include() to import our targets. - if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) -- install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) -+ install(EXPORT libpng DESTINATION lib/libpng FILE libpngConfig.cmake) - endif() - - # what's with libpng-manual.txt and all the extra files? ++ if(1) + set_target_properties(png_static PROPERTIES + OUTPUT_NAME "${PNG_LIB_NAME}" + CLEAN_DIRECT_OUTPUT 1) diff --git a/external_imported/vcpkg/ports/libpng/fix-export-targets.patch b/external_imported/vcpkg/ports/libpng/fix-export-targets.patch index ec331c48d..23812c265 100644 --- a/external_imported/vcpkg/ports/libpng/fix-export-targets.patch +++ b/external_imported/vcpkg/ports/libpng/fix-export-targets.patch @@ -1,65 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b45e878..19f8692 100644 +index 3931f12..b570fa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -536,7 +536,7 @@ if(PNG_SHARED) - set_target_properties(png PROPERTIES PREFIX "lib") - set_target_properties(png PROPERTIES IMPORT_PREFIX "lib") - endif() -- target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png ZLIB::ZLIB ${M_LIBRARY}) - - if(UNIX AND AWK) - if(HAVE_LD_VERSION_SCRIPT) -@@ -564,7 +564,7 @@ if(PNG_STATIC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(png_static PROPERTIES PREFIX "lib") - endif() -- target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_static ZLIB::ZLIB ${M_LIBRARY}) - endif() - - if(PNG_FRAMEWORK) -@@ -581,7 +581,7 @@ if(PNG_FRAMEWORK) - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - PUBLIC_HEADER "${libpng_public_hdrs}" - OUTPUT_NAME png) -- target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png_framework ZLIB::ZLIB ${M_LIBRARY}) - endif() - - if(NOT PNG_LIB_TARGETS) -@@ -746,7 +746,7 @@ if(PNG_SHARED) - set(PNG_BIN_TARGETS pngfix) - - add_executable(png-fix-itxt ${png_fix_itxt_sources}) -- target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ target_link_libraries(png-fix-itxt ZLIB::ZLIB ${M_LIBRARY}) - list(APPEND PNG_BIN_TARGETS png-fix-itxt) - endif() - -@@ -851,7 +851,7 @@ endif() - # INSTALL - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - install(TARGETS ${PNG_LIB_TARGETS} -- EXPORT libpng -+ EXPORT libpng-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -919,7 +919,14 @@ endif() - +@@ -909,6 +909,12 @@ endif() # Create an export file that CMake users can include() to import our targets. if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) -- install(EXPORT libpng DESTINATION lib/libpng FILE libpngConfig.cmake) -+ install(EXPORT libpng-targets DESTINATION lib/libpng) -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" -+ [[include(CMakeFindDependencyMacro) + install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) ++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" " ++include(CMakeFindDependencyMacro) +find_dependency(ZLIB) -+include("${CMAKE_CURRENT_LIST_DIR}/libpng-targets.cmake") -+ ]]) -+ -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/libpng) ++include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\") ++") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng") endif() # what's with libpng-manual.txt and all the extra files? diff --git a/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch b/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch new file mode 100644 index 000000000..b3290a0fd --- /dev/null +++ b/external_imported/vcpkg/ports/libpng/fix-msa-support-for-mips.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c1d632..a2a0d0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,8 +158,8 @@ endif() + # set definitions and sources for MIPS + if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR + CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*") +- set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) +- set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations: ++ set(PNG_MIPS_MSA_POSSIBLE_VALUES on off check) ++ set(PNG_MIPS_MSA "check" CACHE STRING "Enable MIPS_MSA optimizations: + off: disable the optimizations") + set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS + ${PNG_MIPS_MSA_POSSIBLE_VALUES}) +@@ -173,6 +173,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR + mips/filter_msa_intrinsics.c) + if(${PNG_MIPS_MSA} STREQUAL "on") + add_definitions(-DPNG_MIPS_MSA_OPT=2) ++ else() ++ add_definitions(-DPNG_MIPS_MSA_CHECK_SUPPORTED) + endif() + else() + add_definitions(-DPNG_MIPS_MSA_OPT=0) + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libpng/pkgconfig.2.patch b/external_imported/vcpkg/ports/libpng/pkgconfig.2.patch deleted file mode 100644 index 99c1b1930..000000000 --- a/external_imported/vcpkg/ports/libpng/pkgconfig.2.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6451fcf..4090f42 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -821,20 +821,31 @@ endif() - # Only do this on Windows for Cygwin - the files don't make much sense outside - # of a UNIX look-alike. - if(NOT WIN32 OR CYGWIN OR MINGW) -- set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -- set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -- set(LIBS "-lz -lm") -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in -- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) -- create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) -- -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in -- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) -- create_symlink(libpng-config FILE ${PNGLIB_NAME}-config) -+ set(LIBS "-lz") -+ if(NOT APPLE) -+ string(APPEND LIBS " -lm") -+ endif() -+else() -+ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LIBS "-lzlibd") -+ else() -+ set(LIBS "-lzlib") -+ endif() - endif() - -+set(prefix ${CMAKE_INSTALL_PREFIX}) -+set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -+set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -+ -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) -+create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) -+ -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) -+create_symlink(libpng-config FILE ${PNGLIB_NAME}-config) -+ - # SET UP LINKS - if(PNG_SHARED) - set_target_properties(png PROPERTIES diff --git a/external_imported/vcpkg/ports/libpng/pkgconfig.patch b/external_imported/vcpkg/ports/libpng/pkgconfig.patch index 5640f3834..437c86836 100644 --- a/external_imported/vcpkg/ports/libpng/pkgconfig.patch +++ b/external_imported/vcpkg/ports/libpng/pkgconfig.patch @@ -1,24 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6599e1d7d..c0bb2fad2 100644 +index 0ccac52..218747a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -894,13 +894,13 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) - install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) - install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) - # Install pkg-config files -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config -- DESTINATION bin) -+ DESTINATION tools/libpng) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config -- DESTINATION bin) -+ DESTINATION tools/libpng) - endif() +@@ -820,12 +820,15 @@ endif() + # We use the same files like ./configure, so we have to set its vars. + # Only do this on Windows for Cygwin - the files don't make much sense outside + # of a UNIX look-alike. +-if(NOT WIN32 OR CYGWIN OR MINGW) ++if(1) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +- set(LIBS "-lz -lm") ++ set(LIBS "") ++ if(M_LIBRARY) ++ string(APPEND LIBS "-lm") ++ endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) + create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc) +@@ -894,6 +897,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) + endif() + + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++elseif(0) + # Install man pages + if(NOT PNG_MAN_DIR) + set(PNG_MAN_DIR "share/man") diff --git a/external_imported/vcpkg/ports/libpng/portfile.cmake b/external_imported/vcpkg/ports/libpng/portfile.cmake index 48e4c6ac0..7f681a915 100644 --- a/external_imported/vcpkg/ports/libpng/portfile.cmake +++ b/external_imported/vcpkg/ports/libpng/portfile.cmake @@ -1,32 +1,32 @@ set(LIBPNG_VER 1.6.37) # Download the apng patch -set(LIBPNG_APNG_OPTION ) +set(LIBPNG_APNG_PATCH_PATH "") +set(LIBPNG_APNG_OPTION "") if ("apng" IN_LIST FEATURES) - # Get (g)awk installed - vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) - set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") - vcpkg_add_to_path("${AWK_EXE_PATH}") + if(VCPKG_HOST_IS_WINDOWS) + # Get (g)awk and gzip installed + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk gzip) + set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") + vcpkg_add_to_path("${AWK_EXE_PATH}") + endif() - set(LIBPNG_APG_PATCH_NAME libpng-${LIBPNG_VER}-apng.patch) - set(LIBPNG_APG_PATCH_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APG_PATCH_NAME}) - if (NOT EXISTS ${LIBPNG_APG_PATCH_PATH}) - if (NOT EXISTS ${CURRENT_BUILDTREES_DIR}/src) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src) - endif() - vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE - URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APG_PATCH_NAME}.gz" - FILENAME "${LIBPNG_APG_PATCH_NAME}.gz" - SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b - ) - vcpkg_find_acquire_program(7Z) + set(LIBPNG_APNG_PATCH_NAME "libpng-${LIBPNG_VER}-apng.patch") + vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE + URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${LIBPNG_VER}/${LIBPNG_APNG_PATCH_NAME}.gz" + FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" + SHA512 226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b + ) + set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") + if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") + file(INSTALL "${LIBPNG_APNG_PATCH_ARCHIVE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/src") vcpkg_execute_required_process( - COMMAND ${7Z} x ${LIBPNG_APNG_PATCH_ARCHIVE} -aoa - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src + COMMAND gzip -d "${LIBPNG_APNG_PATCH_NAME}.gz" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" + ALLOW_IN_DOWNLOAD_MODE LOGNAME extract-patch.log ) endif() - set(APNG_EXTRA_PATCH ${LIBPNG_APG_PATCH_PATH}) set(LIBPNG_APNG_OPTION "-DPNG_PREFIX=a") endif() @@ -37,109 +37,67 @@ vcpkg_from_github( SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918 HEAD_REF master PATCHES + "${LIBPNG_APNG_PATCH_PATH}" use_abort.patch cmake.patch - pkgconfig.patch - pkgconfig.2.patch - ${APNG_EXTRA_PATCH} fix-export-targets.patch + pkgconfig.patch macos-arch-fix.patch + fix-msa-support-for-mips.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(PNG_STATIC_LIBS OFF) - set(PNG_SHARED_LIBS ON) -else() - set(PNG_STATIC_LIBS ON) - set(PNG_SHARED_LIBS OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PNG_STATIC) -set(LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION ) +vcpkg_list(SET LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION) if(VCPKG_TARGET_IS_IOS) - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") endif() -set(LD_VERSION_SCRIPT_OPTION ) +vcpkg_list(SET LD_VERSION_SCRIPT_OPTION) if(VCPKG_TARGET_IS_ANDROID) - set(LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") + vcpkg_list(APPEND LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") # for armeabi-v7a, check whether NEON is available - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") else() - list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") + vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPNG_MAN_DIR=share/${PORT}/man ${LIBPNG_APNG_OPTION} ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION} ${LD_VERSION_SCRIPT_OPTION} - -DPNG_STATIC=${PNG_STATIC_LIBS} - -DPNG_SHARED=${PNG_SHARED_LIBS} + -DPNG_STATIC=${PNG_STATIC} + -DPNG_SHARED=${PNG_SHARED} -DPNG_TESTS=OFF -DSKIP_INSTALL_PROGRAMS=ON -DSKIP_INSTALL_EXECUTABLES=ON -DSKIP_INSTALL_FILES=OFF OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON + MAYBE_UNUSED_VARIABLES + PNG_ARM_NEON ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng) -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc") -if(EXISTS ${_file}) - file(READ "${_file}" _contents) - if(VCPKG_TARGET_IS_WINDOWS) - string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}") - else() - string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}") - endif() - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlibd" _contents "${_contents}") - else() - string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") -endif() -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng.pc") -if(EXISTS ${_file}) - file(READ "${_file}" _contents) - if(VCPKG_TARGET_IS_WINDOWS) - string(REGEX REPLACE "-lpng16(d)?" "-llibpng16d" _contents "${_contents}") - else() - string(REGEX REPLACE "-lpng16(d)?" "-lpng16d" _contents "${_contents}") - endif() - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlibd" _contents "${_contents}") - else() - string(REPLACE "-lzlib" "-lzlibd" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") -endif() -if(VCPKG_TARGET_IS_WINDOWS) - set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc") - if(EXISTS ${_file}) - file(READ "${_file}" _contents) - string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}") - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlib" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") - endif() - set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng.pc") - if(EXISTS ${_file}) - file(READ "${_file}" _contents) - string(REPLACE "-lpng16" "-llibpng16" _contents "${_contents}") - if(VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lz" "-lzlib" _contents "${_contents}") - endif() - file(WRITE "${_file}" "${_contents}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/png") + +vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16") +elseif(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-lpng16d") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) +file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" RENAME "libpng.pc") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/debug/tools") +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) diff --git a/external_imported/vcpkg/ports/libpng/usage b/external_imported/vcpkg/ports/libpng/usage new file mode 100644 index 000000000..19203399c --- /dev/null +++ b/external_imported/vcpkg/ports/libpng/usage @@ -0,0 +1,4 @@ +The package libpng is compatible with built-in CMake targets: + + find_package(PNG REQUIRED) + target_link_libraries(main PRIVATE PNG::PNG) diff --git a/external_imported/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..de1e087fc --- /dev/null +++ b/external_imported/vcpkg/ports/libpng/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,3 @@ +find_library(PNG_LIBRARY_RELEASE NAMES png16 libpng16 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(PNG_LIBRARY_DEBUG NAMES png16d libpng16d NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +_find_package(${ARGS}) diff --git a/external_imported/vcpkg/ports/libpng/vcpkg.json b/external_imported/vcpkg/ports/libpng/vcpkg.json index 0fe109eb8..74c0dbcb0 100644 --- a/external_imported/vcpkg/ports/libpng/vcpkg.json +++ b/external_imported/vcpkg/ports/libpng/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libpng", "version": "1.6.37", - "port-version": 16, + "port-version": 19, "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", "homepage": "https://github.com/glennrp/libpng", + "license": "libpng-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libpq/libpq.props.in b/external_imported/vcpkg/ports/libpq/libpq.props.in new file mode 100644 index 000000000..d172a4af4 --- /dev/null +++ b/external_imported/vcpkg/ports/libpq/libpq.props.in @@ -0,0 +1,25 @@ + + + + + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ + + + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ + + + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@ + + + + + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ + + + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ + + + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@ + + + diff --git a/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch b/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch index aa1dd2b9f..716e7a0a9 100644 --- a/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch +++ b/external_imported/vcpkg/ports/libpq/patches/fix-configure.patch @@ -1,64 +1,72 @@ diff --git a/configure.ac b/configure.ac -index fba79ee36..4563fa9f7 100644 +index fba79ee..4fadb94 100644 --- a/configure.ac +++ b/configure.ac -@@ -18,15 +18,14 @@ dnl - m4_pattern_forbid(^PGAC_)dnl to catch undefined macros +@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [14.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) - AC_INIT([PostgreSQL], [14.1], [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. --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.])]) -+# m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([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.])]) - AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) --AC_PREFIX_DEFAULT(/usr/local/pgsql) -+#AC_PREFIX_DEFAULT(/usr/local/pgsql) - AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure]) ++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 + fi - [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] + if test "$with_readline" = yes; then +- PGAC_CHECK_READLINE ++ PKG_CHECK_MODULES([READLINE], [readline], [HAVE_LIBREADLINE=1], [pgac_cv_check_readline=no]) ++ LIBS="$READLINE_LIBS $LIBS" + 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.]) fi if test "$with_zlib" = yes; then - AC_CHECK_LIB(z, inflate, [], -+ AC_SEARCH_LIBS(inflate, [z zlib zlibd], [AC_DEFINE(HAVE_LIBZ,1,[Define to 1 if with zlib])], ++ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBS="$ZLIB_LIBS $LIBS"], [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. -@@ -1247,8 +1248,8 @@ if test "$with_ssl" = openssl ; then +@@ -1243,6 +1244,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.]) ++ PKG_CHECK_MODULES([CRYPTO_new_ex_data], [libcrypto], [LIBS="$CRYPTO_new_ex_data_LIBS $LIBS"], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ PKG_CHECK_MODULES([SSL_new], [libssl], [LIBS="$SSL_new_LIBS $LIBS"], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) ++ if false ; then + 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])]) - else -- 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])]) -+ AC_SEARCH_LIBS(CRYPTO_new_ex_data, [libcrypto eay32 crypto], [AC_DEFINE(HAVE_LIBCRYPTO, 1, [Defined to 1 if libcrypto is found])], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) -+ AC_SEARCH_LIBS(SSL_new, [libssl ssleay32 ssl], [AC_DEFINE(HAVE_LIBSSL, 1, [Defined to 1 if libssl is found])], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) +@@ -1250,6 +1254,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 ++ fi # Function introduced in OpenSSL 1.0.2. AC_CHECK_FUNCS([X509_get_signature_nid]) -@@ -1273,15 +1274,15 @@ if test "$with_pam" = yes ; then + # Functions introduced in OpenSSL 1.1.0. We used to check for +@@ -1273,15 +1278,18 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then - AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) -+ AC_SEARCH_LIBS(xmlSaveToBuffer, [xml2 libxml2], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.23], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ LIBS="$LIBXML2_LIBS $LIBS" fi if test "$with_libxslt" = yes ; then - AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) -+ AC_SEARCH_LIBS(xsltCleanupGlobals, [xslt libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ PKG_CHECK_MODULES([LIBXSLT], [libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ LIBS="$LIBXSLT_LIBS $LIBS" fi if test "$with_lz4" = yes ; then - AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) -+ AC_SEARCH_LIBS(LZ4_compress_default, [lz4 lz4d], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ PKG_CHECK_MODULES([LZ4], [liblz4], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ LIBS="$LZ4_LIBS $LIBS" fi # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/external_imported/vcpkg/ports/libpq/patches/linux/configure.patch b/external_imported/vcpkg/ports/libpq/patches/linux/configure.patch deleted file mode 100644 index cd4b30cf8..000000000 --- a/external_imported/vcpkg/ports/libpq/patches/linux/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure b/configure -index 54c852aca..96e2c89ba 100644 ---- a/configure -+++ b/configure -@@ -12452,7 +12452,7 @@ if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lcrypto $LIBS" -+LIBS="-lcrypto -pthread $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -12487,7 +12487,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : - #define HAVE_LIBCRYPTO 1 - _ACEOF - -- LIBS="-lcrypto $LIBS" -+ LIBS="-lcrypto -pthread $LIBS" - - else - as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5 diff --git a/external_imported/vcpkg/ports/libpq/patches/mingw/link-with-crypt32.patch b/external_imported/vcpkg/ports/libpq/patches/mingw/link-with-crypt32.patch deleted file mode 100644 index 67167de1f..000000000 --- a/external_imported/vcpkg/ports/libpq/patches/mingw/link-with-crypt32.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/configure b/configure -index 75210f0..6ea5e1f 100755 ---- a/configure -+++ b/configure -@@ -11708,6 +11708,62 @@ if test "$ac_res" != no; then : - - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing CertOpenStore" >&5 -+$as_echo_n "checking for library containing CertOpenStore... " >&6; } -+if ${ac_cv_search_CertOpenStore+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char CertOpenStore (); -+int -+main () -+{ -+return CertOpenStore (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' crypt32; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_CertOpenStore=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if ${ac_cv_search_CertOpenStore+:} false; then : -+ break -+fi -+done -+if ${ac_cv_search_CertOpenStore+:} false; then : -+ -+else -+ ac_cv_search_CertOpenStore=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_CertOpenStore" >&5 -+$as_echo "$ac_cv_search_CertOpenStore" >&6; } -+ac_res=$ac_cv_search_CertOpenStore -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ - - if test "$with_readline" = yes; then - -diff --git a/configure.in b/configure.in -index 0832636..0911ec0 100644 ---- a/configure.in -+++ b/configure.in -@@ -1158,6 +1158,7 @@ AC_SEARCH_LIBS(sched_yield, rt) - AC_SEARCH_LIBS(gethostbyname_r, nsl) - # Cygwin: - AC_SEARCH_LIBS(shmget, cygipc) -+AC_SEARCH_LIBS(CertOpenStore, crypt32) - - if test "$with_readline" = yes; then - PGAC_CHECK_READLINE diff --git a/external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch b/external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch new file mode 100644 index 000000000..1d16c1270 --- /dev/null +++ b/external_imported/vcpkg/ports/libpq/patches/windows/macro-def.patch @@ -0,0 +1,18 @@ +diff --git a/src/include/common/checksum_helper.h b/src/include/common/checksum_helper.h +index cac7570ea..d0ca1243c 100644 +--- a/src/include/common/checksum_helper.h ++++ b/src/include/common/checksum_helper.h +@@ -33,7 +28,13 @@ + */ + typedef enum pg_checksum_type + { ++#pragma push_macro("CHECKSUM_TYPE_NONE") ++#ifdef CHECKSUM_TYPE_NONE ++// winioctl.h defines CHECKSUM_TYPE_NONE to 0 as a macro. ++#undef CHECKSUM_TYPE_NONE ++#endif + CHECKSUM_TYPE_NONE, ++#pragma pop_macro("CHECKSUM_TYPE_NONE") + CHECKSUM_TYPE_CRC32C, + CHECKSUM_TYPE_SHA224, + CHECKSUM_TYPE_SHA256, diff --git a/external_imported/vcpkg/ports/libpq/portfile.cmake b/external_imported/vcpkg/ports/libpq/portfile.cmake index 02d7e5a97..bd0e708a7 100644 --- a/external_imported/vcpkg/ports/libpq/portfile.cmake +++ b/external_imported/vcpkg/ports/libpq/portfile.cmake @@ -1,41 +1,11 @@ -set(PORT_VERSION 14.1) +set(PORT_VERSION 14.4) # NOTE: the python patches must be regenerated on version update -macro(feature_unsupported) - foreach(_feat ${ARGN}) - if("${FEATURES}" MATCHES "${_feat}") - message(FATAL_ERROR "Feature ${_feat} not supported by configure script on the target platform") - endif() - endforeach() -endmacro() - -macro(feature_not_implemented_yet) - foreach(_feat ${ARGN}) - if("${FEATURES}" MATCHES "${_feat}") - message(FATAL_ERROR "Feature ${_feat} is not yet implement on the target platform") - endif() - endforeach() -endmacro() - -if(VCPKG_TARGET_IS_WINDOWS) - # on windows libpq seems to only depend on openssl gss(kerberos) and ldap on the soruce site_name - # the configuration header depends on zlib, nls, uuid, xml, xlst,gss,openssl,icu - feature_unsupported(readline bonjour libedit systemd llvm) - feature_not_implemented_yet(uuid) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - feature_not_implemented_yet(client python tcl) - endif() -elseif(VCPKG_TARGET_IS_OSX) - feature_not_implemented_yet(readline libedit systemd llvm python tcl uuid) -else() - feature_not_implemented_yet(readline bonjour libedit systemd llvm python tcl uuid) -endif() - ## 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 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd + SHA512 dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb ) set(PATCHES @@ -48,15 +18,10 @@ set(PATCHES patches/windows/python_lib.patch patches/windows/fix-compile-flag-Zi.patch patches/windows/tcl_version.patch - patches/fix-configure.patch + patches/windows/macro-def.patch + patches/fix-configure.patch ) -if(VCPKG_TARGET_IS_MINGW) - list(APPEND PATCHES patches/mingw/link-with-crypt32.patch) -endif() -if(VCPKG_TARGET_IS_LINUX) - list(APPEND PATCHES patches/linux/configure.patch) -endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) @@ -120,6 +85,9 @@ 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}") + file(GLOB SOURCE_FILES ${SOURCE_PATH}/*) foreach(_buildtype ${port_config_list}) # Copy libpq sources. @@ -201,6 +169,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) 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 @@ -208,6 +177,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) /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}\"" ) @@ -244,7 +214,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") #Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -318,8 +287,10 @@ else() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() - if(VCPKG_OSX_SYSROOT) - list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") + 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 diff --git a/external_imported/vcpkg/ports/libpq/vcpkg.json b/external_imported/vcpkg/ports/libpq/vcpkg.json index 210c6e1d7..4f3ed6375 100644 --- a/external_imported/vcpkg/ports/libpq/vcpkg.json +++ b/external_imported/vcpkg/ports/libpq/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libpq", - "version": "14.1", + "version": "14.4", "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", @@ -14,6 +14,10 @@ "bonjour" ], "platform": "osx" + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true } ], "default-features": [ @@ -23,10 +27,12 @@ ], "features": { "bonjour": { - "description": "Build with Bonjour support (--with-bonjour)" + "description": "Build with Bonjour support (--with-bonjour)", + "supports": "osx" }, "client": { - "description": "Build all client tools and libraries (dynamic only?)" + "description": "Build all client tools and libraries (dynamic only?)", + "supports": "!(windows & !mingw & static)" }, "icu": { "description": "Build with support for the ICU library (--with-icu)", @@ -34,18 +40,6 @@ "icu" ] }, - "libedit": { - "description": "prefer libedit (--with-libedit-preferred)", - "dependencies": [ - "libedit" - ] - }, - "llvm": { - "description": "Build with support for LLVM based JIT compilation (--with-llvm)", - "dependencies": [ - "llvm" - ] - }, "lz4": { "description": "Use lz4 (else --without-lz4)", "dependencies": [ @@ -73,6 +67,7 @@ }, "python": { "description": "build the PL/Python server programming language (dynamic only?) (--with-python)", + "supports": "!(windows & (static | mingw))", "dependencies": [ { "name": "libpq", @@ -86,15 +81,14 @@ }, "readline": { "description": "Use readline (else --without-readline)", + "supports": "!windows, mingw", "dependencies": [ "readline" ] }, - "systemd": { - "description": "Build with support for systemd service notifications. (--with-systemd)" - }, "tcl": { "description": "build the PL/Tcl procedural language(dynamic only?) (--with-tcl)", + "supports": "!(windows & (static | mingw))", "dependencies": [ { "name": "libpq", @@ -106,9 +100,6 @@ "tcl" ] }, - "uuid": { - "description": "Build the uuid-ossp module (which provides functions to generate UUIDs) (--with-uuid=LIBRARY LIBRARY=(bsd|e2fs|ossp))" - }, "xml": { "description": "Build with libxml (--with-libxml)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch b/external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch deleted file mode 100644 index 9b9a26e94..000000000 --- a/external_imported/vcpkg/ports/libpqxx/fix_build_with_apple_clang_13.patch +++ /dev/null @@ -1,15 +0,0 @@ -# apple clang 13 has a bug where [[likely]] or [[unlikely]] returns -# don't count for checking that a constexpr function has a return, -# so at least one return must be unmarked ---- a/src/robusttransaction.cxx -+++ b/src/robusttransaction.cxx -@@ -62,9 +62,8 @@ constexpr tx_stat parse_status(std::string_view text) noexcept - case 'i': - if (text == in_progress) - PQXX_LIKELY return tx_in_progress; - break; - } -- PQXX_UNLIKELY - return tx_unknown; - } - diff --git a/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch b/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch index a10b8d161..9892415b0 100644 --- a/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch +++ b/external_imported/vcpkg/ports/libpqxx/fix_build_with_vs2017.patch @@ -1,11 +1,12 @@ -diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx -index 5d24c7e..8087191 100644 ---- a/include/pqxx/compiler-public.hxx -+++ b/include/pqxx/compiler-public.hxx -@@ -43,6 +43,11 @@ +diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx +index abc1a39..cba0242 100644 +--- a/include/pqxx/internal/header-pre.hxx ++++ b/include/pqxx/internal/header-pre.hxx +@@ -90,6 +90,12 @@ // Workarounds for Microsoft Visual C++ # ifdef _MSC_VER ++ +// Workarounds for deprecated attribute syntax error in Visual Studio 2017. +# if _MSC_VER < 1920 +# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE )) @@ -14,7 +15,7 @@ index 5d24c7e..8087191 100644 // Suppress vtables on abstract classes. # define PQXX_NOVTABLE __declspec(novtable) -@@ -112,6 +117,10 @@ +@@ -159,6 +165,10 @@ # define PQXX_NOVTABLE /* novtable */ #endif @@ -22,15 +23,15 @@ index 5d24c7e..8087191 100644 +# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]] +#endif + - // TODO: Assume support once we're on C++20. + // C++20: Assume support. #if defined(PQXX_HAVE_LIKELY) # define PQXX_LIKELY [[likely]] diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx -index f2dcc31..6a74b55 100644 +index ff4a93d..5b300d6 100644 --- a/include/pqxx/stream_from.hxx +++ b/include/pqxx/stream_from.hxx -@@ -148,7 +148,7 @@ public: - /** @deprecated Use factory function @c table() or @c raw_table() instead. +@@ -153,7 +153,7 @@ public: + /** @deprecated Use factories @ref table or @ref raw_table instead. */ template - [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( @@ -38,8 +39,8 @@ index f2dcc31..6a74b55 100644 transaction_base &, from_table_t, std::string_view table, Iter columns_begin, Iter columns_end); -@@ -156,13 +156,13 @@ public: - /** @deprecated Use factory function @c query() instead. +@@ -161,13 +161,13 @@ public: + /** @deprecated Use factory function @ref query instead. */ template - [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( @@ -48,15 +49,15 @@ index f2dcc31..6a74b55 100644 Columns const &columns); #include "pqxx/internal/ignore-deprecated-pre.hxx" - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( transaction_base &tx, std::string_view table) : stream_from{tx, from_table, table} {} -@@ -170,14 +170,14 @@ public: +@@ -175,14 +175,14 @@ public: - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. template - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( @@ -64,7 +65,7 @@ index f2dcc31..6a74b55 100644 stream_from{tx, from_table, table, columns} {} - /// @deprecated Use factory function @c table() or @c raw_table() instead. + /// @deprecated Use factories @ref table or @ref raw_table instead. template - [[deprecated("Use the from_table_t overload instead.")]] stream_from( + PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( @@ -72,10 +73,10 @@ index f2dcc31..6a74b55 100644 Iter columns_end); diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx -index 3ad0292..4b52e31 100644 +index 2a49d8f..06e602e 100644 --- a/include/pqxx/stream_to.hxx +++ b/include/pqxx/stream_to.hxx -@@ -168,7 +168,7 @@ public: +@@ -169,7 +169,7 @@ public: * your data fields and the table is explicit in your code, and not hidden * in an "implicit contract" between your code and your schema. */ @@ -84,20 +85,20 @@ index 3ad0292..4b52e31 100644 transaction_base &tx, std::string_view table_name) : stream_to{tx, table_name, ""sv} {} -@@ -177,14 +177,14 @@ public: - /** @deprecated Use @c table() or @c raw_table() as a factory. +@@ -178,14 +178,14 @@ public: + /** @deprecated Use @ref table or @ref raw_table as a factory. */ template - [[deprecated("Use table() or raw_table() factory.")]] stream_to( -+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( transaction_base &, std::string_view table_name, Columns const &columns); /// Create a stream, specifying column names as a sequence of strings. - /** @deprecated Use @c table() or @c raw_table() as a factory. + /** @deprecated Use @ref table or @ref raw_table as a factory. */ template - [[deprecated("Use table() or raw_table() factory.")]] stream_to( -+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( transaction_base &, std::string_view table_name, Iter columns_begin, Iter columns_end); diff --git a/external_imported/vcpkg/ports/libpqxx/portfile.cmake b/external_imported/vcpkg/ports/libpqxx/portfile.cmake index 86d1813fd..84df95397 100644 --- a/external_imported/vcpkg/ports/libpqxx/portfile.cmake +++ b/external_imported/vcpkg/ports/libpqxx/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 221ddc8be329bafb376a3d83b9cd257fd52fc7b7 # 7.6.0 - SHA512 32a673bbae2f26fbc41bdcba007d9a5ded29680cb49ba434d1913cd5007bc1c1443bf38c88d9c5a6abe0a3ee519c0f691464c8d2b144cd3f16652447d644e400 + REF 90768b07f7feb55a9bd70cfaacb5543bfd074022 # 7.7.3 + SHA512 cbb21b148135d9426acd8006bfab872997bae65cfaa7af414083a8d219f099edcc83de7bde5e36016c1f8333f1e4d03fc401a4e741dfd0881afda3e1a20009ff HEAD_REF master PATCHES fix_build_with_vs2017.patch - fix_build_with_apple_clang_13.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/libpqxx/vcpkg.json b/external_imported/vcpkg/ports/libpqxx/vcpkg.json index a0fe57f9b..56d171359 100644 --- a/external_imported/vcpkg/ports/libpqxx/vcpkg.json +++ b/external_imported/vcpkg/ports/libpqxx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libpqxx", - "version-semver": "7.6.0", - "port-version": 3, + "version": "7.7.3", "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", + "license": "BSD-3-Clause", "dependencies": [ "libpq", { diff --git a/external_imported/vcpkg/ports/libproxy/portfile.cmake b/external_imported/vcpkg/ports/libproxy/portfile.cmake index 594e4d09f..fa7786915 100644 --- a/external_imported/vcpkg/ports/libproxy/portfile.cmake +++ b/external_imported/vcpkg/ports/libproxy/portfile.cmake @@ -1,7 +1,4 @@ -# Enable static build in UNIX -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -33,17 +30,22 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DWITH_WEBKIT3=OFF + MAYBE_UNUSED_VARIABLES + WITH_DOTNET + WITH_PERL + WITH_PYTHON2 + WITH_PYTHON3 + WITH_VALA ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/libproxy/vcpkg.json b/external_imported/vcpkg/ports/libproxy/vcpkg.json index f993e04dc..c00654e0c 100644 --- a/external_imported/vcpkg/ports/libproxy/vcpkg.json +++ b/external_imported/vcpkg/ports/libproxy/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 2, + "port-version": 5, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", - "supports": "!uwp", + "license": "LGPL-2.1-only", + "supports": "!uwp & !staticcrt", "dependencies": [ "libmodman", { diff --git a/external_imported/vcpkg/ports/librabbitmq/fix-link-header-files.patch b/external_imported/vcpkg/ports/librabbitmq/fix-link-header-files.patch new file mode 100644 index 000000000..3590736cb --- /dev/null +++ b/external_imported/vcpkg/ports/librabbitmq/fix-link-header-files.patch @@ -0,0 +1,41 @@ +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt +index 671840b..b46614c 100644 +--- a/librabbitmq/CMakeLists.txt ++++ b/librabbitmq/CMakeLists.txt +@@ -112,11 +112,25 @@ add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS) + + set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT}) + ++set(PUBLIC_INCLUDE_DIRS ++ $ ++ $ ++ $ ++) ++ ++set(PRIVATE_INCLUDE_DIRS ++ ${CMAKE_CURRENT_BINARY_DIR} ++) ++ + if (BUILD_SHARED_LIBS) + add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) + + target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) + ++ target_include_directories(rabbitmq ++ PUBLIC ${PUBLIC_INCLUDE_DIRS} ++ PRIVATE ${PRIVATE_INCLUDE_DIRS} ++ ) + if (WIN32) + set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) + else (WIN32) +@@ -137,6 +151,10 @@ if (BUILD_STATIC_LIBS) + + target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES}) + ++ target_include_directories(rabbitmq-static ++ PUBLIC ${PUBLIC_INCLUDE_DIRS} ++ PRIVATE ${PRIVATE_INCLUDE_DIRS} ++ ) + set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC) + if (WIN32) + set_target_properties(rabbitmq-static PROPERTIES diff --git a/external_imported/vcpkg/ports/librabbitmq/portfile.cmake b/external_imported/vcpkg/ports/librabbitmq/portfile.cmake index ac8e6f5cb..8ed28079f 100644 --- a/external_imported/vcpkg/ports/librabbitmq/portfile.cmake +++ b/external_imported/vcpkg/ports/librabbitmq/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-uwpwarning.patch + fix-link-header-files.patch #Remove this patch in the next version ) 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}" @@ -17,6 +17,7 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DBUILD_STATIC_LIBS=${BUILD_STATIC} ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/librabbitmq/vcpkg.json b/external_imported/vcpkg/ports/librabbitmq/vcpkg.json index 9e8a33321..9824f012c 100644 --- a/external_imported/vcpkg/ports/librabbitmq/vcpkg.json +++ b/external_imported/vcpkg/ports/librabbitmq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "librabbitmq", "version": "0.11.0", - "port-version": 1, + "port-version": 2, "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", + "license": "MIT", "dependencies": [ "openssl", { diff --git a/external_imported/vcpkg/ports/libraw/portfile.cmake b/external_imported/vcpkg/ports/libraw/portfile.cmake index ecdcf1da0..ef47b4ec5 100644 --- a/external_imported/vcpkg/ports/libraw/portfile.cmake +++ b/external_imported/vcpkg/ports/libraw/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9 HEAD_REF master + PATCHES + remove_register_cpp.patch ) vcpkg_from_github( diff --git a/external_imported/vcpkg/ports/libraw/remove_register_cpp.patch b/external_imported/vcpkg/ports/libraw/remove_register_cpp.patch new file mode 100644 index 000000000..69eb8f346 --- /dev/null +++ b/external_imported/vcpkg/ports/libraw/remove_register_cpp.patch @@ -0,0 +1,31 @@ +diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp +index 0abd5329a..5eea00ea9 100644 +--- a/src/libraw_cxx.cpp ++++ b/src/libraw_cxx.cpp +@@ -3500,7 +3500,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest) + { + if (!imgdata.rawdata.ph1_cblack || !imgdata.rawdata.ph1_rblack) + { +- register int bl = imgdata.color.phase_one_data.t_black; ++ int bl = imgdata.color.phase_one_data.t_black; + for (int row = 0; row < S.raw_height; row++) + { + checkCancel(); +@@ -3514,7 +3514,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest) + } + else + { +- register int bl = imgdata.color.phase_one_data.t_black; ++ int bl = imgdata.color.phase_one_data.t_black; + for (int row = 0; row < S.raw_height; row++) + { + checkCancel(); +@@ -6467,7 +6467,7 @@ static void utf2char(utf16_t *str, char *buffer, unsigned bufsz) + + static void *lr_memmem(const void *l, size_t l_len, const void *s, size_t s_len) + { +- register char *cur, *last; ++ char *cur, *last; + const char *cl = (const char *)l; + const char *cs = (const char *)s; + diff --git a/external_imported/vcpkg/ports/libraw/vcpkg.json b/external_imported/vcpkg/ports/libraw/vcpkg.json index af3d6c63c..a4f6b1df1 100644 --- a/external_imported/vcpkg/ports/libraw/vcpkg.json +++ b/external_imported/vcpkg/ports/libraw/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libraw", "version-string": "201903", - "port-version": 7, + "port-version": 10, "description": "raw image decoder library", "homepage": "https://www.libraw.org", + "supports": "!uwp", "dependencies": [ "jasper", "lcms", diff --git a/external_imported/vcpkg/ports/librdkafka/fix_curl.patch b/external_imported/vcpkg/ports/librdkafka/fix_curl.patch new file mode 100644 index 000000000..b390896a0 --- /dev/null +++ b/external_imported/vcpkg/ports/librdkafka/fix_curl.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e911c28..bbeb99b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -206,6 +206,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}) diff --git a/external_imported/vcpkg/ports/librdkafka/portfile.cmake b/external_imported/vcpkg/ports/librdkafka/portfile.cmake index 27dee9a27..88229f55d 100644 --- a/external_imported/vcpkg/ports/librdkafka/portfile.cmake +++ b/external_imported/vcpkg/ports/librdkafka/portfile.cmake @@ -1,10 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF v1.8.2 - SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 + REF v1.9.2 + SHA512 f067b227bc784e1dee61261d540632e54a4e5849934d1f55571979fea6b3c6858c27bcd397cf33fbee2409df12b149bb78f201f33646d14b5288a33147a9c9dc HEAD_REF master - PATCHES lz4.patch + PATCHES + lz4.patch + fix_curl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) @@ -15,10 +17,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zlib WITH_ZLIB zstd WITH_ZSTD snappy WITH_SNAPPY + curl WITH_CURL ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRDKAFKA_BUILD_STATIC=${RDKAFKA_BUILD_STATIC} -DRDKAFKA_BUILD_EXAMPLES=OFF diff --git a/external_imported/vcpkg/ports/librdkafka/vcpkg.json b/external_imported/vcpkg/ports/librdkafka/vcpkg.json index 8ab425445..80f2b4705 100644 --- a/external_imported/vcpkg/ports/librdkafka/vcpkg.json +++ b/external_imported/vcpkg/ports/librdkafka/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librdkafka", - "version": "1.8.2", - "port-version": 2, + "version": "1.9.2", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, @@ -18,6 +17,12 @@ } ], "features": { + "curl": { + "description": "Build with curl", + "dependencies": [ + "curl" + ] + }, "snappy": { "description": "Build with snappy" }, diff --git a/external_imported/vcpkg/ports/librttopo/vcpkg.json b/external_imported/vcpkg/ports/librttopo/vcpkg.json index 73e72959b..674c2e9f5 100644 --- a/external_imported/vcpkg/ports/librttopo/vcpkg.json +++ b/external_imported/vcpkg/ports/librttopo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "librttopo", "version": "1.1.0", - "port-version": 5, + "port-version": 6, "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", + "supports": "!uwp", "dependencies": [ "geos" ] diff --git a/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch b/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch index 2c4909df3..017a0ac1b 100644 --- a/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch +++ b/external_imported/vcpkg/ports/libsigcpp/disable_tests_enable_static_build.patch @@ -1,18 +1,14 @@ -From 219b3f5a681731bcaeee9fee0f136e6eb6143d33 Mon Sep 17 00:00:00 2001 -From: Bruk Tedla -Date: Thu, 17 Sep 2020 19:45:27 +0300 -Subject: [PATCH] disable_tests_enable_static_build - ---- - CMakeLists.txt | 4 ++-- - sigc++/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e7f383..b2b8395 100644 +index e1b28fe..b9a9d40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -89,8 +89,8 @@ enable_testing() +@@ -84,13 +84,13 @@ install (FILES + DESTINATION + "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + +-enable_testing() ++#enable_testing() + add_subdirectory (sigc++) @@ -36,6 +32,3 @@ index fa5a91a..86f1be7 100644 set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION}) --- -2.27.0.windows.1 - diff --git a/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch b/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch index f62e1eb14..83cd2b9dc 100644 --- a/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch +++ b/external_imported/vcpkg/ports/libsigcpp/fix-shared-windows-build.patch @@ -1,17 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index e1b28fe..73990c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,8 +53,11 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") +@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") include_directories (${sigc++_SOURCE_DIR}) include_directories (${sigc++_BINARY_DIR}) --if(BUILD_SHARED_LIBS) -- add_compile_options(-DBUILD_SHARED) +if (BUILD_SHARED_LIBS) -+ add_compile_options (-DBUILD_SHARED) -+ if (MSVC) -+ add_compile_options (-D_WINDLL) -+ endif() - endif() - ++ add_compile_options (-DBUILD_SHARED) ++ if (MSVC) ++ add_compile_options (-D_WINDLL) ++ endif() ++endif() ++ configure_file (sigc++config.h.cmake sigc++config.h) + + set (prefix ${CMAKE_INSTALL_PREFIX}) +diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake +index 74d348a..43a99c5 100644 +--- a/sigc++config.h.cmake ++++ b/sigc++config.h.cmake +@@ -16,7 +16,9 @@ + # if defined(_MSC_VER) + # define SIGC_MSC 1 + # define SIGC_WIN32 1 ++# ifdef BUILD_SHARED + # define SIGC_DLL 1 ++# endif + # elif defined(__CYGWIN__) + # define SIGC_CONFIGURE 1 + # elif defined(__MINGW32__) diff --git a/external_imported/vcpkg/ports/libsigcpp/fix-usage-in-static-build.patch b/external_imported/vcpkg/ports/libsigcpp/fix-usage-in-static-build.patch deleted file mode 100644 index 378f1f96a..000000000 --- a/external_imported/vcpkg/ports/libsigcpp/fix-usage-in-static-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f54e830..972d0dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,10 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") - include_directories (${sigc++_SOURCE_DIR}) - include_directories (${sigc++_BINARY_DIR}) - -+if(BUILD_SHARED_LIBS) -+ add_compile_options(-DBUILD_SHARED) -+endif() -+ - configure_file (sigc++config.h.cmake sigc++config.h) - - set (prefix ${CMAKE_INSTALL_PREFIX}) -diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake -index 74d348a..43a99c5 100644 ---- a/sigc++config.h.cmake -+++ b/sigc++config.h.cmake -@@ -16,7 +16,9 @@ - # if defined(_MSC_VER) - # define SIGC_MSC 1 - # define SIGC_WIN32 1 -+# ifdef BUILD_SHARED - # define SIGC_DLL 1 -+# endif - # elif defined(__CYGWIN__) - # define SIGC_CONFIGURE 1 - # elif defined(__MINGW32__) diff --git a/external_imported/vcpkg/ports/libsigcpp/portfile.cmake b/external_imported/vcpkg/ports/libsigcpp/portfile.cmake index 278dc310a..b060ebe20 100644 --- a/external_imported/vcpkg/ports/libsigcpp/portfile.cmake +++ b/external_imported/vcpkg/ports/libsigcpp/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus - REF 3.0.7 - SHA512 4c9251613c30cc5d455dc30a039a12b73d6369ac03583dab382307b894f93d4733cebea0a6eef82e8d80b1354c812b4ff6bfc68913f0df5a61146d56a6afde13 + REF 3.2.0 + SHA512 95ab0acfc2c5a151335e73bdc9b0e058af67d9706d0697bfd938e38c51e853fdb29d7a26484f192abe150640c60d5e30075a23deaa043a8deed70616bc9f508a HEAD_REF master PATCHES disable_tests_enable_static_build.patch - version.patch - fix-usage-in-static-build.patch fix-shared-windows-build.patch ) diff --git a/external_imported/vcpkg/ports/libsigcpp/vcpkg.json b/external_imported/vcpkg/ports/libsigcpp/vcpkg.json index 51286da78..31ec34fbe 100644 --- a/external_imported/vcpkg/ports/libsigcpp/vcpkg.json +++ b/external_imported/vcpkg/ports/libsigcpp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsigcpp", - "version": "3.0.7", + "version": "3.2.0", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", + "license": "LGPL-3.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libsigcpp/version.patch b/external_imported/vcpkg/ports/libsigcpp/version.patch deleted file mode 100644 index 1492bed70..000000000 --- a/external_imported/vcpkg/ports/libsigcpp/version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b06ef121c..9b9520342 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,9 +16,9 @@ - - cmake_minimum_required (VERSION 3.2) - --set (SIGCXX_MAJOR_VERSION 2) --set (SIGCXX_MINOR_VERSION 99) --set (SIGCXX_MICRO_VERSION 1) -+set (SIGCXX_MAJOR_VERSION 3) -+set (SIGCXX_MINOR_VERSION 0) -+set (SIGCXX_MICRO_VERSION 7) - - set (SIGCXX_API_VERSION 3.0) - set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) diff --git a/external_imported/vcpkg/ports/libslirp/portfile.cmake b/external_imported/vcpkg/ports/libslirp/portfile.cmake index 8862f1b30..0bd6e252c 100644 --- a/external_imported/vcpkg/ports/libslirp/portfile.cmake +++ b/external_imported/vcpkg/ports/libslirp/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO slirp/libslirp - REF v4.6.1 - SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae + REF v4.7.0 + SHA512 387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/libslirp/vcpkg.json b/external_imported/vcpkg/ports/libslirp/vcpkg.json index 470194d07..032e5cc5d 100644 --- a/external_imported/vcpkg/ports/libslirp/vcpkg.json +++ b/external_imported/vcpkg/ports/libslirp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libslirp", - "version-semver": "4.6.1", - "port-version": 1, + "version-semver": "4.7.0", "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/libsm/portfile.cmake b/external_imported/vcpkg/ports/libsm/portfile.cmake new file mode 100644 index 000000000..f244fb35b --- /dev/null +++ b/external_imported/vcpkg/ports/libsm/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libsm + REF a52c79544fcd6b5e2242b9122dfaa34be07aebb2 # 1.2.3 + SHA512 379e450d90e61d80d4fea8449a582b3eee3968bef137022053cb3bd51fa2815d8fccc43ff11e3b593c4a67ad64e93209c25111a20ac88e38c1f663cd274f5d56 + HEAD_REF master + PATCHES windows.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libsm/vcpkg.json b/external_imported/vcpkg/ports/libsm/vcpkg.json new file mode 100644 index 000000000..035689067 --- /dev/null +++ b/external_imported/vcpkg/ports/libsm/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libsm", + "version": "1.2.3", + "description": "X Session Management Library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libsm", + "license": null, + "dependencies": [ + "bzip2", + "libice", + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/libsm/windows.patch b/external_imported/vcpkg/ports/libsm/windows.patch new file mode 100644 index 000000000..abf52cb63 --- /dev/null +++ b/external_imported/vcpkg/ports/libsm/windows.patch @@ -0,0 +1,22 @@ +diff --git a/src/sm_genid.c b/src/sm_genid.c +index 1a8b9a0ed..3726eb1d2 100644 +--- a/src/sm_genid.c ++++ b/src/sm_genid.c +@@ -64,7 +64,9 @@ in this Software without prior written authorization from The Open Group. + # include + #endif + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + #include + #define Time_t time_t +@@ -84,6 +86,7 @@ in this Software without prior written authorization from The Open Group. + + # include + # include ++# include + # define X_INCLUDE_NETDB_H + # define XOS_USE_MTSAFE_NETDBAPI + # include diff --git a/external_imported/vcpkg/ports/libsndfile/portfile.cmake b/external_imported/vcpkg/ports/libsndfile/portfile.cmake index 7c31e3468..e6ad23df3 100644 --- a/external_imported/vcpkg/ports/libsndfile/portfile.cmake +++ b/external_imported/vcpkg/ports/libsndfile/portfile.cmake @@ -26,7 +26,7 @@ if(VCPKG_TARGET_IS_UWP) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -36,6 +36,8 @@ vcpkg_cmake_configure( -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DPYTHON_EXECUTABLE=${PYTHON3} ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + PYTHON_EXECUTABLE ) vcpkg_cmake_install() @@ -46,13 +48,13 @@ else() set(CONFIG_PATH lib/cmake/SndFile) endif() -vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH ${CONFIG_PATH}) +vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH "${CONFIG_PATH}") vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libsndfile/vcpkg.json b/external_imported/vcpkg/ports/libsndfile/vcpkg.json index 20c29ae2a..ad775ca21 100644 --- a/external_imported/vcpkg/ports/libsndfile/vcpkg.json +++ b/external_imported/vcpkg/ports/libsndfile/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsndfile", "version-semver": "1.1.0", + "port-version": 1, "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libsodium/portfile.cmake b/external_imported/vcpkg/ports/libsodium/portfile.cmake index f4afdc197..934cf8cf7 100644 --- a/external_imported/vcpkg/ports/libsodium/portfile.cmake +++ b/external_imported/vcpkg/ports/libsodium/portfile.cmake @@ -6,13 +6,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}") + +if(VCPKG_TARGET_IS_EMSCRIPTEN) + set(ADDITIONAL_OPTIONS "-DENABLE_SSP=OFF") +endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${ADDITIONAL_OPTIONS} ) vcpkg_cmake_install() @@ -24,20 +28,16 @@ vcpkg_cmake_config_fixup( ) 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}/include/Makefile.am) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am") configure_file( - ${SOURCE_PATH}/LICENSE - ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright - COPYONLY -) - -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in - ${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake + "${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake" @ONLY ) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libsodium/vcpkg.json b/external_imported/vcpkg/ports/libsodium/vcpkg.json index 24a31c5be..b4f0e9dea 100644 --- a/external_imported/vcpkg/ports/libsodium/vcpkg.json +++ b/external_imported/vcpkg/ports/libsodium/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsodium", "version": "1.0.18", - "port-version": 6, + "port-version": 8, "description": "A modern and easy-to-use crypto library", "homepage": "https://github.com/jedisct1/libsodium", + "license": "ISC", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libspatialindex/mingw.patch b/external_imported/vcpkg/ports/libspatialindex/mingw.patch new file mode 100644 index 000000000..28c1c2904 --- /dev/null +++ b/external_imported/vcpkg/ports/libspatialindex/mingw.patch @@ -0,0 +1,12 @@ +diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2022-07-19 15:21:35.950966519 +0200 ++++ b/src/CMakeLists.txt 2022-07-19 15:21:50.251002371 +0200 +@@ -208,7 +208,7 @@ + PROPERTIES VERSION "${SIDX_LIB_VERSION}" + SOVERSION "${SIDX_LIB_SOVERSION}" ) + +-if(WIN32) ++if(MSVC) + target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068") + target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068") + diff --git a/external_imported/vcpkg/ports/libspatialindex/portfile.cmake b/external_imported/vcpkg/ports/libspatialindex/portfile.cmake index 17d89d36c..8c9748943 100644 --- a/external_imported/vcpkg/ports/libspatialindex/portfile.cmake +++ b/external_imported/vcpkg/ports/libspatialindex/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES static.patch + mingw.patch ) vcpkg_configure_cmake( diff --git a/external_imported/vcpkg/ports/libspatialindex/vcpkg.json b/external_imported/vcpkg/ports/libspatialindex/vcpkg.json index 9caadda04..8b968ca9a 100644 --- a/external_imported/vcpkg/ports/libspatialindex/vcpkg.json +++ b/external_imported/vcpkg/ports/libspatialindex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libspatialindex", "version": "1.9.3", + "port-version": 1, "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.", "homepage": "http://libspatialindex.github.com", "dependencies": [ diff --git a/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch b/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch new file mode 100644 index 000000000..c29b03449 --- /dev/null +++ b/external_imported/vcpkg/ports/libspatialite/fix-mingw.patch @@ -0,0 +1,24 @@ +diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c +index ee2f1cf..01f2571 100644 +--- a/src/gaiageo/gg_shape.c ++++ b/src/gaiageo/gg_shape.c +@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL or the LGPL. + #endif + + #ifdef _WIN32 +-#include ++#include + #endif + + #if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */ +diff --color -ur a/configure.ac b/configure.ac +--- a/configure.ac 2022-07-21 17:23:50.490298108 +0200 ++++ b/configure.ac 2022-07-21 17:25:45.671489524 +0200 +@@ -116,7 +116,6 @@ + + # Checks for installed libraries + AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm) +-AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't seem to be installed on this system.]),-lm) + + AC_CONFIG_FILES([Makefile \ + src/Makefile \ diff --git a/external_imported/vcpkg/ports/libspatialite/portfile.cmake b/external_imported/vcpkg/ports/libspatialite/portfile.cmake index db8d8bcda..e4ff7e9e0 100644 --- a/external_imported/vcpkg/ports/libspatialite/portfile.cmake +++ b/external_imported/vcpkg/ports/libspatialite/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( fix-makefiles.patch fix-linux-configure.patch gaiaconfig-msvc.patch + fix-mingw.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS unused @@ -98,14 +99,18 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + endif() else() file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + endif() endif() set(infile "${SOURCE_PATH}/spatialite.pc.in") @@ -173,6 +178,7 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + DETERMINE_BUILD_TRIPLET OPTIONS ${TARGET_ALIAS} ${FREEXL_OPTION} diff --git a/external_imported/vcpkg/ports/libspatialite/vcpkg.json b/external_imported/vcpkg/ports/libspatialite/vcpkg.json index 521ba1523..94a609778 100644 --- a/external_imported/vcpkg/ports/libspatialite/vcpkg.json +++ b/external_imported/vcpkg/ports/libspatialite/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 4, + "port-version": 8, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", - "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", + "license": null, "dependencies": [ "geos", "libiconv", @@ -17,7 +17,10 @@ "rtree" ] }, - "vcpkg-pkgconfig-get-modules", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, "zlib" ], "default-features": [ diff --git a/external_imported/vcpkg/ports/libsquish/export-target.patch b/external_imported/vcpkg/ports/libsquish/export-target.patch index 78f5f30f5..92df9e6ad 100644 --- a/external_imported/vcpkg/ports/libsquish/export-target.patch +++ b/external_imported/vcpkg/ports/libsquish/export-target.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3ecdde..94c7b3d 100644 +index a3ecdde..6aa9e64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -120,8 +120,14 @@ INCLUDE(GNUInstallDirs) +@@ -75,6 +75,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + + ADD_LIBRARY(squish ${SQUISH_SRCS} ${SQUISH_HDRS}) + ++TARGET_INCLUDE_DIRECTORIES(squish PUBLIC $) ++ + INCLUDE(GenerateExportHeader) + GENERATE_EXPORT_HEADER(squish + EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/squish_export.h +@@ -120,8 +122,14 @@ INCLUDE(GNUInstallDirs) INSTALL( TARGETS squish diff --git a/external_imported/vcpkg/ports/libsquish/portfile.cmake b/external_imported/vcpkg/ports/libsquish/portfile.cmake index e9cb26e3f..4b482e492 100644 --- a/external_imported/vcpkg/ports/libsquish/portfile.cmake +++ b/external_imported/vcpkg/ports/libsquish/portfile.cmake @@ -17,7 +17,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_SQUISH_WITH_OPENMP=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/libsquish/vcpkg.json b/external_imported/vcpkg/ports/libsquish/vcpkg.json index 3af7e3b13..14752f0d7 100644 --- a/external_imported/vcpkg/ports/libsquish/vcpkg.json +++ b/external_imported/vcpkg/ports/libsquish/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsquish", "version": "1.15", - "port-version": 10, + "port-version": 12, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", "license": "MIT", diff --git a/external_imported/vcpkg/ports/libsrt/portfile.cmake b/external_imported/vcpkg/ports/libsrt/portfile.cmake index 35ebd0654..d06f669d2 100644 --- a/external_imported/vcpkg/ports/libsrt/portfile.cmake +++ b/external_imported/vcpkg/ports/libsrt/portfile.cmake @@ -1,31 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt - REF v1.4.4 - SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA + REF v1.5.0 + SHA512 68ab5fe316cfbbbba31b5b2354f657e23c90e14674f8dac01df2bf98c4776a7fafcd690a4dfad3a340e6be577a22360ca04ef2397c8a0dd507adebdd54dc22fb HEAD_REF master PATCHES fix-dependency-install.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_DYNAMIC ON) - set(BUILD_STATIC OFF) -else() - set(BUILD_DYNAMIC OFF) - set(BUILD_STATIC ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tool ENABLE_APPS + bonding ENABLE_BONDING ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DENABLE_SHARED=${BUILD_DYNAMIC} - -DENABLE_STATIC=${BUILD_STATIC} + -DENABLE_CXX11=ON + -DENABLE_STATIC=${KEYSTONE_BUILD_STATIC} + -DENABLE_SHARED=${KEYSTONE_BUILD_SHARED} -DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF ) @@ -34,6 +31,10 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libsrt/vcpkg.json b/external_imported/vcpkg/ports/libsrt/vcpkg.json index 02de23beb..d96d44844 100644 --- a/external_imported/vcpkg/ports/libsrt/vcpkg.json +++ b/external_imported/vcpkg/ports/libsrt/vcpkg.json @@ -1,18 +1,26 @@ { "name": "libsrt", - "version": "1.4.4", + "version": "1.5.0", "port-version": 2, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", + "license": "MPL-2.0", "supports": "!uwp", "dependencies": [ "openssl", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { + "bonding": { + "description": "Enables the Connection Bonding feature" + }, "tool": { "description": "Builds libsrt executable" } diff --git a/external_imported/vcpkg/ports/libsrtp/portfile.cmake b/external_imported/vcpkg/ports/libsrtp/portfile.cmake index d4074da0e..4651baecc 100644 --- a/external_imported/vcpkg/ports/libsrtp/portfile.cmake +++ b/external_imported/vcpkg/ports/libsrtp/portfile.cmake @@ -19,7 +19,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/libsrtp/vcpkg.json b/external_imported/vcpkg/ports/libsrtp/vcpkg.json index 5ca1f1352..9131a77f8 100644 --- a/external_imported/vcpkg/ports/libsrtp/vcpkg.json +++ b/external_imported/vcpkg/ports/libsrtp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libsrtp", "version": "2.4.2", - "port-version": 1, + "port-version": 2, "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel.", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libtcod/portfile.cmake b/external_imported/vcpkg/ports/libtcod/portfile.cmake index 155042f52..bc5f09c71 100644 --- a/external_imported/vcpkg/ports/libtcod/portfile.cmake +++ b/external_imported/vcpkg/ports/libtcod/portfile.cmake @@ -1,9 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.20.1 - SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 - HEAD_REF develop + REF 1.22.3 + SHA512 350b741f8738f5ba3c6f282e76c1124326144111eb2444b17b1126e8ddead52cff1dba1d0ed80e6fefbb0db8f032b95d08292d73746eec149e191a8fa78651d7 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "png" CMAKE_DISABLE_FIND_PACKAGE_lodepng-c + "sdl" CMAKE_DISABLE_FIND_PACKAGE_SDL2 + "sdl" CMAKE_DISABLE_FIND_PACKAGE_GLAD + "threads" CMAKE_DISABLE_FIND_PACKAGE_Threads + "unicode" CMAKE_DISABLE_FIND_PACKAGE_utf8proc + "unicode" CMAKE_DISABLE_FIND_PACKAGE_unofficial-utf8proc + "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) vcpkg_cmake_configure( @@ -16,7 +27,7 @@ vcpkg_cmake_configure( -DLIBTCOD_GLAD=find_package -DLIBTCOD_LODEPNG=find_package -DLIBTCOD_UTF8PROC=vcpkg - -DLIBTCOD_STB=vcpkg + -DLIBTCOD_STB=find_package ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/libtcod/vcpkg.json b/external_imported/vcpkg/ports/libtcod/vcpkg.json index 8af4572e9..841959eb2 100644 --- a/external_imported/vcpkg/ports/libtcod/vcpkg.json +++ b/external_imported/vcpkg/ports/libtcod/vcpkg.json @@ -1,16 +1,13 @@ { "name": "libtcod", - "version": "1.20.1", + "version": "1.22.3", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", "documentation": "https://libtcod.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", "dependencies": [ - "glad", - "lodepng-c", - "sdl2", "stb", - "utf8proc", { "name": "vcpkg-cmake", "host": true @@ -18,7 +15,42 @@ { "name": "vcpkg-cmake-config", "host": true - }, + } + ], + "default-features": [ + "png", + "sdl", + "unicode", "zlib" - ] + ], + "features": { + "png": { + "description": "Support for reading and writing PNG files. Required to save screenshots and to load tilesets from files.", + "dependencies": [ + "lodepng" + ] + }, + "sdl": { + "description": "Support for SDL2 windows and events including OpenGL support and the libtcod context.", + "dependencies": [ + "glad", + "sdl2" + ] + }, + "threads": { + "description": "Support for deprecated threading functions. If in doubt then leave this disabled." + }, + "unicode": { + "description": "Support for non-ASCII characters. Required for text printing functions", + "dependencies": [ + "utf8proc" + ] + }, + "zlib": { + "description": "Support for REXPaint files and TCODZip archives.", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/external_imported/vcpkg/ports/libtheora/CMakeLists.txt b/external_imported/vcpkg/ports/libtheora/CMakeLists.txt index 0d4aed76e..c11adc21c 100644 --- a/external_imported/vcpkg/ports/libtheora/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libtheora/CMakeLists.txt @@ -103,9 +103,9 @@ install( install(TARGETS theora theoraenc theoradec EXPORT unofficial-theora-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION bin - ARCHIVE DESTINATION lib + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) install(EXPORT unofficial-theora-targets diff --git a/external_imported/vcpkg/ports/libtheora/portfile.cmake b/external_imported/vcpkg/ports/libtheora/portfile.cmake index 8c88e261b..5b84a7d72 100644 --- a/external_imported/vcpkg/ports/libtheora/portfile.cmake +++ b/external_imported/vcpkg/ports/libtheora/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_from_github( 0001-fix-uwp.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libtheora.def DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-config.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libtheora.def" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-config.cmake.in" DESTINATION "${SOURCE_PATH}") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(THEORA_X86_OPT ON) @@ -18,18 +18,17 @@ else() set(THEORA_X86_OPT OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_X86=${THEORA_X86_OPT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/unofficial-theora") + vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/unofficial-theora TARGET_PATH share/unofficial-theora) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtheora) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtheora/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtheora/copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") diff --git a/external_imported/vcpkg/ports/libtheora/vcpkg.json b/external_imported/vcpkg/ports/libtheora/vcpkg.json index 58167e7d1..17f4ccdf9 100644 --- a/external_imported/vcpkg/ports/libtheora/vcpkg.json +++ b/external_imported/vcpkg/ports/libtheora/vcpkg.json @@ -1,10 +1,19 @@ { "name": "libtheora", "version-string": "1.2.0alpha1-20170719", - "port-version": 3, + "port-version": 4, "description": "Theora is a free and open video compression format from the Xiph.org Foundation.", "homepage": "https://github.com/xiph/theora", + "license": null, "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/libtorrent/portfile.cmake b/external_imported/vcpkg/ports/libtorrent/portfile.cmake index d80fa99f7..816a30b7e 100644 --- a/external_imported/vcpkg/ports/libtorrent/portfile.cmake +++ b/external_imported/vcpkg/ports/libtorrent/portfile.cmake @@ -30,16 +30,16 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF 44e285c30f06772e48f515580f961998e1037b7e # v2.0.5 - SHA512 c7ce747930ab8c1852d0efdc6268d9faa39643abd6b6560b4b5e0b06a12ab207ec61ac301a0bcc7622521a8ae490cc02cbe0b6e43208bc216c08bf472b40cb85 + REF 722d78250a30c89c92970a78be970269a395be36 # v2.0.7 + SHA512 69c7e6c02db6ff6b10d94b52470eda38839b4121960f7d19c3829eb453a84a62f017e1607bbb8dd63528c1461686fa6f30af605a046faae2c9c916aa688b555f HEAD_REF RC_2_0 ) vcpkg_from_github( OUT_SOURCE_PATH TRYSIGNAL_SOURCE_PATH REPO arvidn/try_signal - REF 334fd139e2bb387017b42d36753a03935e3bca75 - SHA512 a25d439b2d979e975f9dd125a34072f70bfc7a08fab950e3829130742c05c584ae88d9f58fc0f1b4fa0b51df2c0e32c5b24c5828d53b121b4bc183a4c68d6a5a + REF 751a7e5a5be14892bcfdff1e63c653bcbf71cf39 + SHA512 4ccea4f67a79acf49a9943d8aec3999475357d7ad3cfc7b37f0e1c4527f8f4536993c6f6241bb3eb166a1dc939133a4f3b35197f9e47fb2ac9c713b64f8cb96d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/libtorrent/vcpkg.json b/external_imported/vcpkg/ports/libtorrent/vcpkg.json index 4b9eac634..9ea765211 100644 --- a/external_imported/vcpkg/ports/libtorrent/vcpkg.json +++ b/external_imported/vcpkg/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.5", + "version": "2.0.7", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/external_imported/vcpkg/ports/libunibreak/CMakeLists.txt b/external_imported/vcpkg/ports/libunibreak/CMakeLists.txt index 7bbff8f3a..f1924c278 100644 --- a/external_imported/vcpkg/ports/libunibreak/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libunibreak/CMakeLists.txt @@ -3,22 +3,24 @@ cmake_minimum_required(VERSION 3.8.0) project(libunibreak) set(libunibreak_srcs + src/linebreak.c src/linebreakdata.c src/linebreakdef.c - src/linebreak.c src/wordbreak.c + src/wordbreakdata.c src/graphemebreak.c + src/graphemebreakdata.c + src/emojidef.c src/unibreakbase.c src/unibreakdef.c ) - include_directories(src) -add_library(libunibreak ${libunibreak_srcs}) +add_library(unibreak ${libunibreak_srcs}) install( - TARGETS libunibreak + TARGETS unibreak RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -27,12 +29,16 @@ install( if(NOT DISABLE_INSTALL_HEADERS) install( FILES + src/emojidef.h + src/graphemebreak.h + src/graphemebreakdef.h src/linebreak.h src/linebreakdef.h - src/wordbreak.h - src/wordbreakdef.h + src/test_skips.h src/unibreakbase.h src/unibreakdef.h + src/wordbreak.h + src/wordbreakdef.h DESTINATION include ) endif() diff --git a/external_imported/vcpkg/ports/libunibreak/libunibreak-config.cmake.in b/external_imported/vcpkg/ports/libunibreak/libunibreak-config.cmake.in new file mode 100644 index 000000000..0a4746360 --- /dev/null +++ b/external_imported/vcpkg/ports/libunibreak/libunibreak-config.cmake.in @@ -0,0 +1,32 @@ +# For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) + +if(TARGET libunibreak) + return() +endif() + +# Compute the installation prefix relative to this file. +get_filename_component(_INSTALL_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +get_filename_component(_INSTALL_DIR "${_INSTALL_DIR}" PATH) +if(_INSTALL_DIR STREQUAL "/") + set(_INSTALL_DIR "") +endif() + +add_library(unibreak INTERFACE IMPORTED GLOBAL) +add_library(libunibreak::libunibreak ALIAS unibreak) + +find_library(LIBUNIBREAK_LIBRARY_DEBUG NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) +if(LIBUNIBREAK_LIBRARY_DEBUG) + target_link_libraries(unibreak INTERFACE $<$:${LIBUNIBREAK_LIBRARY_DEBUG}>) +endif() + +find_library(LIBUNIBREAK_LIBRARY_RELEASE NAMES unibreak PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) +target_link_libraries(unibreak INTERFACE $<$>:${LIBUNIBREAK_LIBRARY_RELEASE}>) + +set(LIBUNIBREAK_LIBRARY libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_LIBRARIES libunibreak::libunibreak PARENT_SCOPE) +set(LIBUNIBREAK_INCLUDE_DIR "${_INSTALL_DIR}/include" PARENT_SCOPE) + +target_include_directories(unibreak INTERFACE ${_INSTALL_DIR}/include) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libunibreak/portfile.cmake b/external_imported/vcpkg/ports/libunibreak/portfile.cmake index 883a58c55..c73851614 100644 --- a/external_imported/vcpkg/ports/libunibreak/portfile.cmake +++ b/external_imported/vcpkg/ports/libunibreak/portfile.cmake @@ -3,19 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak - REF 8df6ef4ebe5dbd2a49539d05366337ab7fb57ae3 # libunibreak_4_3 - SHA512 791e342dcc0e79e15f578ec93239d53a656f9e1804f9ec8b970cfac2b6c4f3456855513c36f18f8e72a91dac64060abc336e4716d584dbec86e1fb0c91eded69 + REF libunibreak_5_0 # libunibreak_5_0 + SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484 HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/libunibreak-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/libunibreak-config.cmake" @ONLY) file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libunibreak RENAME copyright) diff --git a/external_imported/vcpkg/ports/libunibreak/vcpkg.json b/external_imported/vcpkg/ports/libunibreak/vcpkg.json index c1d89b1a2..3c4a6f438 100644 --- a/external_imported/vcpkg/ports/libunibreak/vcpkg.json +++ b/external_imported/vcpkg/ports/libunibreak/vcpkg.json @@ -1,7 +1,14 @@ { "name": "libunibreak", - "version-string": "4.3", + "version": "5.0", "port-version": 1, "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", - "homepage": "https://github.com/adah1972/libunibreak" + "homepage": "https://github.com/adah1972/libunibreak", + "license": "zlib-acknowledgement", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/libunistring/fix-for-automake-1.16.4.patch b/external_imported/vcpkg/ports/libunistring/fix-for-automake-1.16.4.patch deleted file mode 100644 index 2e9a2ebda..000000000 --- a/external_imported/vcpkg/ports/libunistring/fix-for-automake-1.16.4.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/m4/init-package-version.m4 -+++ b/m4/init-package-version.m4 -@@ -82,9 +82,9 @@ - [AC_SUBST([PACKAGE], [$1]) - AC_SUBST([VERSION], [$2]) - ]) - m4_define([AM_INIT_AUTOMAKE], - m4_defn([gl_RPL_INIT_AUTOMAKE])) - ]) --m4_define([gl_INIT_DUMMY], []) -+m4_define([gl_INIT_DUMMY], [dummy]) - AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ - m4_ifval([$2], diff --git a/external_imported/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch b/external_imported/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch new file mode 100644 index 000000000..98d6d562d --- /dev/null +++ b/external_imported/vcpkg/ports/libunistring/libunistring-msys-msvc-build.patch @@ -0,0 +1,53 @@ +--- /dev/null ++++ b/build-aux/dumpbin-to-nm.awk +@@ -0,0 +1,14 @@ ++{last_section=section; section=$ 3}; ++/^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]}; ++/Section length .*#relocs.*(pick any)/{hide[last_section]=1}; ++/^ *Symbol name *: /{split($ 0,sn,":"); si=substr(sn[2],2)}; ++/^ *Type *: code/{print "T",si,substr(si,length(prfx))}; ++/^ *Type *: data/{print "I",si,substr(si,length(prfx))}; ++$ 0!~/External *\|/{next}; ++$ 0~/__local_stdio_printf_options/{next}; ++/ 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next}; ++{if(hide[section]) next}; ++{f="D"}; $ 0~/\(\).*\|/{f="T"}; ++{split($ 0,a,/\||\r/); split(a[2],s)}; ++s[1]~/^[@?]/{print f,s[1],s[1]; next}; ++s[1]~prfx {split(s[1],t,"@"); print f,t[1],substr(t[1],length(prfx))} +--- a/configure ++++ b/configure +@@ -10274,21 +10274,7 @@ + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. +- lt_cv_sys_global_symbol_pipe="$AWK '"\ +-" {last_section=section; section=\$ 3};"\ +-" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +-" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +-" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +-" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +-" \$ 0!~/External *\|/{next};"\ +-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +-" {if(hide[section]) next};"\ +-" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +-" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +-" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +-" ' prfx=^$ac_symprfx" ++ lt_cv_sys_global_symbol_pipe="$AWK -f '$(realpath "$(dirname $0)")/build-aux/dumpbin-to-nm.awk' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -5934,7 +5938,7 @@ + test -f $$sf || sf=$(srcdir)/$$sf; \ + of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ + echo "$(COMPILE) -c $$sf" 1>&6; \ +- $(COMPILE) -c $$sf || { rm -f config.h; exit 1; }; \ ++ $(COMPILE) -c $$sf 1>&6 || { rm -f config.h; exit 1; }; \ + sh ./exported.sh $$of 1>&5; \ + rm -f $$of `echo "$$of" | sed -e 's,\\.$(OBJEXT)$$,.lo,'`; \ + ;; \ diff --git a/external_imported/vcpkg/ports/libunistring/portfile.cmake b/external_imported/vcpkg/ports/libunistring/portfile.cmake index e16d0a5ba..9e4e55ff0 100644 --- a/external_imported/vcpkg/ports/libunistring/portfile.cmake +++ b/external_imported/vcpkg/ports/libunistring/portfile.cmake @@ -13,16 +13,17 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIBUNISTRING_VERSION} - PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef + PATCHES libunistring-msys-msvc-build.patch ) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG COPY_SOURCE + USE_WRAPPERS OPTIONS "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" ) + vcpkg_install_make() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/libunistring/vcpkg.json b/external_imported/vcpkg/ports/libunistring/vcpkg.json index c2aa59fc2..dfb16c1f8 100644 --- a/external_imported/vcpkg/ports/libunistring/vcpkg.json +++ b/external_imported/vcpkg/ports/libunistring/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libunistring", "version": "0.9.10", - "port-version": 2, + "port-version": 3, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", - "supports": "!windows", + "supports": "!uwp", "dependencies": [ "libiconv" ] diff --git a/external_imported/vcpkg/ports/liburing/disable-tests-and-examples.patch b/external_imported/vcpkg/ports/liburing/disable-tests-and-examples.patch new file mode 100644 index 000000000..7faef951a --- /dev/null +++ b/external_imported/vcpkg/ports/liburing/disable-tests-and-examples.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 686be4f..28d0a7f 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,8 +8,6 @@ default: all + + all: + @$(MAKE) -C src +- @$(MAKE) -C test +- @$(MAKE) -C examples + + .PHONY: all install default clean test + .PHONY: FORCE cscope diff --git a/external_imported/vcpkg/ports/liburing/fix-configure.patch b/external_imported/vcpkg/ports/liburing/fix-configure.patch index 92ebf2826..52b6c39ba 100644 --- a/external_imported/vcpkg/ports/liburing/fix-configure.patch +++ b/external_imported/vcpkg/ports/liburing/fix-configure.patch @@ -1,22 +1,24 @@ diff --git a/configure b/configure -index 3b96cde..56d5cb0 100755 +index 2c2441b..620c443 100644 --- a/configure +++ b/configure -@@ -18,16 +18,18 @@ for opt do +@@ -14,7 +14,7 @@ for opt do ;; - --mandir=*) mandir="$optarg" + --includedir=*) includedir="$optarg" ;; -- --datadir=*) datadir="$optarg" -+ --datarootdir=*) datadir="$optarg" +- --libdir=*) libdir="$optarg" ++ --datarootdir=*) libdir="$optarg" ;; - --cc=*) cc="$optarg" + --libdevdir=*) libdevdir="$optarg" ;; - --cxx=*) cxx="$optarg" +@@ -28,10 +28,12 @@ for opt do + ;; + --nolibc) liburing_nolibc="yes" ;; + --enable-shared) ENABLE_SHARED=1 + ;; + --enable-static) ENABLE_SHARED=0 -+ ;; ++ ;; *) - echo "ERROR: unknown option $opt" - echo "Try '$0 --help' for more information" @@ -25,7 +27,7 @@ index 3b96cde..56d5cb0 100755 ;; esac done -@@ -119,6 +121,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak +@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak printf "# Configured with:" >> $config_host_mak printf " '%s'" "$0" "$@" >> $config_host_mak echo >> $config_host_mak diff --git a/external_imported/vcpkg/ports/liburing/fix-spec-version.patch b/external_imported/vcpkg/ports/liburing/fix-spec-version.patch deleted file mode 100644 index 9acb1fc40..000000000 --- a/external_imported/vcpkg/ports/liburing/fix-spec-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/liburing.spec b/liburing.spec -index fa4d970..8607074 100644 ---- a/liburing.spec -+++ b/liburing.spec -@@ -1,5 +1,5 @@ - Name: liburing --Version: 0.7 -+Version: 2.0 - Release: 1%{?dist} - Summary: Linux-native io_uring I/O access library - License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/external_imported/vcpkg/ports/liburing/portfile.cmake b/external_imported/vcpkg/ports/liburing/portfile.cmake index 276f68fb4..3d36e55c4 100644 --- a/external_imported/vcpkg/ports/liburing/portfile.cmake +++ b/external_imported/vcpkg/ports/liburing/portfile.cmake @@ -1,32 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing - REF liburing-2.0 - SHA512 8a7b37600246d44a94d3fed1ca4bb60e76f9ddc60bd3c237e600b60e77961a1125c8a1f230cb7569f959acf10b68b91aafb4935c1c2fd13d5df7373b374e47f5 + REF dda4848a9911120a903bef6284fb88286f4464c9 #liburing-2.2 + SHA512 c2e4969ffb895996bf7465ce86143d4d3401a052624ec19580d34e8adbb2b57801e03541493f61e19a3137984714db645b135b1bc3b41987bccfd926bb486c09 HEAD_REF master PATCHES - fix-spec-version.patch # update version value for pkgconfig(.pc) files fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED + disable-tests-and-examples.patch ) # note: check ${SOURCE_PATH}/liburing.spec before updating configure options vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE ) vcpkg_install_make() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. # For dynamic, remove intermediate file liburing.a when install is finished. if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a - ${CURRENT_PACKAGES_DIR}/lib/liburing.a + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a" + "${CURRENT_PACKAGES_DIR}/lib/liburing.a" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7") diff --git a/external_imported/vcpkg/ports/liburing/vcpkg.json b/external_imported/vcpkg/ports/liburing/vcpkg.json index 37403d70c..e0f882ac3 100644 --- a/external_imported/vcpkg/ports/liburing/vcpkg.json +++ b/external_imported/vcpkg/ports/liburing/vcpkg.json @@ -1,8 +1,9 @@ { "name": "liburing", - "version": "2.0", - "port-version": 3, + "version": "2.2", + "port-version": 1, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", + "license": null, "supports": "linux" } diff --git a/external_imported/vcpkg/ports/libusb/portfile.cmake b/external_imported/vcpkg/ports/libusb/portfile.cmake index d3a3c39c0..e00798cd5 100644 --- a/external_imported/vcpkg/ports/libusb/portfile.cmake +++ b/external_imported/vcpkg/ports/libusb/portfile.cmake @@ -1,18 +1,17 @@ - if(VCPKG_TARGET_IS_LINUX) message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev") endif() -set(VERSION 1.0.24) +set(VERSION 1.0.26) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libusb/libusb - REF c6a35c56016ea2ab2f19115d2ea1e85e0edae155 # v1.0.24 - SHA512 985c020d9ae6f7135e3bfee68dddcf70921481db3d10e420f55d5ee9534f7fe7be6a2a31ee73a3b282b649fcc36da4fed848e0bd0410c20eaf1deb9a8e3086e8 + REF 4239bc3a50014b8e6a5a2a59df1fff3b7469543b # v1.0.26 + SHA512 f07ec9ef4df555733dab9388595cd10bc87195da54f4c646478d4a0496ee7b8933de03e957c7466291c120102d8801e8b26846cb27b201bb9cbca5df03f3a6ef HEAD_REF master ) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") set(MSVS_VERSION 2019) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") diff --git a/external_imported/vcpkg/ports/libusb/vcpkg.json b/external_imported/vcpkg/ports/libusb/vcpkg.json index 840ac16c2..e7d498d40 100644 --- a/external_imported/vcpkg/ports/libusb/vcpkg.json +++ b/external_imported/vcpkg/ports/libusb/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libusb", - "version": "1.0.24", - "port-version": 7, + "version": "1.0.26", + "port-version": 1, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", + "license": "LGPL-2.1", "supports": "!uwp" } diff --git a/external_imported/vcpkg/ports/libuv/CMakeLists.txt b/external_imported/vcpkg/ports/libuv/CMakeLists.txt deleted file mode 100644 index 7d2c38bdb..000000000 --- a/external_imported/vcpkg/ports/libuv/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(libuv C) - -find_package(Threads REQUIRED) - -file(GLOB UV_SOURCES_COMMON src/*.c) - -file(GLOB UV_SOURCES_UNIX - src/unix/async.c - src/unix/core.c - src/unix/dl.c - src/unix/fs.c - src/unix/getaddrinfo.c - src/unix/getnameinfo.c - src/unix/loop.c - src/unix/loop-watcher.c - src/unix/pipe.c - src/unix/poll.c - src/unix/process.c - src/unix/signal.c - src/unix/stream.c - src/unix/tcp.c - src/unix/thread.c - src/unix/tty.c - src/unix/udp.c -) -file(GLOB UV_SOURCES_LINUX - src/unix/proctitle.c - src/unix/linux-core.c - src/unix/linux-inotify.c - src/unix/linux-syscalls.c - src/unix/procfs-exepath.c - src/unix/sysinfo-loadavg.c - src/unix/sysinfo-memory.c - src/unix/epoll.c -) -file(GLOB UV_SOURCES_DARWIN - src/unix/proctitle.c - src/unix/darwin.c - src/unix/fsevents.c - src/unix/darwin-proctitle.c - src/unix/bsd-ifaddrs.c - src/unix/kqueue.c -) -file(GLOB UV_SOURCES_FREEBSD - src/unix/freebsd.c - src/unix/posix-hrtime.c - src/unix/bsd-proctitle.c - src/unix/bsd-ifaddrs.c - src/unix/kqueue.c -) -file(GLOB UV_SOURCES_WIN src/win/*.c) - -if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) - target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") - target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32) -elseif(APPLE) - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) -elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) -else() # Assume some Linux variant - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX}) -endif() - -target_link_libraries(libuv PRIVATE Threads::Threads) -target_include_directories(libuv PUBLIC $ $ $) -set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) - -if(NOT UV_SKIP_HEADERS) - install( - DIRECTORY include/ - DESTINATION include - ) -endif() - -install(TARGETS libuv - EXPORT libuv - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) -install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv) diff --git a/external_imported/vcpkg/ports/libuv/fix-build-type.patch b/external_imported/vcpkg/ports/libuv/fix-build-type.patch new file mode 100644 index 000000000..9977e48d0 --- /dev/null +++ b/external_imported/vcpkg/ports/libuv/fix-build-type.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ac52412..15d5cb2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -381,7 +381,7 @@ endif() + if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD") + list(APPEND uv_test_libraries util) + endif() +- ++if (BUILD_SHARED_LIBS) + add_library(uv SHARED ${uv_sources}) + target_compile_definitions(uv + INTERFACE +@@ -401,7 +401,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") + set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX) + endif() + target_link_libraries(uv ${uv_libraries}) +- ++else() + add_library(uv_a STATIC ${uv_sources}) + target_compile_definitions(uv_a PRIVATE ${uv_defines}) + target_compile_options(uv_a PRIVATE ${uv_cflags}) +@@ -416,7 +416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") + set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX) + endif() + target_link_libraries(uv_a ${uv_libraries}) +- ++endif() + if(LIBUV_BUILD_TESTS) + # Small hack: use ${uv_test_sources} now to get the runner skeleton, + # before the actual tests are added. +@@ -659,26 +659,39 @@ string(REPLACE ";" " " LIBS "${LIBS}") + file(STRINGS configure.ac configure_ac REGEX ^AC_INIT) + string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}") + set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}") ++if (BUILD_SHARED_LIBS) + # The version in the filename is mirroring the behaviour of autotools. + set_target_properties(uv PROPERTIES + VERSION ${UV_VERSION_MAJOR}.0.0 + SOVERSION ${UV_VERSION_MAJOR}) ++endif() + set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) + set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(prefix ${CMAKE_INSTALL_PREFIX}) ++if (BUILD_SHARED_LIBS) + configure_file(libuv.pc.in libuv.pc @ONLY) ++else() + configure_file(libuv-static.pc.in libuv-static.pc @ONLY) ++endif() + + install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc ++if (BUILD_SHARED_LIBS) ++install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++else() ++install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++endif() ++if (BUILD_SHARED_LIBS) + install(TARGETS uv EXPORT libuvConfig + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++else() + install(TARGETS uv_a EXPORT libuvConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() + install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv) + + if(MSVC) diff --git a/external_imported/vcpkg/ports/libuv/portfile.cmake b/external_imported/vcpkg/ports/libuv/portfile.cmake index 8b927ae80..036bb2676 100644 --- a/external_imported/vcpkg/ports/libuv/portfile.cmake +++ b/external_imported/vcpkg/ports/libuv/portfile.cmake @@ -1,39 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.43.0 - SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3 + REF 0c1fa696aa502eb749c2c4735005f41ba00a27b8 #v1.44.2 + SHA512 4b63745d48c5318d75ef3580fc6d6288b1ca26a25f69fbef2af4b6fe1d1fe1255986cbb1fb5124e1ba6cd324868ebccdc6f6965e08e3e0fbde29f22e7e20ce89 HEAD_REF v1.x + PATCHES fix-build-type.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - -DUV_SKIP_HEADERS=ON + OPTIONS + -DLIBUV_BUILD_TESTS=OFF + -DQEMU=OFF + -DASAN=OFF + -DTSAN=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv) vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -configure_file( - "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake" - "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake" - @ONLY -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libuv) +vcpkg_fixup_pkgconfig() -file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "1") else() - string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "0") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}") +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}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake b/external_imported/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake deleted file mode 100644 index a591d4cdf..000000000 --- a/external_imported/vcpkg/ports/libuv/unofficial-libuv-config.in.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - include(CMakeFindDependencyMacro) - find_dependency(Threads) -endif() - -include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake) diff --git a/external_imported/vcpkg/ports/libuv/usage b/external_imported/vcpkg/ports/libuv/usage new file mode 100644 index 000000000..b93ab2855 --- /dev/null +++ b/external_imported/vcpkg/ports/libuv/usage @@ -0,0 +1,4 @@ +libuv provides CMake targets: + + find_package(libuv CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,uv_a,uv>) diff --git a/external_imported/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index d95350a6d..000000000 --- a/external_imported/vcpkg/ports/libuv/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,16 +0,0 @@ -_find_package(${ARGS}) - -if(WIN32) - list(APPEND LibUV_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) - if(TARGET LibUV::LibUV) - set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) - endif() -endif() -include(CMakeFindDependencyMacro) -find_dependency(Threads) -list(APPEND LibUV_LIBRARIES Threads::Threads) -if(TARGET LibUV::LibUV) - set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) -endif() - - diff --git a/external_imported/vcpkg/ports/libuv/vcpkg.json b/external_imported/vcpkg/ports/libuv/vcpkg.json index 5b11cc1fd..1393311a9 100644 --- a/external_imported/vcpkg/ports/libuv/vcpkg.json +++ b/external_imported/vcpkg/ports/libuv/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libuv", - "version-semver": "1.43.0", + "version-semver": "1.44.2", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch b/external_imported/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch index 9202f4bd9..5f4749ae0 100644 --- a/external_imported/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch +++ b/external_imported/vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -1,21 +1,21 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 81d30a16c..d4f19cd97 100644 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -1370,12 +1370,14 @@ EOF - case ${tgt_os} in - win32) - add_asflags -f win32 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - win64) - add_asflags -f win64 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - linux*|solaris*|android*) +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 81d30a1..325017e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1370,12 +1370,14 @@ EOF + case ${tgt_os} in + win32) + add_asflags -f win32 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + win64) + add_asflags -f win64 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + linux*|solaris*|android*) diff --git a/external_imported/vcpkg/ports/libvpx/0003-add-uwp-and-v142-support.patch b/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch similarity index 87% rename from external_imported/vcpkg/ports/libvpx/0003-add-uwp-and-v142-support.patch rename to external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch index 9d689ab59..ce323c498 100644 --- a/external_imported/vcpkg/ports/libvpx/0003-add-uwp-and-v142-support.patch +++ b/external_imported/vcpkg/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,8 +1,8 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index d4f19cd97..fb51368b1 100644 +index 119d206..41bac75 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -1016,7 +1016,7 @@ EOF +@@ -1038,7 +1038,7 @@ EOF # A number of ARM-based Windows platforms are constrained by their # respective SDKs' limitations. Fortunately, these are all 32-bit ABIs # and so can be selected as 'win32'. @@ -11,7 +11,7 @@ index d4f19cd97..fb51368b1 100644 asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl" AS_SFX=.S msvs_arch_dir=arm-msvs -@@ -1250,6 +1250,9 @@ EOF +@@ -1272,6 +1272,9 @@ EOF android) soft_enable realtime_only ;; @@ -21,7 +21,7 @@ index d4f19cd97..fb51368b1 100644 win*) enabled gcc && add_cflags -fno-common ;; -@@ -1368,6 +1371,16 @@ EOF +@@ -1390,6 +1393,16 @@ EOF fi AS_SFX=.asm case ${tgt_os} in @@ -38,7 +38,7 @@ index d4f19cd97..fb51368b1 100644 win32) add_asflags -f win32 enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -@@ -1488,6 +1501,8 @@ EOF +@@ -1519,6 +1532,8 @@ EOF # Almost every platform uses pthreads. if enabled multithread; then case ${toolchain} in @@ -48,7 +48,7 @@ index d4f19cd97..fb51368b1 100644 ;; *-android-gcc) diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 6f91ad478..916851662 100755 +index 58bb66b..b4cad6c 100644 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -296,7 +296,22 @@ generate_vcxproj() { @@ -75,7 +75,7 @@ index 6f91ad478..916851662 100755 tag_content AppContainerApplication true # The application type can be one of "Windows Store", # "Windows Phone" or "Windows Phone Silverlight". The -@@ -391,7 +406,7 @@ generate_vcxproj() { +@@ -394,7 +409,7 @@ generate_vcxproj() { Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" if [ "$name" == "vpx" ]; then hostplat=$plat @@ -85,47 +85,53 @@ index 6f91ad478..916851662 100755 fi fi diff --git a/configure b/configure -index da631a45e..da93474e5 100755 +index beea650..91ae3c8 100644 --- a/configure +++ b/configure -@@ -101,16 +101,20 @@ all_platforms="${all_platforms} arm64-android-gcc" - all_platforms="${all_platforms} arm64-darwin-gcc" +@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-darwin20-gcc" + all_platforms="${all_platforms} arm64-darwin21-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" ++all_platforms="${all_platforms} arm64-uwp-vs17" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" +all_platforms="${all_platforms} arm64-win64-vs16" ++all_platforms="${all_platforms} arm64-win64-vs17" all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 +all_platforms="${all_platforms} armv7-uwp-vs16" ++all_platforms="${all_platforms} armv7-uwp-vs17" all_platforms="${all_platforms} armv7-win32-gcc" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" +all_platforms="${all_platforms} armv7-win32-vs16" ++all_platforms="${all_platforms} armv7-win32-vs17" all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv8-linux-gcc" - all_platforms="${all_platforms} mips32-linux-gcc" -@@ -135,6 +139,7 @@ all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} loongarch32-linux-gcc" +@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" +all_platforms="${all_platforms} x86-uwp-vs16" ++all_platforms="${all_platforms} x86-uwp-vs17" all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" -@@ -156,6 +161,7 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" +@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" +all_platforms="${all_platforms} x86_64-uwp-vs16" ++all_platforms="${all_platforms} x86_64-uwp-vs17" all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" -@@ -476,11 +482,10 @@ process_targets() { +@@ -485,11 +497,10 @@ process_targets() { ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" @@ -141,7 +147,7 @@ index da631a45e..da93474e5 100755 if [ -f "${source_path}/build/make/version.sh" ]; then ver=`"$source_path/build/make/version.sh" --bare "$source_path"` DIST_DIR="${DIST_DIR}-${ver}" -@@ -569,6 +574,10 @@ process_detect() { +@@ -578,6 +589,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in diff --git a/external_imported/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch b/external_imported/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch index c8feaf8f3..e7f827d7b 100644 --- a/external_imported/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch +++ b/external_imported/vcpkg/ports/libvpx/0004-remove-library-suffixes.patch @@ -1,13 +1,13 @@ -diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 916851662..e60405bc9 100755 ---- a/build/make/gen_msvs_vcxproj.sh -+++ b/build/make/gen_msvs_vcxproj.sh -@@ -394,7 +394,7 @@ generate_vcxproj() { - else - config_suffix="" - fi -- tag_content TargetName "${name}${lib_sfx}${config_suffix}" -+ tag_content TargetName "${name}" - fi - close_tag PropertyGroup - done +diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh +index 916851662..e60405bc9 100755 +--- a/build/make/gen_msvs_vcxproj.sh ++++ b/build/make/gen_msvs_vcxproj.sh +@@ -394,7 +394,7 @@ generate_vcxproj() { + else + config_suffix="" + fi +- tag_content TargetName "${name}${lib_sfx}${config_suffix}" ++ tag_content TargetName "${name}" + fi + close_tag PropertyGroup + done diff --git a/external_imported/vcpkg/ports/libvpx/portfile.cmake b/external_imported/vcpkg/ports/libvpx/portfile.cmake index 10ce04878..478fadbf8 100644 --- a/external_imported/vcpkg/ports/libvpx/portfile.cmake +++ b/external_imported/vcpkg/ports/libvpx/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(LIBVPX_VERSION 1.10.0) +set(LIBVPX_VERSION 1.12.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libvpx REF v${LIBVPX_VERSION} - SHA512 f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d + SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0 HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch - 0003-add-uwp-and-v142-support.patch + 0003-add-uwp-v142-and-v143-support.patch 0004-remove-library-suffixes.patch ) @@ -19,12 +19,12 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") else() - set(BASH /bin/bash) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") + set(BASH /bin/bash) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() vcpkg_find_acquire_program(NASM) @@ -42,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_CRT_SUFFIX md) endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore AND (VCPKG_PLATFORM_TOOLSET STREQUAL v142 OR VCPKG_PLATFORM_TOOLSET STREQUAL v143)) set(LIBVPX_TARGET_OS "uwp") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) set(LIBVPX_TARGET_OS "win32") @@ -64,7 +64,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_ARCH_DIR "ARM") endif() - if(VCPKG_PLATFORM_TOOLSET STREQUAL v142) + if(VCPKG_PLATFORM_TOOLSET STREQUAL v143) + set(LIBVPX_TARGET_VS "vs17") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL v142) set(LIBVPX_TARGET_VS "vs16") else() set(LIBVPX_TARGET_VS "vs15") @@ -143,10 +145,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}") configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY) endif() - + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) endif() else() diff --git a/external_imported/vcpkg/ports/libvpx/vcpkg.json b/external_imported/vcpkg/ports/libvpx/vcpkg.json index c002bdddf..06c3d7d76 100644 --- a/external_imported/vcpkg/ports/libvpx/vcpkg.json +++ b/external_imported/vcpkg/ports/libvpx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libvpx", - "version-semver": "1.10.0", - "port-version": 2, + "version": "1.12.0", "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", + "license": "BSD-3-Clause", "features": { "highbitdepth": { "description": "use VP9 high bit depth (10/12) profiles" diff --git a/external_imported/vcpkg/ports/libwebp/0001-build.patch b/external_imported/vcpkg/ports/libwebp/0001-build.patch deleted file mode 100644 index 3c6a63988..000000000 --- a/external_imported/vcpkg/ports/libwebp/0001-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd1bebb..4ce801d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,6 +214,9 @@ endfunction() - if(MSVC) - # avoid security warnings for e.g., fopen() used in the examples. - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ if(BUILD_SHARED_LIBS) -+ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL") -+ endif() - else() - add_definitions(-Wall) - endif() -@@ -482,7 +485,7 @@ if(WEBP_BUILD_LIBWEBPMUX) - "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") -- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) -+ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$:lib>webpmux) - list(APPEND INSTALLED_LIBRARIES libwebpmux) - configure_pkg_config("src/mux/libwebpmux.pc") - endif() -@@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) - # webp_quality - add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) - target_link_libraries(webp_quality exampleutil imagedec) -+ if(BUILD_SHARED_LIBS) -+ target_link_libraries(webp_quality webpdspdecode) -+ endif() - target_include_directories(webp_quality - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR}) - - # vwebp_sdl -@@ -620,7 +627,7 @@ if(WEBP_BUILD_WEBP_JS) - -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") - set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) -- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) - endif() - - # WASM version diff --git a/external_imported/vcpkg/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/external_imported/vcpkg/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch deleted file mode 100644 index 5e039a681..000000000 --- a/external_imported/vcpkg/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in -index 822fc59..cef75fe 100644 ---- a/cmake/WebPConfig.cmake.in -+++ b/cmake/WebPConfig.cmake.in -@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION}) - @PACKAGE_INIT@ - - include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) - --set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") --set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) --set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") --set(WEBP_LIBRARIES "${WebP_LIBRARIES}") -+find_path(WEBP_INCLUDE_DIR NAMES webp/types.h) -+set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR}) -+set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+ -+if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY) -+ find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp) -+ find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd) -+ select_library_configurations(WEBP_BASE) -+ set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY}) -+ if(WEBP_BASE_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY) -+ find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder) -+ find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd) -+ select_library_configurations(WEBP_DECODER) -+ set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY}) -+ if(WEBP_DECODER_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY) -+ find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux) -+ find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd) -+ select_library_configurations(WEBP_DEMUX) -+ set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY}) -+ if(WEBP_DEMUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY) -+ find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux) -+ find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd) -+ select_library_configurations(WEBP_MUX) -+ set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY}) -+ if(WEBP_MUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}") -+ endif() -+endif() -+ -+set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY}) -+set(WebP_LIBRARY ${WebP_BASE_LIBRARY}) -+if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR) -+ set(WEBP_FOUND 1) -+ set(WebP_FOUND 1) -+endif() diff --git a/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch b/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch new file mode 100644 index 000000000..cc9a27fc8 --- /dev/null +++ b/external_imported/vcpkg/ports/libwebp/0002-cmake-config.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 822fc59..fb31829 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -5,7 +5,19 @@ set(WEBP_VERSION ${WebP_VERSION}) + ++include(CMakeFindDependencyMacro) ++find_dependency(Threads) + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +-set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") ++get_filename_component(_vcpkg_libwebp_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) ++set(WebP_INCLUDE_DIRS "${_vcpkg_libwebp_root}/include") + set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) +-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") ++set(WebP_LIBRARIES "") ++include(SelectLibraryConfigurations) ++foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@) ++ string(REPLACE "libwebpmux" "webpmux" _vcpkg_libwebp_lib "${_vcpkg_libwebp_lib}") # offical OUTPUT_NAME ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/lib" NO_DEFAULT_PATH) ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/debug/lib" NO_DEFAULT_PATH) ++ select_library_configurations(_vcpkg_${_vcpkg_libwebp_lib}) ++ list(APPEND WebP_LIBRARIES ${_vcpkg_${_vcpkg_libwebp_lib}_LIBRARIES}) ++endforeach() + set(WEBP_LIBRARIES "${WebP_LIBRARIES}") ++unset(_vcpkg_libwebp_root) diff --git a/external_imported/vcpkg/ports/libwebp/0003-always-mux.patch b/external_imported/vcpkg/ports/libwebp/0003-always-mux.patch deleted file mode 100644 index c120c95d0..000000000 --- a/external_imported/vcpkg/ports/libwebp/0003-always-mux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0ae7d5..5813c06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -472,7 +472,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_LIBWEBPMUX) -+if(WEBP_BUILD_LIBWEBPMUX OR WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) diff --git a/external_imported/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch b/external_imported/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch new file mode 100644 index 000000000..63fb5afde --- /dev/null +++ b/external_imported/vcpkg/ports/libwebp/0003-fix-tool-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77a0f85..4a84ed1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -410,6 +410,8 @@ endif() + + # Build the executables if asked for. + if(WEBP_BUILD_ANIM_UTILS ++ OR WEBP_BUILD_WEBPINFO ++ OR WEBP_BUILD_WEBPMUX + OR WEBP_BUILD_CWEBP + OR WEBP_BUILD_DWEBP + OR WEBP_BUILD_GIF2WEBP diff --git a/external_imported/vcpkg/ports/libwebp/0004-add-missing-linked-library.patch b/external_imported/vcpkg/ports/libwebp/0004-add-missing-linked-library.patch deleted file mode 100644 index 6cfbe7ce8..000000000 --- a/external_imported/vcpkg/ports/libwebp/0004-add-missing-linked-library.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8386687..5ab9ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,6 +540,10 @@ if(WEBP_BUILD_VWEBP) - PRIVATE ${GLUT_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/src - ${OPENGL_INCLUDE_DIR}) -+ if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) -+ find_package(X11 REQUIRED) -+ target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED) diff --git a/external_imported/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch b/external_imported/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch deleted file mode 100644 index 819c1f90b..000000000 --- a/external_imported/vcpkg/ports/libwebp/0006-fix-dependecies-platform.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83edb3a..f634094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,7 +540,11 @@ if(WEBP_BUILD_EXTRAS) - find_package(SDL) - if(SDL_FOUND) - add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) -- target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) -+ target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) -+ if (MSVC) -+ target_link_libraries(vwebp_sdl dxguid winmm) -+ endif() -+ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) - target_include_directories(vwebp_sdl - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src diff --git a/external_imported/vcpkg/ports/libwebp/0009-glut.patch b/external_imported/vcpkg/ports/libwebp/0009-glut.patch index 01d011e5f..914a935e1 100644 --- a/external_imported/vcpkg/ports/libwebp/0009-glut.patch +++ b/external_imported/vcpkg/ports/libwebp/0009-glut.patch @@ -11,13 +11,3 @@ index 0799269..45b3306 100644 imageioutil webp webpdemux) -@@ -543,6 +543,9 @@ if(WEBP_BUILD_VWEBP) - if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) - find_package(X11 REQUIRED) - target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ if(X11_Xrandr_FOUND) # due to glut linking xrandr if found -+ target_link_libraries(vwebp ${X11_Xrandr_LIB}) -+ endif() - endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") diff --git a/external_imported/vcpkg/ports/libwebp/0010-fix_build.patch b/external_imported/vcpkg/ports/libwebp/0010-fix_build.patch new file mode 100644 index 000000000..1d3d45094 --- /dev/null +++ b/external_imported/vcpkg/ports/libwebp/0010-fix_build.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43742c7f7..44b035ebb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -248,6 +248,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h") + if(MSVC) + # avoid security warnings for e.g., fopen() used in the examples. + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ if(BUILD_SHARED_LIBS) ++ add_definitions("-DWEBP_DLL") ++ endif() + else() + add_definitions(-Wall) + endif() +@@ -635,8 +638,12 @@ if(WEBP_BUILD_EXTRAS) + # webp_quality + add_executable(webp_quality ${WEBP_QUALITY_SRCS}) + target_link_libraries(webp_quality exampleutil imagedec extras) ++ if(BUILD_SHARED_LIBS) ++ target_link_libraries(webp_quality webpdspdecode) ++ endif() + target_include_directories(webp_quality + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ++ ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}) + + # vwebp_sdl +@@ -651,6 +658,10 @@ if(WEBP_BUILD_EXTRAS) + ${SDL_INCLUDE_DIR}) + set(WEBP_HAVE_SDL 1) + target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) ++ if (MSVC) ++ target_link_libraries(vwebp_sdl dxguid winmm) ++ endif() ++ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) + endif() + endif() + +@@ -669,7 +680,7 @@ if(WEBP_BUILD_WEBP_JS) + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) +- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + endif() + + # WASM version +diff --git a/src/webp/types.h b/src/webp/types.h +index 47f7f2b00..a7a706590 100644 +--- a/src/webp/types.h ++++ b/src/webp/types.h +@@ -39,7 +39,9 @@ typedef long long int int64_t; + #ifndef WEBP_EXTERN + // This explicitly marks library functions and allows for changing the + // signature for e.g., Windows DLL builds. +-# if defined(__GNUC__) && __GNUC__ >= 4 ++# if defined(_MSC_VER) && defined(WEBP_DLL) ++# define WEBP_EXTERN extern __declspec(dllexport) ++# elif defined(__GNUC__) && __GNUC__ >= 4 + # define WEBP_EXTERN extern __attribute__ ((visibility ("default"))) + # else + # define WEBP_EXTERN extern diff --git a/external_imported/vcpkg/ports/libwebp/portfile.cmake b/external_imported/vcpkg/ports/libwebp/portfile.cmake index 985a6d518..b15557743 100644 --- a/external_imported/vcpkg/ports/libwebp/portfile.cmake +++ b/external_imported/vcpkg/ports/libwebp/portfile.cmake @@ -1,44 +1,37 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO webmproject/libwebp - REF 9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf # v1.2.1 - SHA512 43224caedb0d591ad1dd3872cd882c0fe255e24425f6da82fca212783ddb231326797a82ead0a1b8b15dc98db1cb05741e3a5e5131babbcc49a529a9f3253865 - HEAD_REF master - PATCHES - 0001-build.patch - 0002-cmake-config-add-backwards-compatibility.patch - 0003-always-mux.patch #always build libwebpmux - 0004-add-missing-linked-library.patch - 0006-fix-dependecies-platform.patch - 0007-fix-arm-build.patch - 0008-sdl.patch - 0009-glut.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebp + REF v1.2.4 + SHA512 85c7d2bd1697ed6f18d565056d0105edd63697f144d2c935e9c0563ff09f4acc56d4ac509668f920e8d5dc3c74b53a42f65265fc758fed173cb2168c4d6a551c + HEAD_REF master + PATCHES + 0002-cmake-config.patch + 0003-fix-tool-dependencies.patch + 0007-fix-arm-build.patch + 0008-sdl.patch + 0009-glut.patch + 0010-fix_build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - anim WEBP_BUILD_ANIM_UTILS - gif2webp WEBP_BUILD_GIF2WEBP - img2webp WEBP_BUILD_IMG2WEBP - vwebp WEBP_BUILD_VWEBP - vwebp-sdl WEBP_HAVE_SDL - info WEBP_BUILD_WEBPINFO - mux WEBP_BUILD_WEBPMUX - extras WEBP_BUILD_EXTRAS - nearlossless WEBP_NEAR_LOSSLESS - simd WEBP_ENABLE_SIMD - cwebp WEBP_BUILD_CWEBP - dwebp WEBP_BUILD_DWEBP - swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP - unicode WEBP_UNICODE - libbwebpmux WEBP_BUILD_LIBWEBPMUX + FEATURES + anim WEBP_BUILD_ANIM_UTILS + gif2webp WEBP_BUILD_GIF2WEBP + img2webp WEBP_BUILD_IMG2WEBP + vwebp WEBP_BUILD_VWEBP + vwebp-sdl WEBP_HAVE_SDL + info WEBP_BUILD_WEBPINFO + mux WEBP_BUILD_WEBPMUX + extras WEBP_BUILD_EXTRAS + nearlossless WEBP_NEAR_LOSSLESS + simd WEBP_ENABLE_SIMD + cwebp WEBP_BUILD_CWEBP + dwebp WEBP_BUILD_DWEBP + swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP + unicode WEBP_UNICODE + libwebpmux WEBP_BUILD_LIBWEBPMUX ) - -if(VCPKG_TARGET_IS_LINUX) - message("WebP currently requires the following library from the system package manager:\n Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev") -endif() - if(VCPKG_TARGET_IS_OSX) if("vwebp" IN_LIST FEATURES OR "extras" IN_LIST FEATURES) message(FATAL_ERROR "Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP or extras on Mac!") @@ -46,11 +39,9 @@ if(VCPKG_TARGET_IS_OSX) endif() vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -58,27 +49,21 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) # find_package is called with WebP not libwebp +vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdecoder.pc" "-lwebpdecoder" "-lwebpdecoderd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdemux.pc" "-lwebpdemux" "-lwebpdemuxd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpmux.pc" "-lwebpmux" "-lwebpmuxd") -endif() vcpkg_fixup_pkgconfig() set(BIN_NAMES get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/webp/") foreach(tool ${BIN_NAMES}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() endforeach() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") @@ -89,8 +74,8 @@ if(RES_LEN EQUAL 0) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libwebp/vcpkg.json b/external_imported/vcpkg/ports/libwebp/vcpkg.json index 179f1cc1b..dbd72cd2b 100644 --- a/external_imported/vcpkg/ports/libwebp/vcpkg.json +++ b/external_imported/vcpkg/ports/libwebp/vcpkg.json @@ -1,11 +1,13 @@ { "name": "libwebp", - "version": "1.2.1", + "version": "1.2.4", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", + "license": "BSD-3-Clause", "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "unicode" ], @@ -21,6 +23,7 @@ } ], "default-features": [ + "libwebpmux", "nearlossless", "simd" ], @@ -37,6 +40,7 @@ "gif2webp", "img2webp", "info", + "libwebpmux", "mux", "nearlossless", "simd" @@ -63,6 +67,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "img2webp", "mux" @@ -81,6 +86,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] @@ -94,7 +100,14 @@ "gif2webp": { "description": "Build the gif2webp conversion tool.", "dependencies": [ - "giflib" + "giflib", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } ] }, "img2webp": { @@ -102,6 +115,13 @@ "dependencies": [ "libjpeg-turbo", "libpng", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + }, "tiff" ] }, @@ -109,10 +129,31 @@ "description": "Build the webpinfo command line tool." }, "libbwebpmux": { + "description": "Obsolete, use feature libwebpmux instead.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "libwebpmux": { "description": "Build the libwebpmux library" }, "mux": { - "description": "Build the webpmux command line tool." + "description": "Build the webpmux command line tool.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] }, "nearlossless": { "description": "Enable near-lossless encoding" @@ -141,6 +182,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] diff --git a/external_imported/vcpkg/ports/libx11/cl.build.patch b/external_imported/vcpkg/ports/libx11/cl.build.patch new file mode 100644 index 000000000..2845f1d31 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/cl.build.patch @@ -0,0 +1,147 @@ +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index 844571688..e46c4ec5d 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -1351,11 +1351,14 @@ extern int _XOpenFile( + int /* flags */ + ); + ++#if defined(_MSC_VER) && !defined(mode_t) ++typedef int mode_t; ++#endif + extern int _XOpenFileMode( + _Xconst char* /* path */, + int /* flags */, + mode_t /* mode */ + ); + + extern void* _XFopenFile( + _Xconst char* /* path */, +diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c +index 56dba9673..d10de825e 100644 +--- a/modules/im/ximcp/imLcLkup.c ++++ b/modules/im/ximcp/imLcLkup.c +@@ -61,27 +61,37 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, + ||(ic->private.local.brl_committed != 0))) { + if (ic->private.local.brl_committed != 0) { /* Braille Event */ + unsigned char pattern = ic->private.local.brl_committed; ++#ifndef _MSC_VER + char mb2[XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max)]; ++#else ++ char *mb2 = (char*)malloc(XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max)*sizeof(char)); ++#endif + ret = _Xlcwctomb(ic->core.im->core.lcd, mb2, BRL_UC_ROW | pattern); + if(ret > bytes) { + if(status) *status = XBufferOverflow; ++#ifdef _MSC_VER ++ free(mb2); ++#endif + return(ret); + } + if(keysym) *keysym = XK_braille_blank | pattern; + if(ret > 0) { + if (keysym) { + if(status) *status = XLookupBoth; + } else { + if(status) *status = XLookupChars; + } + memcpy(buffer, mb2, ret); + } else { + if(keysym) { + if(status) *status = XLookupKeySym; + } else { + if(status) *status = XLookupNone; + } + } ++#ifdef _MSC_VER ++ free(mb2); ++#endif + } else { /* Composed Event */ + ret = strlen(&mb[b[ic->private.local.composed].mb]); + if(ret > bytes) { +diff --git a/src/XlibInt.c b/src/XlibInt.c +index e4fb4e5f2..4cfa1aeab 100644 +--- a/src/XlibInt.c ++++ b/src/XlibInt.c +@@ -60,6 +60,8 @@ from The Open Group. + /* Needed for ioctl() on Solaris */ + #ifdef HAVE_UNISTD_H + #include ++#else ++ #define F_OK 0 + #endif + + #ifdef XTHREADS +@@ -985,7 +987,7 @@ _XWireToEvent( + case KeymapNotify: + { + register XKeymapEvent *ev = (XKeymapEvent *) re; +- ev->window = None; ++ ev->window = 0; + memcpy(&ev->key_vector[1], + (char *)((xKeymapEvent *) event)->map, + sizeof (((xKeymapEvent *) event)->map)); +@@ -1919,7 +1925,11 @@ int _XOpenFileMode(path, flags, mode) + UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS); + + if (AccessFile (path, buf, MAX_PATH, &bufp)) ++#ifndef _MSC_VER + ret = open (bufp, flags, mode); ++#else ++ ret = _open (bufp, flags, mode); ++#endif + + (void) SetErrorMode (olderror); + +diff --git a/src/xlibi18n/XDefaultOMIF.c b/src/xlibi18n/XDefaultOMIF.c +index 9345547c3..77d914fe1 100644 +--- a/src/xlibi18n/XDefaultOMIF.c ++++ b/src/xlibi18n/XDefaultOMIF.c +@@ -70,6 +70,14 @@ Sun Microsystems, Inc. or its licensors is granted. + #include + #include + ++#if !defined(ssize_t) ++ #ifdef _WIN64 ++ #define ssize_t long long ++ #else ++ #define ssize_t long ++ #endif ++#endif ++ + #define MAXFONTS 100 + + #define XOM_GENERIC(om) (&((XOMGeneric) om)->gen) +diff --git a/src/xlibi18n/lcDB.c b/src/xlibi18n/lcDB.c +index e04a5d89f..fa46f8ecc 100644 +--- a/src/xlibi18n/lcDB.c ++++ b/src/xlibi18n/lcDB.c +@@ -65,6 +65,14 @@ + + #include + ++#if !defined(ssize_t) ++ #ifdef _WIN64 ++ #define ssize_t long long ++ #else ++ #define ssize_t long ++ #endif ++#endif ++ + typedef struct _DatabaseRec { + char *category; + char *name; +diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c +index e43ac2c0e..d9f49b725 100644 +--- a/src/xlibi18n/lcFile.c ++++ b/src/xlibi18n/lcFile.c +@@ -32,7 +32,9 @@ + #include "Xlibint.h" + #include "XlcPubI.h" + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + /************************************************************************/ + diff --git a/external_imported/vcpkg/ports/libx11/dllimport.patch b/external_imported/vcpkg/ports/libx11/dllimport.patch new file mode 100644 index 000000000..a06adc0d5 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/dllimport.patch @@ -0,0 +1,44 @@ +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index 603d05669..8596cb434 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -389,23 +389,26 @@ struct _XLockPtrs { + #define _XLockMutex_fn (*_XLockMutex_fn_p) + #define _XUnlockMutex_fn (*_XUnlockMutex_fn_p) + #define _Xglobal_lock (*_Xglobal_lock_p) ++#define X_LOCK_EXTERN __declspec(dllimport) extern ++#else ++#define X_LOCK_EXTERN extern + #endif + + /* in XlibInt.c */ +-extern void (*_XCreateMutex_fn)( ++X_LOCK_EXTERN void (*_XCreateMutex_fn)( + LockInfoPtr /* lock */ + ); +-extern void (*_XFreeMutex_fn)( ++X_LOCK_EXTERN void (*_XFreeMutex_fn)( + LockInfoPtr /* lock */ + ); +-extern void (*_XLockMutex_fn)( ++X_LOCK_EXTERN void (*_XLockMutex_fn)( + LockInfoPtr /* lock */ + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char * /* file */ + , int /* line */ + #endif + ); +-extern void (*_XUnlockMutex_fn)( ++X_LOCK_EXTERN void (*_XUnlockMutex_fn)( + LockInfoPtr /* lock */ + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char * /* file */ +@@ -413,7 +416,7 @@ extern void (*_XUnlockMutex_fn)( + #endif + ); + +-extern LockInfoPtr _Xglobal_lock; ++X_LOCK_EXTERN LockInfoPtr _Xglobal_lock; + + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + #define LockDisplay(d) if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__) diff --git a/external_imported/vcpkg/ports/libx11/io_include.patch b/external_imported/vcpkg/ports/libx11/io_include.patch new file mode 100644 index 000000000..184b8d556 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/io_include.patch @@ -0,0 +1,12 @@ +diff --git a/src/XlibInt.c b/src/XlibInt.c +index bab39bc00..31b6511cb 100644 +--- a/src/XlibInt.c ++++ b/src/XlibInt.c +@@ -45,6 +45,7 @@ from The Open Group. + #include + #ifdef WIN32 + #include ++#include + #endif + + /* Needed for FIONREAD on Solaris */ diff --git a/external_imported/vcpkg/ports/libx11/portfile.cmake b/external_imported/vcpkg/ports/libx11/portfile.cmake new file mode 100644 index 000000000..51a5c24d8 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/portfile.cmake @@ -0,0 +1,96 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(PATCHES dllimport.patch) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libx11 + REF 4c96f3567a8d045ee57b886fddc9618b71282530 #x11 v 1.7.3.1 + SHA512 15c55b6283aec363f6af5b549584d487ec5a8c0f74b95dc44674ff50764abe5b9fa216e2af3c5408faf12d17b04e9433f0ad66da6e32a0dfef0427ca131ef23b + HEAD_REF master + PATCHES cl.build.patch + io_include.patch + ${PATCHES} + vcxserver.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{CPP} "cl_cpp_wrapper") +endif() + +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS + --enable-malloc0returnsnull=yes #Configure fails to run the test for some reason + --enable-loadable-i18n=no #Pointer conversion errors + --enable-ipv6 + --enable-hyperv + --enable-tcp-transport + --with-launchd=no + --with-lint=no + --disable-selective-werror + --enable-unix-transport=no) +endif() +if(NOT XLSTPROC) + find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin") +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") + +if(VCPKG_TARGET_IS_OSX) + set(ENV{LC_ALL} C) +endif() +vcpkg_find_acquire_program(PERL) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} +) + +if(VCPKG_CROSSCOMPILING) + file(GLOB FOR_BUILD_FILES "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/*") + file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util") + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/util") + endif() +endif() +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/X11/extensions/XKBgeom.h") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/X11/extensions/") #XKBgeom.h should be the only file in there +endif() + +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/${PORT}" RENAME copyright) + +if(NOT VCPKG_CROSSCOMPILING) + file(READ "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" config_contents) + string(REGEX MATCH "ac_cv_objext=[^\n]+" objsuffix "${config_contents}") + string(REPLACE "ac_cv_objext=" "." objsuffix "${objsuffix}") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${objsuffix}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +endif() + +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY) + diff --git a/external_imported/vcpkg/ports/libx11/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libx11/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..9d0d3e227 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,12 @@ +_find_package(${ARGS}) +if(TARGET X11::xcb) + if(TARGET X11:X11) + target_link_libraries(X11::X11 INTERFACE X11:xcb) + endif() + if(TARGET X11:xdmcp) + target_link_libraries(X11::xcb INTERFACE X11:xdmcp) + endif() + if(TARGET X11:xau) + target_link_libraries(X11::xcb INTERFACE X11:xau) + endif() +endif() diff --git a/external_imported/vcpkg/ports/libx11/vcpkg.json b/external_imported/vcpkg/ports/libx11/vcpkg.json new file mode 100644 index 000000000..f48ef72d8 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libx11", + "version": "1.7.3.1", + "port-version": 1, + "description": "The X Window System is a network-transparent window system that was designed at MIT.", + "homepage": "https://www.x.org/wiki/", + "license": "MIT", + "dependencies": [ + "bzip2", + { + "name": "libx11", + "host": true + }, + { + "name": "libxslt", + "host": true + }, + "xcb", + "xproto", + "xtrans" + ] +} diff --git a/external_imported/vcpkg/ports/libx11/vcxserver.patch b/external_imported/vcpkg/ports/libx11/vcxserver.patch new file mode 100644 index 000000000..10a6312f9 --- /dev/null +++ b/external_imported/vcpkg/ports/libx11/vcxserver.patch @@ -0,0 +1,138 @@ +diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h +index 5faf83b..c6c63a3 100644 +--- a/include/X11/Xlib.h ++++ b/include/X11/Xlib.h +@@ -79,7 +79,7 @@ _Xmblen( + + typedef char *XPointer; + +-#define Bool int +-#define Status int ++typedef int Bool; ++typedef int Status; + #define True 1 + #define False 0 +diff --git a/src/CrGlCur.c b/src/CrGlCur.c +index 460660f..510ff5d 100644 +--- a/src/CrGlCur.c ++++ b/src/CrGlCur.c +@@ -51,8 +51,14 @@ in this Software without prior written authorization from The Open Group. + #if defined(hpux) + typedef shl_t XModuleType; + #else ++#ifdef _MSC_VER ++#include ++typedef HANDLE XModuleType; ++#define dlsym GetProcAddress ++#else + typedef void *XModuleType; + #endif ++#endif + + #ifndef LIBXCURSOR + #define LIBXCURSOR "libXcursor.so.1" +@@ -70,8 +76,12 @@ open_library (void) + { + #if defined(hpux) + module = shl_load(library, BIND_DEFERRED, 0L); ++#else ++#ifdef _MSC_VER ++ module = LoadLibrary(library); + #else + module = dlopen(library, RTLD_LAZY); ++#endif + #endif + if (module) + return module; +diff --git a/src/GetDflt.c b/src/GetDflt.c +index c9222a2..c6e1b25 100644 +--- a/src/GetDflt.c ++++ b/src/GetDflt.c +@@ -137,9 +138,13 @@ InitDefaults( + * ~/.Xdefaults. Next, if there is an XENVIRONMENT environment variable, + * then load that file. + */ +- ++ + if (dpy->xdefaults == NULL) { ++ #ifdef _MSC_VER ++ const char *slashDotXdefaults = ".Xdefaults"; ++ #else + const char *slashDotXdefaults = "/.Xdefaults"; ++ #endif + + (void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaults) - 1)); + (void) strcat (fname, slashDotXdefaults); +@@ -149,7 +154,11 @@ InitDefaults( + } + + if (!(xenv = getenv ("XENVIRONMENT"))) { ++ #ifdef _MSC_VER ++ const char *slashDotXdefaultsDash = ".Xdefaults-"; ++ #else + const char *slashDotXdefaultsDash = "/.Xdefaults-"; ++ #endif + int len; + + (void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaultsDash) - 1)); + diff --git a/src/SetLocale.c b/src/SetLocale.c +index 81f4a7c..cb52f11 100644 +--- a/src/SetLocale.c ++++ b/src/SetLocale.c +@@ -63,11 +63,11 @@ from The Open Group. + #include + #include + #include "XlcPubI.h" + + #define MAXLOCALE 64 /* buffer size of locale name */ + + +-#if defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_MSC_VER) + char * + _Xsetlocale( + int category, +diff --git a/src/StrKeysym.c b/src/StrKeysym.c +index be77a93..6967bcc 100644 +--- a/src/StrKeysym.c ++++ b/src/StrKeysym.c +@@ -39,12 +39,12 @@ in this Software without prior written authorization from The Open Group. + + #ifndef KEYSYMDB + #ifndef XKEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "XKeysymDB" + #else + #define KEYSYMDB XKEYSYMDB + #endif + #endif + + static Bool initialized; + static XrmDatabase keysymdb; + static XrmQuark Qkeysym[2]; +diff --git a/src/xlibi18n/lcDynamic.c b/src/xlibi18n/lcDynamic.c +index 3821bff..a50aa70 100644 +--- a/src/xlibi18n/lcDynamic.c ++++ b/src/xlibi18n/lcDynamic.c +@@ -51,7 +51,7 @@ from The Open Group. + #include "Xlcint.h" + + #ifndef XLOCALEDIR +-#define XLOCALEDIR "/usr/lib/X11/locale" ++#define XLOCALEDIR "locale" + #endif + + #define LCLIBNAME "xi18n.so" +diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c +index 25cabd5..819ac89 100644 +--- a/src/xlibi18n/lcFile.c ++++ b/src/xlibi18n/lcFile.c +@@ -195,7 +192,7 @@ _XlcParsePath( + } + + #ifndef XLOCALEDIR +-#define XLOCALEDIR "/usr/lib/X11/locale" ++#define XLOCALEDIR "locale" + #endif + + void diff --git a/external_imported/vcpkg/ports/libxau/portfile.cmake b/external_imported/vcpkg/ports/libxau/portfile.cmake new file mode 100644 index 000000000..e745eb6b6 --- /dev/null +++ b/external_imported/vcpkg/ports/libxau/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxau + REF d9443b2c57b512cfb250b35707378654d86c7dea # 1.0.9 + SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS "${OPTIONS}" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxau/vcpkg.json b/external_imported/vcpkg/ports/libxau/vcpkg.json new file mode 100644 index 000000000..f1cbde68d --- /dev/null +++ b/external_imported/vcpkg/ports/libxau/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxau", + "version": "1.0.9", + "description": "Functions for handling Xauthority files and entries.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxau", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxdamage/portfile.cmake b/external_imported/vcpkg/ports/libxdamage/portfile.cmake new file mode 100644 index 000000000..44ed2a42e --- /dev/null +++ b/external_imported/vcpkg/ports/libxdamage/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdamage + REF 977b04cd69738806e0b48fcf5c725763d065f06d # 1.1.5 + SHA512 79c3a4c63f6c50c39d324183b98ad7e70235aed1c8385acf2f593739c71e7929119448be3e15dffd276b32e4fbb056508deeb35f450f74b85c101047f68d4339 + HEAD_REF master # branch name +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxdamage/vcpkg.json b/external_imported/vcpkg/ports/libxdamage/vcpkg.json new file mode 100644 index 000000000..dc86f1ee7 --- /dev/null +++ b/external_imported/vcpkg/ports/libxdamage/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxdamage", + "version": "1.1.5", + "description": "X Damage Extension library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxdamage", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxfixes", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxdmcp/configure.ac.patch b/external_imported/vcpkg/ports/libxdmcp/configure.ac.patch new file mode 100644 index 000000000..8a8f474c8 --- /dev/null +++ b/external_imported/vcpkg/ports/libxdmcp/configure.ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 7aedf3424..43ab8dbaf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_PROG_LN_S + AC_SEARCH_LIBS([recvfrom],[socket]) + + case $host_os in +- *mingw*) ++ *mingw* | *msys* ) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) diff --git a/external_imported/vcpkg/ports/libxdmcp/portfile.cmake b/external_imported/vcpkg/ports/libxdmcp/portfile.cmake new file mode 100644 index 000000000..a48b84dee --- /dev/null +++ b/external_imported/vcpkg/ports/libxdmcp/portfile.cmake @@ -0,0 +1,36 @@ +#SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) # this is a lie but the lib has a different name than the dll +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdmcp + REF 618b3ba5f826d930df2ca6a6a0ce212fa75cef42 # 1.1.3 + SHA512 f8b035fa95f6948cc6bac69bfcc33498cd65db73c62aadee714bce371d61c50f283c45d1a3f43397a96b3c956b41dfe94355e94e33764760b29bf98ba8dfebe2 + HEAD_REF master + PATCHES configure.ac.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) + string(APPEND VCPKG_C_FLAGS "/showIncludes ") + string(APPEND VCPKG_CXX_FLAGS "/showIncludes ") +endif() +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS ${OPTIONS} --enable-unit-tests=no +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxdmcp/vcpkg.json b/external_imported/vcpkg/ports/libxdmcp/vcpkg.json new file mode 100644 index 000000000..a2a977cbe --- /dev/null +++ b/external_imported/vcpkg/ports/libxdmcp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxdmcp", + "version": "1.1.3", + "description": "X Display Manager Control Protocol library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxdmcp", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxext/portfile.cmake b/external_imported/vcpkg/ports/libxext/portfile.cmake new file mode 100644 index 000000000..a116f6fd0 --- /dev/null +++ b/external_imported/vcpkg/ports/libxext/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxext + REF ebb167f34a3514783966775fb12573c4ed209625 # 1.3.4 + SHA512 509cb67ad9dba37adbcc49dca6e9803b318f62e8e2b981ccf73ce328a8104e94615312c5914b480ba04e28d208cd93d8a71b3e6e2ef1a4e5615aa2a3f9ba19e7 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS xorg_cv_malloc0_returns_null=yes +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxext/vcpkg.json b/external_imported/vcpkg/ports/libxext/vcpkg.json new file mode 100644 index 000000000..ed49330c7 --- /dev/null +++ b/external_imported/vcpkg/ports/libxext/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxext", + "version": "1.3.4", + "description": "Xlib-based library for common extensions to the X11 protocol", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxext", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxfixes/portfile.cmake b/external_imported/vcpkg/ports/libxfixes/portfile.cmake new file mode 100644 index 000000000..0441be999 --- /dev/null +++ b/external_imported/vcpkg/ports/libxfixes/portfile.cmake @@ -0,0 +1,29 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxfixes + REF 6fe3bd64dd82f704ed91478acb4c99ab5c00be16 # 6.0.0 + SHA512 429e65f4183d92cee1380273a23be9bf157bdd19e01e164d8b9058a2a54601af8f4556888302a2cad062c2cfc4b3a37d6b8f5b7ac6bdd6b5c069c7b791422201 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxfixes/vcpkg.json b/external_imported/vcpkg/ports/libxfixes/vcpkg.json new file mode 100644 index 000000000..a079b2264 --- /dev/null +++ b/external_imported/vcpkg/ports/libxfixes/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxfixes", + "version": "6.0.0", + "description": "Xlib-based library for the XFIXES Extension", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfixes", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxi/portfile.cmake b/external_imported/vcpkg/ports/libxi/portfile.cmake new file mode 100644 index 000000000..7f7676bda --- /dev/null +++ b/external_imported/vcpkg/ports/libxi/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxi + REF f24d7f43ab4d97203e60677a3d42e11dbc80c8b4 # 1.8 + SHA512 bc98d03f1c53f26d0c2063de5a0b58951c9db44dfcfb44519efca89f20c8f8f50599c264d11546357164430f3486dd263742657de426cc7fbb3a306be0bc8866 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxi/vcpkg.json b/external_imported/vcpkg/ports/libxi/vcpkg.json new file mode 100644 index 000000000..1993f6c8f --- /dev/null +++ b/external_imported/vcpkg/ports/libxi/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libxi", + "version": "1.8", + "description": "Xlib library for the X Input Extension", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxi", + "license": null, + "dependencies": [ + "libxext", + "libxfixes" + ] +} diff --git a/external_imported/vcpkg/ports/libxkbcommon/build.patch b/external_imported/vcpkg/ports/libxkbcommon/build.patch new file mode 100644 index 000000000..9cc9ea9b2 --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbcommon/build.patch @@ -0,0 +1,27 @@ +diff --git a/tools/how-to-type.c b/tools/how-to-type.c +index 0a6f79e68..c1205004d 100644 +--- a/tools/how-to-type.c ++++ b/tools/how-to-type.c +@@ -25,8 +25,10 @@ + + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + + #include "xkbcommon/xkbcommon.h" +diff --git a/tools/tools-common.c b/tools/tools-common.c +index 254499d8c..2465a88c2 100644 +--- a/tools/tools-common.c ++++ b/tools/tools-common.c +@@ -42,6 +42,7 @@ + #ifdef _MSC_VER + #include + #include ++#include + #else + #include + #include diff --git a/external_imported/vcpkg/ports/libxkbcommon/fix_msvc_build.patch b/external_imported/vcpkg/ports/libxkbcommon/fix_msvc_build.patch new file mode 100644 index 000000000..9caecd1cb --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbcommon/fix_msvc_build.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 47c436f8d..3fdbe4709 100644 +--- a/meson.build ++++ b/meson.build +@@ -641,7 +641,7 @@ if get_option('enable-x11') + ) + # test/x11comp is meant to be run, but it is (temporarily?) disabled. + # See: https://github.com/xkbcommon/libxkbcommon/issues/30 +- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep) ++ # executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep) + endif + if get_option('enable-xkbregistry') + test( diff --git a/external_imported/vcpkg/ports/libxkbcommon/portfile.cmake b/external_imported/vcpkg/ports/libxkbcommon/portfile.cmake new file mode 100644 index 000000000..87b4547e9 --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbcommon/portfile.cmake @@ -0,0 +1,55 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +set(PATCHES "") +if(VCPKG_TARGET_IS_WINDOWS) + #vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs + set(PATCHES fix_msvc_build.patch + build.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xkbcommon/libxkbcommon + REF 57af9cb71f19f37394399b549f7cb7b0d9fe3988 # v 1.4.1 + SHA512 0f1ecdf12c3cc6ff547a9cf42aa8ce1c63acbf2f6fb766899e5e8dbda401e25dd8137c2f59a04dadd445b4873bb80b8ae8b23f88140e5a318186c308a65921f5 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") + +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS -Denable-xkbregistry=false) +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Denable-wayland=false + -Denable-docs=false + -Denable-tools=false +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json b/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json new file mode 100644 index 000000000..ffd8259ae --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbcommon/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libxkbcommon", + "version": "1.4.1", + "description": "keymap handling library for toolkits and window systems", + "homepage": "https://xkbcommon.org/", + "license": null, + "dependencies": [ + "getopt", + "libx11", + "tool-meson", + { + "name": "wayland", + "platform": "linux" + }, + "xcb", + "xcb-render-util" + ] +} diff --git a/external_imported/vcpkg/ports/libxkbfile/fix_u_char.patch b/external_imported/vcpkg/ports/libxkbfile/fix_u_char.patch new file mode 100644 index 000000000..4e20ce02d --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbfile/fix_u_char.patch @@ -0,0 +1,15 @@ +diff --git a/src/xkbmisc.c b/src/xkbmisc.c +index 2f9b532e6..8be8dd508 100644 +--- a/src/xkbmisc.c ++++ b/src/xkbmisc.c +@@ -688,7 +688,9 @@ XkbNameMatchesPattern(char *name, char *ptrn) + _X_HIDDEN int + _XkbStrCaseCmp(char *str1, char *str2) + { +- const u_char *us1 = (const u_char *) str1, *us2 = (const u_char *) str2; ++ typedef unsigned char u_char; ++ const u_char *us1 = (const u_char *) str1; ++ const u_char *us2 = (const u_char *) str2; + + while (tolower(*us1) == tolower(*us2)) { + if (*us1++ == '\0') diff --git a/external_imported/vcpkg/ports/libxkbfile/portfile.cmake b/external_imported/vcpkg/ports/libxkbfile/portfile.cmake new file mode 100644 index 000000000..78b0eaa24 --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbfile/portfile.cmake @@ -0,0 +1,41 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +set(PATCHES "") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(PATCHES symbol_visibility.patch) + list(APPEND VCPKG_C_FLAGS " /DXKBFILE_BUILD") + list(APPEND VCPKG_CXX_FLAGS " /DXKBFILE_BUILD") +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxkbfile + REF 261992d42905f209cd5bf6afcf8a7ae3aa30b3ff #1.1.0 + SHA512 5be520e408d25331c9a97648f2a6fa832f0d4f49f93f71490b89746da0fbbda404eaab3797c5fbe195287dc94581a6703fa4ecc2511e046127af057eab60378f + HEAD_REF master + PATCHES fix_u_char.patch + ${PATCHES} +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) +endif() + diff --git a/external_imported/vcpkg/ports/libxkbfile/symbol_visibility.patch b/external_imported/vcpkg/ports/libxkbfile/symbol_visibility.patch new file mode 100644 index 000000000..103442160 --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbfile/symbol_visibility.patch @@ -0,0 +1,24 @@ +diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h +index 1455463e6..5bcabdd14 100644 +--- a/include/X11/extensions/XKBfile.h ++++ b/include/X11/extensions/XKBfile.h +@@ -83,10 +83,15 @@ typedef void (*XkbFileAddOnFunc)( + #define _XkbErrXReqFailure 25 + #define _XkbErrBadImplementation 26 + +-extern const char * _XkbErrMessages[]; +-extern unsigned _XkbErrCode; +-extern const char * _XkbErrLocation; +-extern unsigned _XkbErrData; ++#if defined(_MSC_VER) && !defined(XKBFILE_BUILD) ++#define XKBFILE_EXTERN __declspec(dllimport) extern ++#else ++#define XKBFILE_EXTERN extern ++#endif ++XKBFILE_EXTERN const char * _XkbErrMessages[]; ++XKBFILE_EXTERN unsigned _XkbErrCode; ++XKBFILE_EXTERN const char * _XkbErrLocation; ++XKBFILE_EXTERN unsigned _XkbErrData; + + /***====================================================================***/ + diff --git a/external_imported/vcpkg/ports/libxkbfile/vcpkg.json b/external_imported/vcpkg/ports/libxkbfile/vcpkg.json new file mode 100644 index 000000000..b1f41147d --- /dev/null +++ b/external_imported/vcpkg/ports/libxkbfile/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxkbfile", + "version": "1.1.0", + "description": "XKB file handling routines", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxkbfile", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxml2/disable-docs.patch b/external_imported/vcpkg/ports/libxml2/disable-docs.patch new file mode 100644 index 000000000..b00bafacf --- /dev/null +++ b/external_imported/vcpkg/ports/libxml2/disable-docs.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f922d5ab..70466bc7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,11 +647,6 @@ if(LIBXML2_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + +-install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) +-install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE) +- + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} diff --git a/external_imported/vcpkg/ports/libxml2/fix-uwp.patch b/external_imported/vcpkg/ports/libxml2/fix-uwp.patch index ce57a9ed1..98a5bff44 100644 --- a/external_imported/vcpkg/ports/libxml2/fix-uwp.patch +++ b/external_imported/vcpkg/ports/libxml2/fix-uwp.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b45d62..ba8bfec 100644 +index f922d5ab..6eb0a7fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -129,6 +129,7 @@ endif() +@@ -134,6 +134,7 @@ endif() if(MSVC) configure_file(include/win32config.h config.h COPYONLY) -+ add_compile_options(/wd4996) ++ add_compile_options(/wd4996) else() check_c_source_compiles(" void __attribute__((destructor)) diff --git a/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch b/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch index b98ca86ec..494bb8a71 100644 --- a/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch +++ b/external_imported/vcpkg/ports/libxml2/fix_cmakelist.patch @@ -1,16 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a437717ba..0a11039d1 100644 +index f922d5ab..685964b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.15) - --project(libxml2 VERSION 2.9.10 LANGUAGES C) -+project(libxml2 VERSION 2.9.12 LANGUAGES C) - - include(CheckCSourceCompiles) - include(CheckFunctionExists) -@@ -465,15 +465,15 @@ endif() +@@ -459,15 +459,15 @@ endif() if(LIBXML2_WITH_ICU) target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) if(WIN32) @@ -29,7 +21,7 @@ index a437717ba..0a11039d1 100644 endif() if(LIBXML2_WITH_THREADS) -@@ -483,7 +483,7 @@ endif() +@@ -477,7 +477,7 @@ endif() if(LIBXML2_WITH_ZLIB) target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) @@ -38,11 +30,10 @@ index a437717ba..0a11039d1 100644 endif() set_target_properties( -@@ -495,24 +495,9 @@ set_target_properties( - PREFIX lib +@@ -490,23 +490,9 @@ set_target_properties( VERSION ${PROJECT_VERSION} ) -- + +set(XML_LIB_NAME xml2) if(MSVC) - if(BUILD_SHARED_LIBS) @@ -61,11 +52,11 @@ index a437717ba..0a11039d1 100644 - RELWITHDEBINFO_POSTFIX s - ) - endif() -+ set(XML_LIB_NAME libxml2) ++ set(XML_LIB_NAME libxml2) endif() install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) -@@ -659,30 +644,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN +@@ -654,30 +640,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN configure_package_config_file( libxml2-config.cmake.cmake.in libxml2-config.cmake @@ -102,17 +93,15 @@ index a437717ba..0a11039d1 100644 FILE libxml2-export.cmake COMPONENT development diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index 2653a7c56..d1bff5bcc 100644 +index 2653a7c5..2eb2f362 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in -@@ -7,7 +7,8 @@ modules=@WITH_MODULES@ - Name: libXML +@@ -8,6 +8,7 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. --Requires: + Requires: -Libs: -L${libdir} -lxml2 -Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ -+Requires: +Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ +Libs: -L${libdir} -l@XML_LIB_NAME@ +Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ diff --git a/external_imported/vcpkg/ports/libxml2/portfile.cmake b/external_imported/vcpkg/ports/libxml2/portfile.cmake index 931dc7756..2a7dd29fa 100644 --- a/external_imported/vcpkg/ports/libxml2/portfile.cmake +++ b/external_imported/vcpkg/ports/libxml2/portfile.cmake @@ -2,10 +2,11 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 - REF b48e77cf4f6fa0792c5f4b639707a2b0675e461b - SHA512 2d20867961b8d8a0cb0411192146882b976c1276d2e8ecd9a7ee3f1eb287f64e59282736f58c641b66abf63ba45c9421f27e13ec09a0b10814cd56987b18cb5b + REF 7846b0a677f8d3ce72486125fa281e92ac9970e8 + SHA512 3b960e410cf812a94938cd31c317f9a8d4b2d5b3e148efb108f6dad86ce8c9553c0fe3b32dd68d15e3d5ada9db07b39f9e0b13906edf6ed1bb1cec4f137bca71 HEAD_REF master PATCHES + disable-docs.patch fix_cmakelist.patch fix-uwp.patch ) @@ -19,10 +20,10 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "tools" LIBXML2_WITH_PROGRAMS + "tools" LIBXML2_WITH_PROGRAMS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBXML2_WITH_TESTS=OFF @@ -68,8 +69,6 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) - if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) endif() @@ -85,10 +84,14 @@ endif() file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - #Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libxml2/usage b/external_imported/vcpkg/ports/libxml2/usage index c77cdbce5..c7a4878e9 100644 --- a/external_imported/vcpkg/ports/libxml2/usage +++ b/external_imported/vcpkg/ports/libxml2/usage @@ -1,4 +1,4 @@ The package libxml2 is compatible with built-in CMake targets: - find_package(LibXml2 CONFIG REQUIRED) + find_package(LibXml2 REQUIRED) target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake index dede4c831..705f22c6a 100644 --- a/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -1,49 +1,3 @@ -_find_package(${ARGS}) -if(LibXml2_FOUND) - list(APPEND LIBXML2_INCLUDE_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") - list(APPEND LIBXML2_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") # This is wrong but downstream doesn't correctly use _DIR vs _DIRS variables - if(TARGET LibXml2::LibXml2) - target_include_directories(LibXml2::LibXml2 INTERFACE "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") - endif() -endif() -if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) - find_package(LibLZMA) - find_package(ZLIB) - find_package(Iconv) - include(SelectLibraryConfigurations) - find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) - find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - unset(LIBXML2_LIBRARIES) - unset(LIBXML2_LIBRARY CACHE) - select_library_configurations(LIBXML2) - list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) - if(Iconv_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) - endif() - if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) - set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") - endif() - if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_DEBUG) - set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBXML2_LIBRARY_DEBUG}") - endif() - cmake_policy(PUSH) - cmake_policy(SET CMP0079 NEW) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - list(APPEND LIBXML2_LIBRARIES m) - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "m") - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") - list(APPEND LIBXML2_LIBRARIES ws2_32) - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ws2_32") - endif() - endif() - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "LibLZMA::LibLZMA" "ZLIB::ZLIB") - if(TARGET Iconv::Iconv) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv") - endif() - endif() - cmake_policy(POP) -endif() +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +_find_package(${ARGS} CONFIG) +set(LIBXML2_FOUND "${LibXml2_FOUND}") # fphsa compatibility diff --git a/external_imported/vcpkg/ports/libxml2/vcpkg.json b/external_imported/vcpkg/ports/libxml2/vcpkg.json index b28e844f3..752c331ad 100644 --- a/external_imported/vcpkg/ports/libxml2/vcpkg.json +++ b/external_imported/vcpkg/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", - "version-semver": "2.9.12", - "port-version": 5, + "version": "2.9.14", + "port-version": 1, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "license": "MIT", diff --git a/external_imported/vcpkg/ports/libxmlmm/CMakeLists.txt b/external_imported/vcpkg/ports/libxmlmm/CMakeLists.txt index 721641a64..e423c6df7 100644 --- a/external_imported/vcpkg/ports/libxmlmm/CMakeLists.txt +++ b/external_imported/vcpkg/ports/libxmlmm/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxmlmm CXX) -set(CMAKE_SHARED_LIBRARY_PREFIX) -set(CMAKE_STATIC_LIBRARY_PREFIX) - find_package(LibXml2 REQUIRED) set(HEADERS_LIBXMLMM @@ -38,22 +35,26 @@ set(SOURCES_LIBXMLMM ) add_library(libxmlmm ${SOURCES_LIBXMLMM}) -include_directories(${LIBXML2_INCLUDE_DIR}) -target_link_libraries (libxmlmm ${LIBXML2_LIBRARIES}) +target_link_libraries (libxmlmm PUBLIC LibXml2::LibXml2) set_target_properties(libxmlmm PROPERTIES CXX_STANDARD 17 PUBLIC_HEADER "${HEADERS_LIBXMLMM}" + PREFIX "" ) target_include_directories(libxmlmm PUBLIC $ $) -install(TARGETS ${PROJECT_NAME} - EXPORT litehtmlTargets +install(TARGETS libxmlmm + EXPORT unofficial-libxmlmm-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/libxmlmm ) +install(EXPORT unofficial-libxmlmm-targets + NAMESPACE unofficial::libxmlmm:: + DESTINATION share/unofficial-libxmlmm +) diff --git a/external_imported/vcpkg/ports/libxmlmm/portfile.cmake b/external_imported/vcpkg/ports/libxmlmm/portfile.cmake index 552bd6cb2..b676af2f1 100644 --- a/external_imported/vcpkg/ports/libxmlmm/portfile.cmake +++ b/external_imported/vcpkg/ports/libxmlmm/portfile.cmake @@ -6,18 +6,21 @@ 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() - -# Handle copyright -configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_cmake_install() vcpkg_copy_pdbs() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libxmlmm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libxmlmm") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libxmlmm) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(READ "${SOURCE_PATH}/README.md" readme) +string(REGEX REPLACE "^.*## Copying\n" "" copyright "${readme}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${copyright}") diff --git a/external_imported/vcpkg/ports/libxmlmm/unofficial-libxmlmm-config.cmake b/external_imported/vcpkg/ports/libxmlmm/unofficial-libxmlmm-config.cmake new file mode 100644 index 000000000..16a46deec --- /dev/null +++ b/external_imported/vcpkg/ports/libxmlmm/unofficial-libxmlmm-config.cmake @@ -0,0 +1,3 @@ +include(CMakeFindDependencyMacro) +find_dependency(LibXml2) +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libxmlmm-config.cmake") diff --git a/external_imported/vcpkg/ports/libxmlmm/vcpkg.json b/external_imported/vcpkg/ports/libxmlmm/vcpkg.json index 03fdcba58..2de6d1446 100644 --- a/external_imported/vcpkg/ports/libxmlmm/vcpkg.json +++ b/external_imported/vcpkg/ports/libxmlmm/vcpkg.json @@ -1,10 +1,19 @@ { "name": "libxmlmm", - "version-string": "0.6.0", - "port-version": 1, + "version": "0.6.0", + "port-version": 3, "description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.", "homepage": "https://github.com/rioki/libxmlmm", + "license": "MIT", "dependencies": [ - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/libxpm/fix-dependency-gettext.patch b/external_imported/vcpkg/ports/libxpm/fix-dependency-gettext.patch new file mode 100644 index 000000000..05e31568e --- /dev/null +++ b/external_imported/vcpkg/ports/libxpm/fix-dependency-gettext.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 365544b..51bc0f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,9 @@ PKG_CHECK_MODULES(SXPM, [x11 xt xext xextproto xproto >= 7.0.17], + AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) + + # Internationalization & localization support +-AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"]) ++AC_ARG_WITH([gettext], AC_HELP_STRING([--with-gettext], ++ [Use gettext, default is no]), ++ [USE_GETTEXT=${withval}]) + AC_MSG_CHECKING([where to install localized messages]) + AC_ARG_WITH([localedir], AS_HELP_STRING([--with-localedir=], + [Path to install message files in (default: datadir/locale)]), diff --git a/external_imported/vcpkg/ports/libxpm/portfile.cmake b/external_imported/vcpkg/ports/libxpm/portfile.cmake new file mode 100644 index 000000000..48bfd5f66 --- /dev/null +++ b/external_imported/vcpkg/ports/libxpm/portfile.cmake @@ -0,0 +1,46 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxpm + REF libXpm-3.5.13 + SHA512 250c8bf672789a81cfa258a516d40936f48a56cfaee94bf3f628e3f4a462bdd90eaaea787d66daf09ce4809b89c3eaea1e0771de03a6d7f1a59b31cc82be1c44 + PATCHES + remove_strings_h.patch + fix-dependency-gettext.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if ("gettext" IN_LIST FEATURES) + set(EXTRA_OPTIONS --with-gettext=yes) +else() + set(EXTRA_OPTIONS --with-gettext=no) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${EXTRA_OPTIONS} + ) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libxpm/remove_strings_h.patch b/external_imported/vcpkg/ports/libxpm/remove_strings_h.patch new file mode 100644 index 000000000..6afeee016 --- /dev/null +++ b/external_imported/vcpkg/ports/libxpm/remove_strings_h.patch @@ -0,0 +1,16 @@ +diff --git a/src/XpmI.h b/src/XpmI.h +index 4360ad3b9..a8d78b0ba 100644 +--- a/src/XpmI.h ++++ b/src/XpmI.h +@@ -325,8 +325,10 @@ FUNC(xpmstrcasecmp, int, (char *s1, char *s2)); + #else + #undef xpmstrcasecmp + #define xpmstrcasecmp strcasecmp ++#if !defined(_MSC_VER) + #include + #endif ++#endif + + FUNC(xpmatoui, unsigned int, + (char *p, unsigned int l, unsigned int *ui_return)); + \ No newline at end of file diff --git a/external_imported/vcpkg/ports/libxpm/vcpkg.json b/external_imported/vcpkg/ports/libxpm/vcpkg.json new file mode 100644 index 000000000..88127105e --- /dev/null +++ b/external_imported/vcpkg/ports/libxpm/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "libxpm", + "version": "3.5.11", + "port-version": 1, + "description": "XPM format pixmap library", + "homepage": "https://github.com/freedesktop/libXpm", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + "libx11", + { + "name": "vcpkg-cmake", + "host": true + }, + "xorg-macros", + "xproto" + ], + "features": { + "gettext": { + "description": "use xgettext to build source", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/libxrandr/portfile.cmake b/external_imported/vcpkg/ports/libxrandr/portfile.cmake new file mode 100644 index 000000000..229122bd7 --- /dev/null +++ b/external_imported/vcpkg/ports/libxrandr/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in the triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrandr + REF 55dcda4518eda8ae03ef25ea29d3c994ad71eb0a # 1.5.2 + SHA512 63a3a7c5db8d41c73ef2f55e86a47bdae0112ac39802efa5da4fa26a8794066d6906d4a5e4e9af5abb5838a061f2583dc2b8865e38754ee3f2a8e3918de87168 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxrandr/vcpkg.json b/external_imported/vcpkg/ports/libxrandr/vcpkg.json new file mode 100644 index 000000000..0d769dab8 --- /dev/null +++ b/external_imported/vcpkg/ports/libxrandr/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libxrandr", + "version": "1.5.2", + "description": "Xlib Resize, Rotate and Reflection (RandR) extension library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrandr", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxext", + "libxrender", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxrender/portfile.cmake b/external_imported/vcpkg/ports/libxrender/portfile.cmake new file mode 100644 index 000000000..0a60e04c0 --- /dev/null +++ b/external_imported/vcpkg/ports/libxrender/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrender + REF 845716f8f14963d338e5a8d5d2424baafc90fb30 # 0.9.10 + SHA512 a7e8d383a8400d63eb726b741cd25a1e9e671c7eadef04beddc4e31fec59b384ae4fa3f305e62a2aecbaedffc76c7b0626f525ec8634c9940a29de058e4a653c + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxrender/vcpkg.json b/external_imported/vcpkg/ports/libxrender/vcpkg.json new file mode 100644 index 000000000..6c0bd85f3 --- /dev/null +++ b/external_imported/vcpkg/ports/libxrender/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libxrender", + "version": "0.9.10", + "description": "library for the Render Extension to the X11 protocol", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrender", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/libxres/build.patch b/external_imported/vcpkg/ports/libxres/build.patch new file mode 100644 index 000000000..04b3ce3ec --- /dev/null +++ b/external_imported/vcpkg/ports/libxres/build.patch @@ -0,0 +1,16 @@ +diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h +index 1c816165e..8da68aa23 100644 +--- a/include/X11/extensions/XRes.h ++++ b/include/X11/extensions/XRes.h +@@ -6,7 +6,10 @@ + #define _XRES_H + + #include +- ++#if defined(_MSC_VER) ++ #include ++ typedef int pid_t; ++#endif + /* v1.0 */ + + typedef struct { diff --git a/external_imported/vcpkg/ports/libxres/portfile.cmake b/external_imported/vcpkg/ports/libxres/portfile.cmake new file mode 100644 index 000000000..7d2d27ba5 --- /dev/null +++ b/external_imported/vcpkg/ports/libxres/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxres + REF c05c6d918b0e2011d4bfa370c321482e34630b17 # 1.2.1 + SHA512 c2eabf65b03393991b56b84bea4d770e9c0295d685e8b22bb7dabbd37dd6c7c6f5e519cefa790b05c0f124bb739a5abe03249b89e2ce6d5276014e9752c11251 + HEAD_REF master + PATCHES build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/libxres/vcpkg.json b/external_imported/vcpkg/ports/libxres/vcpkg.json new file mode 100644 index 000000000..46d1479f0 --- /dev/null +++ b/external_imported/vcpkg/ports/libxres/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxres", + "version": "1.2.1", + "description": "Xlib-based X-Resource extension client library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxres", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxext", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch b/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch deleted file mode 100644 index 65433e0d7..000000000 --- a/external_imported/vcpkg/ports/libxslt/0001-Fix-makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git "a/win32/Makefile.msvc" "b/win32/Makefile.msvc" -index 2e4742bb..8bfe7d83 100644 ---- "a/win32/Makefile.msvc" -+++ "b/win32/Makefile.msvc" -@@ -59,7 +59,13 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE - LD = link.exe - LDFLAGS = /nologo - LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) --LIBS = -+# The libraries are needed for static builds (the makefile builds all tools and dlls) -+LIBS = iconv.lib charset.lib ws2_32.lib lzma.lib -+!if "$(DEBUG)" == "1" -+LIBS = $(LIBS) zlibd.lib -+!else -+LIBS = $(LIBS) zlib.lib -+!endif - - # The archiver and its options. - AR = lib.exe -@@ -71,8 +77,14 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 - LDFLAGS = $(LDFLAGS) /DEBUG - !else - CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 -+LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF /OPT:ICF - !endif - -+# append CFLAGS etc. passed on command line -+CPPFLAGS = $(CPPFLAGS) $(EXTRA_CPPFLAGS) -+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) -+LDFLAGS = $(LDFLAGS) $(EXTRA_LDFLAGS) -+ - # Libxslt object files. - XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\ - $(XSLT_INTDIR)\documents.obj\ -@@ -309,13 +321,7 @@ $(UTILS_INTDIR) : - # An implicit rule for xsltproc and friends. - APPLIBS = $(LIBS) - !if "$(STATIC)" == "1" --APPLIBS = $(LIBS) libxml2_a.lib --!if "$(WITH_ICONV)" == "1" --APPLIBS = $(APPLIBS) iconv.lib --!endif --!if "$(WITH_ZLIB)" == "1" --APPLIBS = $(APPLIBS) zlib.lib --!endif -+APPLIBS = $(LIBS) libxml2.lib - {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe: - $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \ - $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< diff --git a/external_imported/vcpkg/ports/libxslt/0002-Fix-lzma.patch b/external_imported/vcpkg/ports/libxslt/0002-Fix-lzma.patch deleted file mode 100644 index c1ece5036..000000000 --- a/external_imported/vcpkg/ports/libxslt/0002-Fix-lzma.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/win32/configure.js b/win32/configure.js -index 12c99f3..0737b06 100644 ---- a/win32/configure.js -+++ b/win32/configure.js -@@ -45,6 +45,7 @@ var withMemDebug = false; - var withDebugger = true; - var withIconv = true; - var withZlib = false; -+var withLzma = true; - var withCrypto = true; - var withModules = false; - var withProfiler = true; -@@ -105,6 +106,7 @@ function usage() - txt += " debugger: Enable external debugger support (" + (withDebugger? "yes" : "no") + ")\n"; - txt += " iconv: Use iconv library (" + (withIconv? "yes" : "no") + ")\n"; - txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; -+ txt += " lzma: Use lzma library (" + (withLzma? "yes" : "no") + ")\n"; - txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n"; - txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n"; - txt += " profiler: Enable Profiler support (" + (withProfiler? "yes" : "no") + ")\n"; -@@ -192,6 +194,7 @@ function discoverVersion() - vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0")); - vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); - vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); -+ vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0")); - vf.WriteLine("WITH_CRYPTO=" + (withCrypto? "1" : "0")); - vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0")); - vf.WriteLine("WITH_PROFILER=" + (withProfiler? "1" : "0")); -@@ -344,6 +347,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { - withIconv = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "zlib") - withZlib = strToBool(arg.substring(opt.length + 1, arg.length)); -+ else if (opt == "lzma") -+ withLzma = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "crypto") - withCrypto = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "modules") -@@ -482,6 +487,7 @@ txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; - txtOut += " Debugger support: " + boolToStr(withDebugger) + "\n"; - txtOut += " Use iconv: " + boolToStr(withIconv) + "\n"; - txtOut += " With zlib: " + boolToStr(withZlib) + "\n"; -+txtOut += " Lzma: " + boolToStr(withLzma) + "\n"; - txtOut += " Crypto: " + boolToStr(withCrypto) + "\n"; - txtOut += " Modules: " + boolToStr(withModules) + "\n"; - txtOut += " Profiler: " + boolToStr(withProfiler) + "\n"; diff --git a/external_imported/vcpkg/ports/libxslt/0003-Fix-configure.patch b/external_imported/vcpkg/ports/libxslt/0003-Fix-configure.patch deleted file mode 100644 index 43cc23903..000000000 --- a/external_imported/vcpkg/ports/libxslt/0003-Fix-configure.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/win32/configure.js b/win32/configure.js -index 0737b06..11815e4 100644 ---- a/win32/configure.js -+++ b/win32/configure.js -@@ -138,7 +138,7 @@ function usage() - file included by our makefile. */ - function discoverVersion() - { -- var fso, cf, vf, ln, s; -+ var fso, cf, vf, ln, s, m; - fso = new ActiveXObject("Scripting.FileSystemObject"); - verCvs = ""; - if (useCvsVer && fso.FileExists("..\\CVS\\Entries")) { -@@ -147,8 +147,8 @@ function discoverVersion() - ln = cf.ReadLine(); - s = new String(ln); - if (s.search(/^\/ChangeLog\//) != -1) { -- iDot = s.indexOf("."); -- iSlash = s.indexOf("/", iDot); -+ var iDot = s.indexOf("."); -+ var iSlash = s.indexOf("/", iDot); - verCvs = "CVS" + s.substring(iDot + 1, iSlash); - break; - } -@@ -178,13 +178,13 @@ function discoverVersion() - verMicroXslt = m[1]; - } else if (s.search(/^LIBEXSLT_MAJOR_VERSION=/) != -1) { - vf.WriteLine(s); -- verMajorExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMajorExslt = s.substring(s.indexOf("=") + 1, s.length); - } else if(s.search(/^LIBEXSLT_MINOR_VERSION=/) != -1) { - vf.WriteLine(s); -- verMinorExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMinorExslt = s.substring(s.indexOf("=") + 1, s.length); - } else if(s.search(/^LIBEXSLT_MICRO_VERSION=/) != -1) { - vf.WriteLine(s); -- verMicroExslt = s.substring(s.indexOf("=") + 1, s.length) -+ verMicroExslt = s.substring(s.indexOf("=") + 1, s.length); - } - } - cf.Close(); -@@ -365,8 +365,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { - buildStatic = strToBool(arg.substring(opt.length + 1, arg.length)); - else if (opt == "prefix") - buildPrefix = arg.substring(opt.length + 1, arg.length); -- else if (opt == "incdir") -- buildIncPrefix = arg.substring(opt.length + 1, arg.length); - else if (opt == "bindir") - buildBinPrefix = arg.substring(opt.length + 1, arg.length); - else if (opt == "libdir") diff --git a/external_imported/vcpkg/ports/libxslt/fix-gcrypt-deps.patch b/external_imported/vcpkg/ports/libxslt/fix-gcrypt-deps.patch new file mode 100644 index 000000000..6d91a7248 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/fix-gcrypt-deps.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dc6501..d36a049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -317,7 +317,9 @@ target_include_directories( + + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) + target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt) +- set(LIBGCRYPT_LIBS "-lgcrypt") ++ # For libexslt.pc ++ set(LIBGCRYPT_LIBS "") ++ string(APPEND EXSLT_PRIVATE_REQUIRES " libgcrypt") + endif() + + target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2) +diff --git a/FindGcrypt.cmake b/FindGcrypt.cmake +index 781113d..a78fa84 100644 +--- a/FindGcrypt.cmake ++++ b/FindGcrypt.cmake +@@ -1,3 +1,20 @@ ++cmake_policy(PUSH) ++cmake_policy(SET CMP0012 NEW) ++cmake_policy(SET CMP0057 NEW) ++find_package(PkgConfig) ++if("REQUIRED" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) ++ pkg_check_modules(libxslt_gcrypt REQUIRED IMPORTED_TARGET libgcrypt) ++else() ++ pkg_check_modules(libxslt_gcrypt IMPORTED_TARGET libgcrypt) ++endif() ++set(Gcrypt_FOUND "${libxslt_gcrypt_FOUND}") # CMake standard, needed for find_dependency ++set(GCRYPT_FOUND "${libxslt_gcrypt_FOUND}") # libxslt usage ++if(libxslt_gcrypt_FOUND AND NOT TARGET Gcrypt::Gcrypt) ++ add_library(Gcrypt::Gcrypt INTERFACE IMPORTED) ++ set_target_properties(Gcrypt::Gcrypt PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::libxslt_gcrypt) ++endif() ++cmake_policy(POP) ++if(0) + include(FindPackageHandleStandardArgs) + include(SelectLibraryConfigurations) + +@@ -38,3 +53,4 @@ if(GCRYPT_FOUND AND NOT TARGET Gcrypt::Gcrypt) + INTERFACE_INCLUDE_DIRECTORIES "${GCRYPT_INCLUDE_DIRS}" + ) + endif() ++endif() diff --git a/external_imported/vcpkg/ports/libxslt/libexslt-pkgconfig.patch b/external_imported/vcpkg/ports/libxslt/libexslt-pkgconfig.patch new file mode 100644 index 000000000..b500a8108 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/libexslt-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/libexslt.pc.in b/libexslt.pc.in +index 1d60563..50089e8 100644 +--- a/libexslt.pc.in ++++ b/libexslt.pc.in +@@ -7,7 +7,8 @@ includedir=@includedir@ + Name: libexslt + Version: @LIBEXSLT_VERSION@ + Description: EXSLT Extension library +-Requires: libxml-2.0, libxslt ++Requires: libxslt ++Requires.private: @EXSLT_PRIVATE_REQUIRES@ + Cflags: @EXSLT_INCLUDEDIR@ + Libs: @EXSLT_LIBDIR@ -lexslt + Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/external_imported/vcpkg/ports/libxslt/msvc-no-suffix.patch b/external_imported/vcpkg/ports/libxslt/msvc-no-suffix.patch new file mode 100644 index 000000000..243687fc5 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/msvc-no-suffix.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb..6dc6501 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +249,7 @@ set_target_properties( + VERSION ${PROJECT_VERSION} + ) + +-if(MSVC) ++if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles + if(BUILD_SHARED_LIBS) + set_target_properties( + LibXslt +@@ -327,7 +332,7 @@ set_target_properties( + VERSION ${LIBEXSLT_VERSION} + ) + +-if(MSVC) ++if(0) # same reason as above + if(BUILD_SHARED_LIBS) + set_target_properties( + LibExslt diff --git a/external_imported/vcpkg/ports/libxslt/only_build_one_lib_type.patch b/external_imported/vcpkg/ports/libxslt/only_build_one_lib_type.patch deleted file mode 100644 index ae1ef8a42..000000000 --- a/external_imported/vcpkg/ports/libxslt/only_build_one_lib_type.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc -index f803a747c..f43a54f51 100644 ---- a/win32/Makefile.msvc -+++ b/win32/Makefile.msvc -@@ -163,7 +163,11 @@ _VC_MANIFEST_EMBED_EXE= - _VC_MANIFEST_EMBED_DLL= - !endif - --all : libxslt libxslta libexslt libexslta utils -+!if "$(STATIC)" == "1" -+all : libxslta libexslta utils -+!else -+all : libxslt libexslt utils -+!endif - - libxslt : $(BINDIR)\$(XSLT_SO) - -@@ -196,12 +200,15 @@ install-libs : all - if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) - copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME) - copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME) -+!if "$(STATIC)" != "1" - copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX) -- copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) -- copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) -+!else -+ copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) -+ copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) -+!endif - - install : install-libs - copy $(BINDIR)\*.exe $(BINPREFIX) -@@ -313,7 +320,6 @@ $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) lib - $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta - $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A) - -- - # Creates the utils intermediate directory. - $(UTILS_INTDIR) : - if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) -@@ -336,7 +342,11 @@ APPLIBS = $(LIBS) libxml2.lib - !endif - - # Builds xsltproc and friends. Uses the implicit rule for commands. --$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libxslta libexslt libexslta -+!if "$(STATIC)" == "1" -+$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslta libexslta -+!else -+$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libexslt -+!endif - - # plugins only work with non-static builds currently. - !if "$(STATIC)" == "0" diff --git a/external_imported/vcpkg/ports/libxslt/portfile.cmake b/external_imported/vcpkg/ports/libxslt/portfile.cmake index 05df04a31..275644836 100644 --- a/external_imported/vcpkg/ports/libxslt/portfile.cmake +++ b/external_imported/vcpkg/ports/libxslt/portfile.cmake @@ -1,185 +1,76 @@ -vcpkg_download_distfile( - PATCH_e2584eed1c84c18f16e42188c30d2c3d8e3e8853 - URLS "https://github.com/GNOME/libxslt/commit/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch" - FILENAME e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch - SHA512 d08a06616d732993f2131826ca06fafc2e9f561cb1edb17eaf2adaf78e276bb03cba92a773143eb939da04781f5b5e0a09b351d8e4622a941de3cb3d11da731c -) - -# Get this value from configure.ac:21 -set(LIBEXSLT_VERSION 0.8.20) -set(VERSION 1.1.34) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt - REF v${VERSION} - SHA512 fc57affb236e5f7602ee53c8090a854c6b950d1e6526ae3488bca41d8d421ec70433d88eb227c71c2a61213bc364517bdad907125e36486da1754fe9e460601f + REF v1.1.37 + SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25 HEAD_REF master PATCHES - "${PATCH_e2584eed1c84c18f16e42188c30d2c3d8e3e8853}" - 0001-Fix-makefile.patch - 0002-Fix-lzma.patch - 0003-Fix-configure.patch - only_build_one_lib_type.patch + python3.patch + msvc-no-suffix.patch + libexslt-pkgconfig.patch + fix-gcrypt-deps.patch + skip-install-docs.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - # Create some directories ourselves, because the makefile doesn't - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - set(CONFIGURE_COMMAND_TEMPLATE - cruntime=@CRUNTIME@ - static=@BUILDSTATIC@ - debug=@DEBUGMODE@ - prefix=@INSTALL_DIR@ - include=@INCLUDE_DIR@ - lib=@LIB_DIR@ - bindir=$(PREFIX)\\bin - sodir=$(PREFIX)\\bin - zlib=yes - lzma=yes - ) - - # Common - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILDSTATIC yes) - else() - set(BUILDSTATIC no) - endif() - - # Release params - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CRUNTIME /MD) - else() - set(CRUNTIME /MT) - endif() - set(DEBUGMODE no) - set(LIB_DIR "${CURRENT_INSTALLED_DIR}/lib") - set(INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") - set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}") - file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) - file(TO_NATIVE_PATH "${INCLUDE_DIR}" INCLUDE_DIR) - file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) - string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_REL) - - # Debug params - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(CRUNTIME /MDd) - else() - set(CRUNTIME /MTd) - endif() - set(DEBUGMODE yes) - set(LIB_DIR "${CURRENT_INSTALLED_DIR}/debug/lib") - set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug") - file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) - file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) - string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_DBG) - - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH win32 - PROJECT_NAME Makefile.msvc - PRERUN_SHELL_DEBUG cscript configure.js ${CONFIGURE_COMMAND_DBG} - PRERUN_SHELL_RELEASE cscript configure.js ${CONFIGURE_COMMAND_REL} - OPTIONS rebuild - ) - - vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) - - # The makefile builds both static and dynamic libraries, so remove the ones we don't want - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - # Rename the libs to match the dynamic lib names - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - endif() - endif() - - set(prefix "") - set(exec_prefix "") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(XSLT_INCLUDEDIR "-I\${includedir}") - set(XSLT_LIBDIR "-L\${libdir}") - set(XSLT_LIBS "-lxslt") - set(XSLT_PRIVATE_LIBS "") - set(EXSLT_INCLUDEDIR "-I\${includedir}") - set(EXSLT_LIBDIR "-L\${libdir}") - set(EXSLT_LIBS "-lexslt") - set(EXSLT_PRIVATE_LIBS "") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") - configure_file("${SOURCE_PATH}/libxslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" "\nRequires: " "\nRequires: liblzma ") - configure_file("${SOURCE_PATH}/libexslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" @ONLY) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" "\nRequires: " "\nRequires: libxslt ") - if(NOT VCPKG_BUILD_TYPE) - file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - endif() -else() - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - OPTIONS - --without-python - --without-plugins - --with-crypto - OPTIONS_DEBUG - --with-mem-debug - --with-debug - --with-debugger +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "python" LIBXSLT_WITH_PYTHON + "crypto" LIBXSLT_WITH_CRYPTO +) +if("python" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}") + list(APPEND FEATURE_OPTIONS_RELEASE "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/site-packages") + list(APPEND FEATURE_OPTIONS_DEBUG "-DLIBXSLT_PYTHON_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/site-packages") +endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBXSLT_WITH_TESTS:BOOL=OFF + -DLIBXSLT_WITH_THREADS:BOOL=ON + OPTIONS_RELEASE + ${FEATURE_OPTIONS_RELEASE} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=OFF + -DLIBXSLT_WITH_DEBUGGER:BOOL=OFF + OPTIONS_DEBUG + ${FEATURE_OPTIONS_DEBUG} + -DLIBXSLT_WITH_XSLT_DEBUG:BOOL=ON + -DLIBXSLT_WITH_MEM_DEBUG:BOOL=ON + -DLIBXSLT_WITH_DEBUGGER:BOOL=ON ) - - vcpkg_install_make() - - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libxslt-plugins" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt-plugins") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/aclocal") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/doc") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man1") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man3") - - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") +vcpkg_cmake_install() +file(GLOB config_path RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/libxslt-*") +vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../.."; pwd -P)]]) +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../../../debug"; pwd -P)]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[${prefix}/include]] [[${prefix}/../include]]) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") +vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# -# Cleanup -# - -# You have to define LIB(E)XSLT_STATIC or not, depending on how you link -file(READ "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" XSLTEXPORTS_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "!defined(LIBXSLT_STATIC)" "0" XSLTEXPORTS_H "${XSLTEXPORTS_H}") -else() - string(REPLACE "!defined(LIBXSLT_STATIC)" "1" XSLTEXPORTS_H "${XSLTEXPORTS_H}") -endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "${XSLTEXPORTS_H}") - -file(READ "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" EXSLTEXPORTS_H) +set(not_static 1) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "!defined(LIBEXSLT_STATIC)" "0" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") -else() - string(REPLACE "!defined(LIBEXSLT_STATIC)" "1" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") + set(not_static 0) endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "${EXSLTEXPORTS_H}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "!defined(LIBXSLT_STATIC)" "${not_static}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "!defined(LIBEXSLT_STATIC)" "${not_static}") -# Remove tools and debug include directories 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/libxslt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/libxslt/python3.patch b/external_imported/vcpkg/ports/libxslt/python3.patch new file mode 100644 index 000000000..fc86d1fc5 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/python3.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb..6dc6501 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,6 +35,11 @@ if(LIBXSLT_WITH_PYTHON) + check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL) + if(HAVE_UNISTD_H AND HAVE_F_GETFL) + find_package(Python COMPONENTS Interpreter Development REQUIRED) ++ elseif(1) ++ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) ++ add_library(Python::Python ALIAS Python3::Python) ++ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) ++ set(Python_SITEARCH ${Python3_SITEARCH}) + else() + find_package(Python2 COMPONENTS Interpreter Development REQUIRED) + add_library(Python::Python ALIAS Python2::Python) diff --git a/external_imported/vcpkg/ports/libxslt/skip-install-docs.patch b/external_imported/vcpkg/ports/libxslt/skip-install-docs.patch new file mode 100644 index 000000000..a5d59f325 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/skip-install-docs.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dc6501..d36a049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -432,10 +434,12 @@ if(LIBXSLT_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxslt.py DESTINATION ${LIBXSLT_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + ++if(VCPKG_INSTALL_DOCS) + install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) + install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) ++endif() + + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) + install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/external_imported/vcpkg/ports/libxslt/usage b/external_imported/vcpkg/ports/libxslt/usage new file mode 100644 index 000000000..91daf3461 --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/usage @@ -0,0 +1,12 @@ +The package libxslt is compatible with built-in CMake targets: + + # xslt library + find_package(LibXslt REQUIRED) + target_link_libraries(main PRIVATE LibXslt::LibXslt) + + # exslt library + find_package(LibXslt REQUIRED) + target_link_libraries(main PRIVATE LibXslt::LibExslt) + +In order to use modules, you must set environment variable LIBXSLT_PLUGINS_PATH +at runtime. diff --git a/external_imported/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..b7e5ecdfa --- /dev/null +++ b/external_imported/vcpkg/ports/libxslt/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,5 @@ +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS} CONFIG) diff --git a/external_imported/vcpkg/ports/libxslt/vcpkg.json b/external_imported/vcpkg/ports/libxslt/vcpkg.json index 03e3bc74b..3526b489d 100644 --- a/external_imported/vcpkg/ports/libxslt/vcpkg.json +++ b/external_imported/vcpkg/ports/libxslt/vcpkg.json @@ -1,13 +1,42 @@ { "name": "libxslt", - "version": "1.1.34", - "port-version": 4, + "version": "1.1.37", "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, "supports": "!uwp", "dependencies": [ - "liblzma", - "libxml2" - ] + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "default-features" + ], + "features": { + "crypto": { + "description": "Build with crypto support", + "supports": "!windows", + "dependencies": [ + "libgcrypt" + ] + }, + "default-features": { + "description": "default features for the current platform" + }, + "plugins": { + "description": "(deprecated)", + "supports": "!static" + }, + "python": { + "description": "Builds with python support", + "supports": "!windows" + } + } } diff --git a/external_imported/vcpkg/ports/libzip/portfile.cmake b/external_imported/vcpkg/ports/libzip/portfile.cmake index 9670853e7..871948315 100644 --- a/external_imported/vcpkg/ports/libzip/portfile.cmake +++ b/external_imported/vcpkg/ports/libzip/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip - REF v1.8.0 - SHA512 f7a78ff6d964a485b8fe3dfb7a61afae69984e67367e6de78c3cb10f15a0904800a1aeca9d33b63bc24ca926fff98638914343a35e7c3a4c3ec8b7594fc25fc1 + REF 5532f9baa0c44cc5435ad135686a4ea009075b9a #v1.9.2 + SHA512 1105bc48c8a554a7fce84028197427b02ff53508592889b37e81cc419eb208d91112b98df2bf2d6f5629887e4418230ee36e3bf03c9ae39cdc39cfa90e7e3e7f HEAD_REF master PATCHES fix-dependency.patch diff --git a/external_imported/vcpkg/ports/libzip/vcpkg.json b/external_imported/vcpkg/ports/libzip/vcpkg.json index 4468266c7..ffbf0bb12 100644 --- a/external_imported/vcpkg/ports/libzip/vcpkg.json +++ b/external_imported/vcpkg/ports/libzip/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libzip", - "version-semver": "1.8.0", + "version": "1.9.2", "description": "A library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/libzippp/portfile.cmake b/external_imported/vcpkg/ports/libzippp/portfile.cmake index 7bf26dd6b..9eaac5827 100644 --- a/external_imported/vcpkg/ports/libzippp/portfile.cmake +++ b/external_imported/vcpkg/ports/libzippp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 0e907d7ef8de46822602cb7633a5bc6fc0cc36de #v5.0-1.8.0 with CXX std version c++11 - SHA512 f91724b0225bddcaf705e7e1493ad415b534096cfe3636d50995245982984e7420148206f4e24d72e596d75eac570d7b512c5aa836eaf4a8951e27737bcee9eb + REF 4248d7bf200e00b637cbd394c2b2369891de4e30 #v5.1-1.8.0 with CXX std version c++11 + SHA512 171010da61ab4893648ceef80009925e7b79294008de220fe132c42843cb939e454812c0e70de29dfb0318e6bf11c7924a31da52f7703c523ab95c68ba61051a HEAD_REF master PATCHES fix-find-lzma.patch ) @@ -12,9 +12,8 @@ vcpkg_check_features( FEATURES encryption LIBZIPPP_ENABLE_ENCRYPTION) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBZIPPP_BUILD_TESTS=OFF @@ -22,16 +21,16 @@ vcpkg_configure_cmake( -DLIBZIPPP_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/libzippp") + vcpkg_cmake_config_fixup(CONFIG_PATH "cmake/libzippp") else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "share/libzippp") + vcpkg_cmake_config_fixup(CONFIG_PATH "share/libzippp") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/libzippp/vcpkg.json b/external_imported/vcpkg/ports/libzippp/vcpkg.json index e17b123b2..096b27bac 100644 --- a/external_imported/vcpkg/ports/libzippp/vcpkg.json +++ b/external_imported/vcpkg/ports/libzippp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libzippp", - "version-string": "5.0-1.8.0", - "port-version": 1, + "version": "5.1-1.8.0", "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", "dependencies": [ @@ -12,6 +11,14 @@ "bzip2" ] }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/external_imported/vcpkg/ports/linmath/portfile.cmake b/external_imported/vcpkg/ports/linmath/portfile.cmake new file mode 100644 index 000000000..40550a324 --- /dev/null +++ b/external_imported/vcpkg/ports/linmath/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO datenwolf/linmath.h + REF 3eef82841046507e16a0f6194a61cee2eadd34b3 + SHA512 cd8bc9c29b984cbb2fb1a1e743566e8f099d243c294658e84980cdbd83c881122f1abee68c50139ee9fddaa96f22f52eeae8e26dc86caa114cd11ebe5644a4db + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/linmath.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/linmath.h") + +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/external_imported/vcpkg/ports/linmath/vcpkg.json b/external_imported/vcpkg/ports/linmath/vcpkg.json new file mode 100644 index 000000000..30386c573 --- /dev/null +++ b/external_imported/vcpkg/ports/linmath/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "linmath", + "version-date": "2022-07-30", + "description": "linmath.h -- A small library for linear math as required for computer graphics", + "homepage": "https://github.com/datenwolf/linmath.h", + "license": "WTFPL" +} diff --git a/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch b/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch index 66863963d..f63894e27 100644 --- a/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch +++ b/external_imported/vcpkg/ports/live555/fix-RTSPClient.patch @@ -1,10 +1,10 @@ diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp -index 02c46c7..6127698 100644 +index 130baa9..8e1ea10 100644 --- a/liveMedia/RTSPClient.cpp +++ b/liveMedia/RTSPClient.cpp -@@ -1939,7 +1939,7 @@ int RTSPClient::write(const u_int8_t* data, unsigned count) { - if (fTLS.isNeeded) { - return fTLS.write(data, count); +@@ -2022,7 +2022,7 @@ int RTSPClient::write(const char* data, unsigned count) { + if (fOutputTLS->isNeeded) { + return fOutputTLS->write(data, count); } else { - return send(fOutputSocketNum, data, count, 0); + return send(fOutputSocketNum, (const char *)data, count, 0); diff --git a/external_imported/vcpkg/ports/live555/portfile.cmake b/external_imported/vcpkg/ports/live555/portfile.cmake index 2897dd950..107d8b331 100644 --- a/external_imported/vcpkg/ports/live555/portfile.cmake +++ b/external_imported/vcpkg/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.2021.12.18.tar.gz" - FILENAME "live.2021.12.18.tar.gz" - SHA512 072ae92a1a63687e33c659627fbf562e6f2cdf73cf1c3199959aa3a713636ccd4113d56270c4793c86b42338000f180e16a7b2cf3d893402226a04360f8b2e97 + URLS "http://www.live555.com/liveMedia/public/live.2022.07.14.tar.gz" + FILENAME "live.2022.07.14.tar.gz" + SHA512 382544d9d9fe200699669a1f3301efb4ccec0193499c95b532ea923c380b1ec6fa721a4118d36a447ba9df08575f185498f244293c66bbe97cff0482eab033c7 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/live555/vcpkg.json b/external_imported/vcpkg/ports/live555/vcpkg.json index 96a927644..4bc17cc43 100644 --- a/external_imported/vcpkg/ports/live555/vcpkg.json +++ b/external_imported/vcpkg/ports/live555/vcpkg.json @@ -1,8 +1,9 @@ { "name": "live555", - "version-date": "2021-12-18", + "version-date": "2022-07-14", "description": "A complete RTSP server application", - "homepage": "https://www.live555.com/liveMedia", + "homepage": "http://www.live555.com/liveMedia", + "license": "GPL-3.0-or-later", "dependencies": [ "openssl", { diff --git a/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch b/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch deleted file mode 100644 index dbf4c53a9..000000000 --- a/external_imported/vcpkg/ports/llfio/issue-83-fix-backport.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/include/llfio/v2.0/map_handle.hpp b/include/llfio/v2.0/map_handle.hpp -index 55cefa8f..3962be16 100644 ---- a/include/llfio/v2.0/map_handle.hpp -+++ b/include/llfio/v2.0/map_handle.hpp -@@ -294,8 +294,8 @@ support this operation). You may find the `is_nvram()` observer of particular us - */ - inline io_handle::const_buffer_type nvram_barrier(io_handle::const_buffer_type req, bool evict = false) noexcept - { -- auto *tp = (io_handle::const_buffer_type::pointer)(((uintptr_t) req.data()) & ~63); -- io_handle::const_buffer_type ret{tp, (size_t)(req.data() + 63 + req.size() - tp) & ~63}; -+ auto *tp = (io_handle::const_buffer_type::pointer) (((uintptr_t) req.data()) & ~63); -+ io_handle::const_buffer_type ret{tp, (size_t) (req.data() + 63 + req.size() - tp) & ~63}; - if(memory_flush_none == mem_flush_stores(ret.data(), ret.size(), evict ? memory_flush_evict : memory_flush_retain)) - { - ret = {tp, 0}; -@@ -954,7 +954,8 @@ namespace detail - { - try - { -- auto make_shared = [](map_handle h) { -+ auto make_shared = [](map_handle h) -> io_handle::registered_buffer_type -+ { - struct registered_buffer_type_indirect : io_multiplexer::_registered_buffer_type - { - map_handle h; -@@ -964,8 +965,7 @@ namespace detail - { - } - }; -- auto ptr = std::make_shared(std::move(h)); -- return ptr; -+ return io_handle::registered_buffer_type(std::make_shared(std::move(h))); - }; - const auto &page_sizes = utils::page_sizes(true); - size_t idx = 0; diff --git a/external_imported/vcpkg/ports/llfio/portfile.cmake b/external_imported/vcpkg/ports/llfio/portfile.cmake index f896ba239..3a64f6976 100644 --- a/external_imported/vcpkg/ports/llfio/portfile.cmake +++ b/external_imported/vcpkg/ports/llfio/portfile.cmake @@ -1,4 +1,4 @@ -if (NOT "cxx20" IN_LIST FEATURES) +if ("polyfill-cxx20" IN_LIST FEATURES) message(WARNING [=[ LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's, Outcome's and LLFIO's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. ]=]) @@ -8,13 +8,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa - SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 + REF 6c8e3e10a2919b4da754d0f3db54b3c616e1dd56 + SHA512 9265d722a6d9e4a9a0605fc071c5053bd71188f6d5500cfa4e64ef9ee33be364d3a1289d011863b64a4f3bdfc3a54fa9bfc6ee69ff1a93995584605c58e79f62 HEAD_REF develop PATCHES - # https://github.com/ned14/llfio/issues/83 - # To be removed on next update - issue-83-fix-backport.patch ) vcpkg_from_github( @@ -59,19 +56,21 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib ${LLFIO_FEATURE_OPTIONS} + -DLLFIO_FORCE_OPENSSL_OFF=ON -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCXX_CONCEPTS_FLAGS= + -DCXX_COROUTINES_FLAGS= ${extra_config} ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_cmake_build(TARGET install.dl) -else(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_cmake_build(TARGET install.sl) endif() @@ -88,4 +87,4 @@ if("status-code" IN_LIST FEATURES) else() file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") endif() -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/external_imported/vcpkg/ports/llfio/vcpkg.json b/external_imported/vcpkg/ports/llfio/vcpkg.json index d35443deb..d4e457786 100644 --- a/external_imported/vcpkg/ports/llfio/vcpkg.json +++ b/external_imported/vcpkg/ports/llfio/vcpkg.json @@ -1,8 +1,13 @@ { "name": "llfio", - "version-string": "2.0-20220112", + "version-date": "2022-09-18", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", + "license": "Apache-2.0 OR BSL-1.0", "supports": "!uwp", "dependencies": [ "outcome", @@ -16,33 +21,47 @@ } ], "features": { - "cxx17": { - "description": "Do not polyfill C++17 entities", + "polyfill-cxx17": { + "description": "Polyfill C++17 entities", "dependencies": [ + { + "name": "llfio", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + }, { "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx17" + "polyfill-cxx17" + ] + }, + { + "name": "outcome", + "default-features": false, + "features": [ + "polyfill-cxx17" ] } ] }, - "cxx20": { - "description": "Do not polyfill C++20 entities", + "polyfill-cxx20": { + "description": "Polyfill C++20 entities", "dependencies": [ { - "name": "llfio", + "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx17" + "polyfill-cxx20" ] }, { - "name": "ned14-internal-quickcpplib", + "name": "outcome", "default-features": false, "features": [ - "cxx20" + "polyfill-cxx20" ] } ] diff --git a/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch b/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch index 3582bcbfd..c5a2885f4 100644 --- a/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch +++ b/external_imported/vcpkg/ports/llvm/0002-fix-install-paths.patch @@ -1,18 +1,20 @@ - clang/cmake/modules/CMakeLists.txt | 4 ++-- - 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 ++-- - polly/cmake/CMakeLists.txt | 4 ++-- - pstl/CMakeLists.txt | 4 ++-- - 8 files changed, 14 insertions(+), 14 deletions(-) + 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 561665d58cad..3c73878a4483 100644 +index c6f6ce9fe5d6..fc886b23a1a8 100644 --- a/clang/cmake/modules/CMakeLists.txt +++ b/clang/cmake/modules/CMakeLists.txt -@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) +@@ -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. @@ -26,11 +28,24 @@ index 561665d58cad..3c73878a4483 100644 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 e46498a6bc35..2e922f8ca89d 100644 +index 170568c80dde..1bf6d6a829e2 100644 --- a/flang/cmake/modules/CMakeLists.txt +++ b/flang/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -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. @@ -45,10 +60,10 @@ index e46498a6bc35..2e922f8ca89d 100644 get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS) diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index 62d03fa901dd..09b0f54ee8c3 100644 +index 760c9d5f8d87..acd8a65808f5 100644 --- a/lld/cmake/modules/CMakeLists.txt +++ b/lld/cmake/modules/CMakeLists.txt -@@ -1,11 +1,11 @@ +@@ -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. @@ -63,10 +78,10 @@ index 62d03fa901dd..09b0f54ee8c3 100644 get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS) diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 29e40f45fef8..e9094e9b8eb2 100644 +index 37bc98f9e021..7cbfa2a9a577 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins) +@@ -1049,7 +1049,7 @@ function(process_llvm_pass_plugins) ## Part 1: Extension header to be included whenever we need extension # processing. @@ -76,11 +91,12 @@ index 29e40f45fef8..e9094e9b8eb2 100644 file(WRITE "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 51b6a4fdc284..a818de2e116c 100644 +index cea0c1df0a14..639c5422b04a 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -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) @@ -88,10 +104,10 @@ index 51b6a4fdc284..a818de2e116c 100644 # 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 65efc4a14987..7c3213ab0c2b 100644 +index d6703993bd74..e2f6cd3ea8cb 100644 --- a/mlir/cmake/modules/CMakeLists.txt +++ b/mlir/cmake/modules/CMakeLists.txt -@@ -3,11 +3,11 @@ include(LLVMDistributionSupport) +@@ -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. @@ -105,34 +121,41 @@ index 65efc4a14987..7c3213ab0c2b 100644 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 7cc129ba2e90..9776391cd535 100644 +index 7a0190b69df6..cdd3b4f126bb 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Keep this in sync with llvm/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) ++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/pstl/CMakeLists.txt b/pstl/CMakeLists.txt -index 8bea8843589b..3658c0a4414a 100644 ---- a/pstl/CMakeLists.txt -+++ b/pstl/CMakeLists.txt -@@ -81,10 +81,10 @@ install(TARGETS ParallelSTL - install(EXPORT ParallelSTLTargets - FILE ParallelSTLTargets.cmake - NAMESPACE pstl:: -- DESTINATION lib/cmake/ParallelSTL) -+ DESTINATION share/ParallelSTL) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" -- DESTINATION lib/cmake/ParallelSTL) -+ DESTINATION share/ParallelSTL) - install(DIRECTORY include/ - DESTINATION include - PATTERN "*.in" EXCLUDE) diff --git a/external_imported/vcpkg/ports/llvm/0003-fix-openmp-debug.patch b/external_imported/vcpkg/ports/llvm/0003-fix-openmp-debug.patch deleted file mode 100644 index 3eff4fa53..000000000 --- a/external_imported/vcpkg/ports/llvm/0003-fix-openmp-debug.patch +++ /dev/null @@ -1,25 +0,0 @@ - openmp/runtime/src/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index bdb867e352f7..16a13fa959ea 100644 ---- a/openmp/runtime/src/CMakeLists.txt -+++ b/openmp/runtime/src/CMakeLists.txt -@@ -159,7 +159,7 @@ else() - endif() - - set_target_properties(omp PROPERTIES -- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" -+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" DEBUG_POSTFIX "" - LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" - LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} - ) -@@ -236,7 +236,7 @@ if(WIN32) - # Create new import library that is just the previously created one + kmp_import.cpp - add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp) - set_target_properties(ompimp PROPERTIES -- PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" -+ PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" DEBUG_POSTFIX "" - LINKER_LANGUAGE C - ) - add_dependencies(ompimp omp) # ensure generated import library is created first diff --git a/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch b/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch index 06fc8fc24..1b1142ec9 100644 --- a/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch +++ b/external_imported/vcpkg/ports/llvm/0005-fix-tools-path.patch @@ -2,7 +2,7 @@ 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 1a2f04552d13..9370c5e28206 100644 +index 8ed88f33ead4..3f2d1b98adcc 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) { diff --git a/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch b/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch index 6a585cd42..c33dd9963 100644 --- a/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch +++ b/external_imported/vcpkg/ports/llvm/0007-fix-compiler-rt-install-path.patch @@ -4,10 +4,10 @@ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 8131f6005dc2..9afef2e5a4e7 100644 +index 078988980c52..795f495b32d6 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt -@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -17,10 +17,10 @@ index 8131f6005dc2..9afef2e5a4e7 100644 install( FILES ${files} ${generated_files} diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index 61b1c60bf590..c20a5a326f15 100644 +index ca7e17927ee1..87d4282b36ad 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt -@@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) +@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} @@ -30,10 +30,10 @@ index 61b1c60bf590..c20a5a326f15 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 c11342e68813..61bb52135c43 100644 +index d7b0124f3546..55e515cb1c7a 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE) +@@ -44,7 +44,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/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch b/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch index bfc5c5fc2..294de6fda 100644 --- a/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch +++ b/external_imported/vcpkg/ports/llvm/0009-fix-tools-install-path.patch @@ -1,184 +1,233 @@ - clang-tools-extra/modularize/CMakeLists.txt | 2 +- - clang/cmake/modules/AddClang.cmake | 2 +- - clang/tools/c-index-test/CMakeLists.txt | 2 +- - clang/tools/clang-format/CMakeLists.txt | 2 +- - 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 | 4 ++-- - 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 +- - 13 files changed, 14 insertions(+), 14 deletions(-) + clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +- + clang-tools-extra/modularize/CMakeLists.txt | 2 +- + clang/cmake/modules/AddClang.cmake | 2 +- + clang/tools/c-index-test/CMakeLists.txt | 2 +- + clang/tools/clang-format/CMakeLists.txt | 2 +- + clang/tools/clang-linker-wrapper/CMakeLists.txt | 2 +- + clang/tools/clang-nvlink-wrapper/CMakeLists.txt | 2 +- + 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(-) +diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +index 3ce552872015..e09b917ae5f8 100644 +--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt ++++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +@@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" + COMPONENT clang-tidy) + install(PROGRAMS run-clang-tidy.py +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT clang-tidy + RENAME run-clang-tidy) diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt -index 4caae81c49b6..8c459c51cc34 100644 +index fb17e353c39f..4b409e47446a 100644 --- a/clang-tools-extra/modularize/CMakeLists.txt +++ b/clang-tools-extra/modularize/CMakeLists.txt @@ -23,5 +23,5 @@ clang_target_link_libraries(modularize ) install(TARGETS modularize -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 5752f4277444..00b7d21b8fef 100644 +index 9bbbfc032b7d..bd238ff249cd 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -159,7 +159,7 @@ macro(add_clang_tool name) +@@ -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 bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..ce6d7799475b 100644 +index 0ae1b4e55244..e8a34e136194 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH "@executable_path/../../lib") else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION tools/llvm) +- set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") endif() install(TARGETS c-index-test diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt -index 35ecdb11253c..d1b800dfdadc 100644 +index bbdef93b576b..8744e414da0a 100644 --- a/clang/tools/clang-format/CMakeLists.txt +++ b/clang/tools/clang-format/CMakeLists.txt @@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py - DESTINATION share/clang + DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT clang-format) install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ 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 +--- 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 + ${CLANG_LINKER_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-linker-wrapper RUNTIME DESTINATION bin) ++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 +--- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt ++++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt +@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper + ${CLANG_NVLINK_WRAPPER_LIB_DEPS} + ) + +-install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") +diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt +index 061dc7ef4dd9..91499600693b 100644 +--- a/clang/tools/scan-build-py/CMakeLists.txt ++++ b/clang/tools/scan-build-py/CMakeLists.txt +@@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/scan-build-py + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build) + install (PROGRAMS "bin/scan-build" +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + RENAME scan-build-py + COMPONENT scan-build-py) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py) +@@ -56,7 +56,7 @@ foreach(BinFile ${BinFiles}) + ${CMAKE_BINARY_DIR}/bin/ + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) + install(PROGRAMS bin/${BinFile} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" + COMPONENT scan-build-py) + 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 ec0702d76f18..9a34a09921b1 100644 +index 4a578b4c6f3e..05574a4919f6 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT scan-build) endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index eccc6b83195b..232976c0c227 100644 +index 07aec76ee66f..ca6a3380ad0c 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt @@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} -- DESTINATION bin -+ DESTINATION tools/llvm +- DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT scan-view) endforeach() diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt -index 62f2de0cb15c..38dc821c76de 100644 +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 bin -+ DESTINATION tools/llvm +- 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 5da58a59ed12..c019d7fc50a9 100644 +index 369e303e148a..3c3697c07406 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -108,7 +108,7 @@ macro(add_flang_tool name) +@@ -109,7 +109,7 @@ macro(add_flang_tool name) get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index 239859b5e5b9..12d00f904f8a 100644 +index aa77676c6229..dd15b0b7727b 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -60,7 +60,7 @@ endforeach() - - add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) - --install(TARGETS f18 DESTINATION bin) -+install(TARGETS f18 DESTINATION tools/llvm) - - set(FLANG_DEFAULT_DRIVER "flang-new") - if (NOT FLANG_BUILD_NEW_DRIVER) -@@ -70,5 +70,5 @@ endif() - # This flang shell script will only work in a POSIX shell. - if (NOT WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.in ${CMAKE_BINARY_DIR}/bin/flang @ONLY) -- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin) -+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm) +@@ -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}") endif() diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt -index 4c7ad220d223..f4206913e76f 100644 +index b3e90746e786..b327e69aaeaa 100644 --- a/flang/tools/flang-driver/CMakeLists.txt +++ b/flang/tools/flang-driver/CMakeLists.txt -@@ -27,4 +27,4 @@ clang_target_link_libraries(flang-new - clangBasic - ) +@@ -34,4 +34,4 @@ if(FLANG_PLUGIN_SUPPORT) + export_executable_symbols_for_plugins(flang-new) + endif() --install(TARGETS flang-new DESTINATION bin) -+install(TARGETS flang-new DESTINATION tools/llvm) +-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 9883475d1aa5..48e46586f387 100644 +index dd2898ce6236..86560bddd5e4 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake -@@ -46,7 +46,7 @@ macro(add_lld_tool name) +@@ -47,7 +47,7 @@ macro(add_lld_tool name) get_target_export_arg(${name} LLD export_to_lldtargets) install(TARGETS ${name} ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION tools/llvm +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES) diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index e77b2161a873..b325b934640c 100644 +index df48cc0d6c51..1363144fd8e1 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld +@@ -20,7 +20,7 @@ target_link_libraries(lld ) install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION tools/llvm) +- 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 8be214a8509a..4a5d0fa39be3 100644 +index 3291a7c808e1..9fe9b9a7940d 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake -@@ -187,7 +187,7 @@ function(add_lldb_executable name) +@@ -189,7 +189,7 @@ function(add_lldb_executable name) endif() if(ARG_GENERATE_INSTALL) - set(install_dest bin) -+ set(install_dest tools/llvm) ++ set(install_dest "${LLVM_TOOLS_INSTALL_DIR}") if(ARG_INSTALL_PREFIX) set(install_dest ${ARG_INSTALL_PREFIX}) endif() diff --git a/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch b/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch index 93d0cb4da..3859b81fe 100644 --- a/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch +++ b/external_imported/vcpkg/ports/llvm/0010-fix-libffi.patch @@ -1,16 +1,16 @@ - llvm/cmake/config-ix.cmake | 2 +- + llvm/cmake/modules/FindFFI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake -index dd0aaadb47c7..279435b5b27d 100644 ---- a/llvm/cmake/config-ix.cmake -+++ b/llvm/cmake/config-ix.cmake -@@ -343,7 +343,7 @@ if( LLVM_ENABLE_FFI ) - message(FATAL_ERROR "libffi includes are not found.") +diff --git a/llvm/cmake/modules/FindFFI.cmake b/llvm/cmake/modules/FindFFI.cmake +index b0d859af8959..a756d0c8fdb0 100644 +--- a/llvm/cmake/modules/FindFFI.cmake ++++ b/llvm/cmake/modules/FindFFI.cmake +@@ -34,7 +34,7 @@ else() endif() + endif() -- find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR}) -+ find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR}) - if( NOT FFI_LIBRARY_PATH ) - message(FATAL_ERROR "libffi is not found.") - endif() +-find_library(FFI_LIBRARIES ffi PATHS ${FFI_LIBRARY_DIR}) ++find_library(FFI_LIBRARIES ffi libffi PATHS ${FFI_LIBRARY_DIR}) + + if(FFI_LIBRARIES) + include(CMakePushCheckState) diff --git a/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch b/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch new file mode 100644 index 000000000..1e2660fa9 --- /dev/null +++ b/external_imported/vcpkg/ports/llvm/0011-fix-install-bolt.patch @@ -0,0 +1,22 @@ + bolt/tools/driver/CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt +index d50781615663..df06604c724c 100644 +--- a/bolt/tools/driver/CMakeLists.txt ++++ b/bolt/tools/driver/CMakeLists.txt +@@ -33,14 +33,6 @@ set(BOLT_DEPENDS + ) + + add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) +-install(PROGRAMS +- ${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 +- ) + add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) + set_target_properties(bolt PROPERTIES FOLDER "BOLT") + set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") diff --git a/external_imported/vcpkg/ports/llvm/0011-fix-libxml2.patch b/external_imported/vcpkg/ports/llvm/0011-fix-libxml2.patch deleted file mode 100644 index d3f953f32..000000000 --- a/external_imported/vcpkg/ports/llvm/0011-fix-libxml2.patch +++ /dev/null @@ -1,34 +0,0 @@ - clang/tools/c-index-test/CMakeLists.txt | 6 +----- - lldb/cmake/modules/LLDBConfig.cmake | 2 +- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..40b9e995597f 100644 ---- a/clang/tools/c-index-test/CMakeLists.txt -+++ b/clang/tools/c-index-test/CMakeLists.txt -@@ -40,11 +40,7 @@ set_target_properties(c-index-test - - # If libxml2 is available, make it available for c-index-test. - if (CLANG_HAVE_LIBXML) -- if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})) -- include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}) -- else() -- include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR}) -- endif() -+ include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS}) - target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES}) - endif() - -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index b62cd7d24438..a8c78ee1bccd 100644 ---- a/lldb/cmake/modules/LLDBConfig.cmake -+++ b/lldb/cmake/modules/LLDBConfig.cmake -@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA) - endif() - - if (LLDB_ENABLE_LIBXML2) -- include_directories(${LIBXML2_INCLUDE_DIR}) -+ include_directories(${LIBXML2_INCLUDE_DIRS}) - endif() - - include_directories(BEFORE diff --git a/external_imported/vcpkg/ports/llvm/portfile.cmake b/external_imported/vcpkg/ports/llvm/portfile.cmake index 205d25039..d8162fa63 100644 --- a/external_imported/vcpkg/ports/llvm/portfile.cmake +++ b/external_imported/vcpkg/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "13.0.0") +set(LLVM_VERSION "14.0.4") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,17 +6,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 - HEAD_REF master + SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959 + HEAD_REF main PATCHES 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. - 0003-fix-openmp-debug.patch 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-libxml2.patch + 0011-fix-install-bolt.patch ) vcpkg_check_features( @@ -35,6 +34,9 @@ vcpkg_check_features( enable-bindings LLVM_ENABLE_BINDINGS ) +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + # LLVM generates CMake error due to Visual Studio version 16.4 is known to miscompile part of LLVM. # 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 @@ -76,13 +78,16 @@ elseif("disable-assertions" IN_LIST FEATURES) endif() # LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF. -# By default abi-breaking checks are enabled if assertions are enabled. +# By default in LLVM, abi-breaking checks are enabled if assertions are enabled. +# however, this breaks linking with the debug versions, since the option is +# baked into the header files; thus, we always turn off LLVM_ABI_BREAKING_CHECKS +# unless the user asks for it if("enable-abi-breaking-checks" IN_LIST FEATURES) # Force enable abi-breaking checks. list(APPEND FEATURE_OPTIONS -DLLVM_ABI_BREAKING_CHECKS=FORCE_ON ) -elseif("disable-abi-breaking-checks" IN_LIST FEATURES) +else() # Force disable abi-breaking checks. list(APPEND FEATURE_OPTIONS -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF @@ -90,6 +95,9 @@ elseif("disable-abi-breaking-checks" IN_LIST FEATURES) endif() set(LLVM_ENABLE_PROJECTS) +if("bolt" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_PROJECTS "bolt") +endif() if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang") if("disable-clang-static-analyzer" IN_LIST FEATURES) @@ -112,7 +120,7 @@ if("compiler-rt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "compiler-rt") endif() if("flang" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "flang") @@ -124,59 +132,55 @@ endif() if("libclc" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "libclc") endif() -if("libcxx" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building libcxx with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "libcxx") -endif() -if("libcxxabi" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "libcxxabi") -endif() -if("libunwind" IN_LIST FEATURES) - list(APPEND LLVM_ENABLE_PROJECTS "libunwind") -endif() if("lld" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lld") endif() if("lldb" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lldb") + list(APPEND FEATURE_OPTIONS + -DLLDB_ENABLE_CURSES=OFF + ) endif() if("mlir" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "mlir") endif() if("openmp" IN_LIST FEATURES) - # Disable OpenMP on Windows (see https://bugs.llvm.org/show_bug.cgi?id=45074). - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building OpenMP with MSVC is not supported. Disable it until issues are fixed.") - endif() list(APPEND LLVM_ENABLE_PROJECTS "openmp") # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_PATH}) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - list(APPEND FEATURE_OPTIONS - -DLIBOMP_DEFAULT_LIB_NAME=libompd - ) - endif() -endif() -if("parallel-libs" IN_LIST FEATURES) - list(APPEND LLVM_ENABLE_PROJECTS "parallel-libs") + # Skip post-build check + set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") endif() if("pstl" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "pstl") endif() +set(LLVM_ENABLE_RUNTIMES) +if("libcxx" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxx") +endif() +if("libcxxabi" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi") +endif() +if("libunwind" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") +endif() + +# this is for normal targets set(known_llvm_targets AArch64 AMDGPU @@ -192,6 +196,7 @@ set(known_llvm_targets RISCV Sparc SystemZ + VE WebAssembly X86 XCore @@ -205,58 +210,45 @@ foreach(llvm_target IN LISTS known_llvm_targets) endif() endforeach() +# this is for experimental targets +set(known_llvm_experimental_targets + SPRIV +) + +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "") +foreach(llvm_target IN LISTS known_llvm_experimental_targets) + string(TOLOWER "target-${llvm_target}" feature_name) + if(feature_name IN_LIST FEATURES) + list(APPEND LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "${llvm_target}") + endif() +endforeach() + vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_DIR}) -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") - # TODO: support more targets and OS - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - if(VCPKG_TARGET_IS_OSX) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-apple-darwin20.3.0) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-apple-darwin20.3.0) - elseif(VCPKG_TARGET_IS_WINDOWS) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-pc-win32) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-pc-win32) - - # Remove if PR #16111 is merged - list(APPEND CROSS_OPTIONS -DCMAKE_CROSSCOMPILING=ON) - list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64) - list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_NAME:STRING=Windows) - endif() - list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=AArch64) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(VCPKG_TARGET_IS_OSX) - list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=x86_64-apple-darwin20.3.0) - list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin20.3.0) - endif() - list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=X86) - endif() -endif() +set(LLVM_LINK_JOBS 1) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/llvm OPTIONS ${FEATURE_OPTIONS} - ${CROSS_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF - -DLLDB_ENABLE_CURSES=OFF + -DLLVM_INCLUDE_BENCHMARKS=OFF + -DLLVM_BUILD_BENCHMARKS=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" + "-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=${LLVM_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=1 - # Disable build LLVM-C.dll (Windows only) due to doesn't compile with CMAKE_DEBUG_POSTFIX - -DLLVM_BUILD_LLVM_C_DYLIB=OFF - # Path for binary subdirectory (defaults to 'bin') + "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" -DLLVM_TOOLS_INSTALL_DIR=tools/llvm - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -321,12 +313,19 @@ endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/tools" + ) +endif() + +if("mlir" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "set(MLIR_MAIN_SRC_DIR \"${SOURCE_PATH}/mlir\")" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}") endif() # LLVM still generates a few DLLs in the static build: +# * LLVM-C.dll # * libclang.dll # * LTO.dll # * Remarks.dll diff --git a/external_imported/vcpkg/ports/llvm/vcpkg.json b/external_imported/vcpkg/ports/llvm/vcpkg.json index 29be0e7bb..94b4f8cf4 100644 --- a/external_imported/vcpkg/ports/llvm/vcpkg.json +++ b/external_imported/vcpkg/ports/llvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llvm", - "version": "13.0.0", - "port-version": 3, + "version": "14.0.4", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", @@ -14,6 +13,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true } ], "default-features": [ @@ -24,6 +27,18 @@ "tools" ], "features": { + "bolt": { + "description": "BOLT is a post-link optimizer developed to speed up large applications.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, "clang": { "description": "Include C Language Family Front-end.", "dependencies": [ @@ -50,7 +65,6 @@ "name": "llvm", "default-features": false, "features": [ - "disable-abi-breaking-checks", "disable-assertions", "disable-clang-static-analyzer", "enable-bindings", @@ -64,6 +78,13 @@ "default-targets": { "description": "Build with platform-specific default targets.", "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-spirv" + ] + }, { "name": "llvm", "default-features": false, @@ -98,9 +119,6 @@ } ] }, - "disable-abi-breaking-checks": { - "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_OFF." - }, "disable-assertions": { "description": "Build LLVM without assertions." }, @@ -238,9 +256,6 @@ } ] }, - "parallel-libs": { - "description": "Include parallel-libs project." - }, "polly": { "description": "Include Polly (Polyhedral optimizations for LLVM) project.", "dependencies": [ @@ -280,7 +295,9 @@ "target-powerpc", "target-riscv", "target-sparc", + "target-spirv", "target-systemz", + "target-ve", "target-webassembly", "target-x86", "target-xcore" @@ -324,9 +341,15 @@ "target-sparc": { "description": "Build with Sparc backend." }, + "target-spirv": { + "description": "Build with Spriv backend." + }, "target-systemz": { "description": "Build with SystemZ backend." }, + "target-ve": { + "description": "Build with VE backend." + }, "target-webassembly": { "description": "Build with WebAssembly backend." }, diff --git a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt index b7ef12450..babddef00 100644 --- a/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt +++ b/external_imported/vcpkg/ports/lmdb/cmake/CMakeLists.txt @@ -27,7 +27,7 @@ endif() set(SRCS lmdb mdb.c lmdb.h midl.c midl.h ) add_library(lmdb ${SRCS}) -set_target_properties(lmdb PROPERTIES DEBUG_POSTFIX d) + if (WIN32) target_link_libraries(lmdb PRIVATE ntdll.lib) endif() diff --git a/external_imported/vcpkg/ports/lmdb/vcpkg.json b/external_imported/vcpkg/ports/lmdb/vcpkg.json index 1a15ee7a4..210c776d1 100644 --- a/external_imported/vcpkg/ports/lmdb/vcpkg.json +++ b/external_imported/vcpkg/ports/lmdb/vcpkg.json @@ -1,9 +1,11 @@ { "name": "lmdb", "version": "0.9.29", + "port-version": 2, "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", "license": null, + "supports": "!(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/lockpp/portfile.cmake b/external_imported/vcpkg/ports/lockpp/portfile.cmake new file mode 100644 index 000000000..1af259ee9 --- /dev/null +++ b/external_imported/vcpkg/ports/lockpp/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Soundux/lockpp + REF v1.0.2 + SHA512 6d92d3bbcbad3e2afd844ab95526e1eb49a7722d0d9d972ff85df561bbb9dc0b7a8aa5c83847f6832a806e52dde427ec0bcd11570b095d9cce7e35b3717e1f51 + 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) diff --git a/external_imported/vcpkg/ports/lockpp/vcpkg.json b/external_imported/vcpkg/ports/lockpp/vcpkg.json new file mode 100644 index 000000000..bc5b34877 --- /dev/null +++ b/external_imported/vcpkg/ports/lockpp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "lockpp", + "version": "1.0.2", + "description": "A C++17 Library that provides mutex protected objects", + "homepage": "https://github.com/Soundux/lockpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/log4cxx/expat.patch b/external_imported/vcpkg/ports/log4cxx/expat.patch index 7dfb0f009..8248ddb47 100644 --- a/external_imported/vcpkg/ports/log4cxx/expat.patch +++ b/external_imported/vcpkg/ports/log4cxx/expat.patch @@ -1,49 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5b44ef..e84e497 100644 +index a4b96376..8b966872 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -33,7 +33,7 @@ find_package(APR-Util REQUIRED) +@@ -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) - - # Request C++17, if available - # This *should* fallback to an older standard if it is not available -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b60e54f..b6138b3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,7 +3,7 @@ cmake_policy(SET CMP0079 NEW) - add_subdirectory(main) - target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} ) - target_include_directories(log4cxx INTERFACE $ PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR}) --target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) -+target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} expat::expat ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) - if(WIN32) - # The ODBC appender is always enabled in the Windows configuration - target_link_libraries(log4cxx PRIVATE odbc32.lib) -diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake -index d9cf4df..17a2457 100644 ---- a/src/cmake/FindAPR-Util.cmake -+++ b/src/cmake/FindAPR-Util.cmake -@@ -38,7 +38,6 @@ if(EXISTS ${APR_UTIL_CONFIG_EXECUTABLE}) - _apu_invoke(_apu_util_link_args --link-ld) - string(REGEX MATCH "-L([^ ]+)" _apu_util_L_flag ${_apu_util_link_args}) - find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1.a PATHS "${CMAKE_MATCH_1}") -- _apu_invoke(XMLLIB_LIBRARIES --libs) - set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC) - else() - _apu_invoke(APR_UTIL_LIBRARIES --link-ld) -diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt -index 138c489..7b62f3e 100644 ---- a/src/test/cpp/xml/CMakeLists.txt -+++ b/src/test/cpp/xml/CMakeLists.txt -@@ -4,5 +4,5 @@ add_executable(xmltests - xmllayouttestcase - ) - --target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT) -+target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} expat::expat) - set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE) + if(TARGET EXPAT::EXPAT) + set(EXPAT_LIBRARIES EXPAT::EXPAT) + elseif(TARGET expat::expat) diff --git a/external_imported/vcpkg/ports/log4cxx/pkgconfig.patch b/external_imported/vcpkg/ports/log4cxx/pkgconfig.patch deleted file mode 100644 index ee109775c..000000000 --- a/external_imported/vcpkg/ports/log4cxx/pkgconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e84e497..ff8b920 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,7 @@ if(UNIX) - ) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc" -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - if(LOG4CXX_QT_SUPPORT) - set(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -107,7 +107,7 @@ if(UNIX) - ) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx-qt.pc" -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif(LOG4CXX_QT_SUPPORT) - endif(UNIX) - diff --git a/external_imported/vcpkg/ports/log4cxx/portfile.cmake b/external_imported/vcpkg/ports/log4cxx/portfile.cmake index 13ac8ce5b..98f22ce70 100644 --- a/external_imported/vcpkg/ports/log4cxx/portfile.cmake +++ b/external_imported/vcpkg/ports/log4cxx/portfile.cmake @@ -1,22 +1,20 @@ -set(VERSION 0.12.1) +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 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 + SHA512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES expat.patch + threadutility.patch linux.patch - pkgconfig.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it -DBUILD_TESTING=OFF @@ -25,7 +23,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/log4cxx) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cxx) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/log4cxx/threadutility.patch b/external_imported/vcpkg/ports/log4cxx/threadutility.patch new file mode 100644 index 000000000..526f19ed8 --- /dev/null +++ b/external_imported/vcpkg/ports/log4cxx/threadutility.patch @@ -0,0 +1,17 @@ +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/external_imported/vcpkg/ports/log4cxx/vcpkg.json b/external_imported/vcpkg/ports/log4cxx/vcpkg.json index 55d257ad7..b1b619923 100644 --- a/external_imported/vcpkg/ports/log4cxx/vcpkg.json +++ b/external_imported/vcpkg/ports/log4cxx/vcpkg.json @@ -1,8 +1,9 @@ { "name": "log4cxx", - "version": "0.12.1", + "version": "0.13.0.1", "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", "supports": "!uwp", "dependencies": [ "apr", diff --git a/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt b/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt new file mode 100644 index 000000000..88e128fff --- /dev/null +++ b/external_imported/vcpkg/ports/lua/CMakeLists-cpp.txt @@ -0,0 +1,28 @@ +SET(SRC_LIBLUACPP ${SRC_LIBLUA}) +ADD_LIBRARY ( lua-cpp ${SRC_LIBLUACPP} ${HDR_LIBLUACPP} ) +SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUACPP} PROPERTIES LANGUAGE CXX) +TARGET_INCLUDE_DIRECTORIES(lua-cpp PRIVATE $ PUBLIC $) +IF (BUILD_SHARED_LIBS AND WIN32) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) +ENDIF () +IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + ELSE () + 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}) + ENDIF () + ENDIF () +ENDIF () + +INSTALL ( TARGETS lua-cpp + EXPORT unofficial-lua-cpp-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +INSTALL(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) diff --git a/external_imported/vcpkg/ports/lua/CMakeLists.txt b/external_imported/vcpkg/ports/lua/CMakeLists.txt index 8e93eb1ab..ac52d7e80 100644 --- a/external_imported/vcpkg/ports/lua/CMakeLists.txt +++ b/external_imported/vcpkg/ports/lua/CMakeLists.txt @@ -10,32 +10,16 @@ PROJECT ( lua ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) - -SET (HDR_LIBLUA -src/lapi.h src/lauxlib.h src/lcode.h src/lctype.h src/ldebug.h src/ldo.h src/lfunc.h -src/lgc.h src/llex.h src/llimits.h src/lmem.h src/lobject.h src/lopcodes.h src/lparser.h -src/lstate.h src/lstring.h src/ltable.h src/ltm.h src/lua.h src/luaconf.h src/lualib.h -src/lundump.h src/lvm.h src/lzio.h -) +CMAKE_MINIMUM_REQUIRED(VERSION 3.18) # Build Libraries -SET (SRC_LIBLUA -src/lapi.c src/lauxlib.c src/lbaselib.c src/lcode.c src/lcorolib.c -src/lctype.c src/ldblib.c src/ldebug.c src/ldo.c src/ldump.c src/lfunc.c src/lgc.c -src/linit.c src/liolib.c src/llex.c src/lmathlib.c src/lmem.c src/loadlib.c src/lobject.c -src/lopcodes.c src/loslib.c src/lparser.c src/lstate.c src/lstring.c src/lstrlib.c -src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/lzio.c -) - -IF (COMPILE_AS_CPP) - SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUA} src/lua.c src/luac.c PROPERTIES LANGUAGE CXX) -ELSE () - SET (CMAKE_C_STANDARD 99) -ENDIF () +FILE(GLOB HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.h") +# For luac.c +LIST(REMOVE_ITEM HDR_LIBLUA "${CMAKE_SOURCE_DIR}/src/lopnames.h") -# append headers to sources to make them show up in MSVC GUI -LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) +FILE(GLOB SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/*.c") +# Executables luac and luai +LIST(REMOVE_ITEM SRC_LIBLUA "${CMAKE_SOURCE_DIR}/src/luac.c" "${CMAKE_SOURCE_DIR}/src/lua.c") IF (WIN32) # remove warnings @@ -50,9 +34,13 @@ IF (UNIX) ENDIF () ENDIF () -#DLL -ADD_LIBRARY ( lua ${SRC_LIBLUA} ) +# C library +SET (CMAKE_C_STANDARD 99) +SET(SRC_LIBLUAC ${SRC_LIBLUA}) +ADD_LIBRARY ( lua ${SRC_LIBLUAC} ${HDR_LIBLUA} ) +TARGET_INCLUDE_DIRECTORIES(lua PRIVATE $ PUBLIC $) SET_PROPERTY (TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON) +SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUAC} PROPERTIES LANGUAGE C) IF (BUILD_SHARED_LIBS AND WIN32) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL ) @@ -72,45 +60,25 @@ ENDIF () INSTALL ( TARGETS lua EXPORT unofficial-lua-config - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib ) install(EXPORT unofficial-lua-config DESTINATION share/unofficial-lua) +# CXX library IF (COMPILE_AS_CPP) - ADD_LIBRARY ( lua-cpp ${SRC_LIBLUA} ) - SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") - IF (BUILD_SHARED_LIBS AND WIN32) - TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) - ENDIF () - IF (UNIX) - IF (APPLE) - TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) - ELSE () - 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}) - ENDIF () - ENDIF () - ENDIF () - - INSTALL ( TARGETS lua-cpp - EXPORT unofficial-lua-cpp-config - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ) - - install(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) + ADD_SUBDIRECTORY(cpp) ENDIF() IF (INSTALL_TOOLS) - ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler uses non-exported APIs, so must include sources directly. - ADD_EXECUTABLE ( luai src/lua.c ) # interpreter - TARGET_LINK_LIBRARIES ( luai lua ) + # compiler uses non-exported APIs, so must include sources directly. + ADD_EXECUTABLE ( luac ${CMAKE_SOURCE_DIR}/src/luac.c ${SRC_LIBLUA} ${CMAKE_SOURCE_DIR}/src/lopnames.h ) + ADD_EXECUTABLE ( luai ${CMAKE_SOURCE_DIR}/src/lua.c ) # interpreter + + TARGET_INCLUDE_DIRECTORIES(luac PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src) + TARGET_LINK_LIBRARIES ( luai PRIVATE lua ) SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) IF (UNIX) IF (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) @@ -127,7 +95,7 @@ IF (INSTALL_TOOLS) ENDIF () ENDIF () ENDIF () - INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua ) + INSTALL ( TARGETS luai luac RUNTIME DESTINATION tools/lua ) ENDIF () IF (NOT SKIP_INSTALL_HEADERS) diff --git a/external_imported/vcpkg/ports/lua/portfile.cmake b/external_imported/vcpkg/ports/lua/portfile.cmake index 0a034611a..e607a6f61 100644 --- a/external_imported/vcpkg/ports/lua/portfile.cmake +++ b/external_imported/vcpkg/ports/lua/portfile.cmake @@ -5,31 +5,20 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES vs2015-impl-c99.patch fix-ios-system.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -# Used in cmake wrapper -set(ENABLE_LUA_CPP 0) -if ("cpp" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature cpp does not support uwp.") - endif() - set(ENABLE_LUA_CPP 1) -endif() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists-cpp.txt" DESTINATION "${SOURCE_PATH}/cpp" RENAME "CMakeLists.txt") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - cpp COMPILE_AS_CPP + cpp COMPILE_AS_CPP # Also used in cmake wrapper tools INSTALL_TOOLS ) -if(VCPKG_TARGET_IS_IOS AND "tools" IN_LIST FEATURES) - message(FATAL_ERROR "lua[tools] is not supported for iOS platform build") -endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -62,5 +51,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -# Handle copyright file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in index 74973eca3..eec21fdb3 100644 --- a/external_imported/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/lua/vcpkg-cmake-wrapper.cmake.in @@ -7,7 +7,7 @@ endforeach() _find_package(unofficial-lua CONFIG ${REQUIRES}) -if (@ENABLE_LUA_CPP@) +if (@COMPILE_AS_CPP@) _find_package(unofficial-lua-cpp CONFIG ${REQUIRES}) endif() diff --git a/external_imported/vcpkg/ports/lua/vcpkg.json b/external_imported/vcpkg/ports/lua/vcpkg.json index 2017af765..d7c7d2d57 100644 --- a/external_imported/vcpkg/ports/lua/vcpkg.json +++ b/external_imported/vcpkg/ports/lua/vcpkg.json @@ -1,9 +1,10 @@ { "name": "lua", "version": "5.4.4", - "port-version": 1, + "port-version": 2, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", @@ -16,10 +17,12 @@ ], "features": { "cpp": { - "description": "Builds Lua for C++ linkage" + "description": "Builds Lua for C++ linkage", + "supports": "!uwp" }, "tools": { - "description": "Builds Lua compiler and interpreter" + "description": "Builds Lua compiler and interpreter", + "supports": "!ios" } } } diff --git a/external_imported/vcpkg/ports/luajit/002-fix-crt-linkage.patch b/external_imported/vcpkg/ports/luajit/002-fix-crt-linkage.patch deleted file mode 100644 index cbc273efc..000000000 --- a/external_imported/vcpkg/ports/luajit/002-fix-crt-linkage.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index 6a889e1..08c4e3c 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -64,20 +64,23 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% - buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - @if errorlevel 1 goto :BAD - -+@if "%2"=="static" set CRT_LINKAGE=/MT -+@if "%2"=="dynamic" set CRT_LINKAGE=/MD - @set LJLINK=%LJLINK% /debug --@if "%2" neq "debug" goto :NODEBUG -+@if "%3" neq "debug" goto :NODEBUG - @shift - @set LJCOMPILE=%LJCOMPILE% /Zi -+@set CRT_LINKAGE=%CRT_LINKAGE%d - :NODEBUG --@if "%2"=="amalg" goto :AMALGDLL -+@if "%3"=="amalg" goto :AMALGDLL --@if "%2"=="static" goto :STATIC -+@if "%3"=="static" goto :STATIC --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb -+%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% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb -+%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 -@@ -94,7 +94,7 @@ - if exist %LJDLLNAME%.manifest^ - %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 - --%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb -+%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 diff --git a/external_imported/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch b/external_imported/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch new file mode 100644 index 000000000..4f9f6324e --- /dev/null +++ b/external_imported/vcpkg/ports/luajit/003-do-not-set-macosx-deployment-target.patch @@ -0,0 +1,14 @@ +diff --git a/src/Makefile b/src/Makefile +index 30d64be..b753ea1 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -316,9 +316,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector + TARGET_XCFLAGS+= -fno-stack-protector + endif + ifeq (Darwin,$(TARGET_SYS)) +- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) +- $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY) +- endif + TARGET_STRIP+= -x + TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC diff --git a/external_imported/vcpkg/ports/luajit/001-fix-build-path.patch b/external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch similarity index 68% rename from external_imported/vcpkg/ports/luajit/001-fix-build-path.patch rename to external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch index bd14d7089..5d3aaeaae 100644 --- a/external_imported/vcpkg/ports/luajit/001-fix-build-path.patch +++ b/external_imported/vcpkg/ports/luajit/004-fix-build-path-and-crt-linkage.patch @@ -1,11 +1,11 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index 42e3652..6a889e1 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -14,17 +14,18 @@ - @if not defined INCLUDE goto :FAIL - +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% @@ -15,22 +15,37 @@ index 42e3652..6a889e1 100644 -@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 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 -+@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 + @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,10 +39,10 @@ if exist minilua.exe.manifest^ +@@ -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 --minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc -+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc + @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 @@ -38,7 +53,7 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /out:buildvm.exe buildvm*.obj @if errorlevel 1 goto :BAD -@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^ +@@ -60,41 +61,44 @@ if exist buildvm.exe.manifest^ buildvm -m peobj -o lj_vm.obj @if errorlevel 1 goto :BAD @@ -62,25 +77,30 @@ index 42e3652..6a889e1 100644 @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 "%2" neq "debug" goto :NODEBUG ++@if "%3" neq "debug" goto :NODEBUG @shift - @set LJCOMPILE=%LJCOMPILE% /Zi --@set LJLINK=%LJLINK% /debug + @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 "%2"=="amalg" goto :AMALGDLL -+@if "%2"=="static" goto :STATIC -+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++@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% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++%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 @@ -91,16 +111,16 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj @if errorlevel 1 goto :BAD -@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c +@@ -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% %SOURCEDIR%\luajit.c /Fdluajit.pdb ++%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 -@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^ +@@ -110,8 +114,8 @@ if exist luajit.exe.manifest^ %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe @del *.obj *.manifest minilua.exe buildvm.exe @@ -111,9 +131,9 @@ index 42e3652..6a889e1 100644 @echo. @echo === Successfully built LuaJIT for Windows/%LJARCH% === -@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^ +@@ -124,4 +128,5 @@ if exist luajit.exe.manifest^ @goto :END :FAIL - @echo You must open a "Visual Studio .NET Command Prompt" to run this script + @echo You must open a "Visual Studio Command Prompt" to run this script +exit 1 :END diff --git a/external_imported/vcpkg/ports/luajit/portfile.cmake b/external_imported/vcpkg/ports/luajit/portfile.cmake index e8a39ff25..c38e18a0d 100644 --- a/external_imported/vcpkg/ports/luajit/portfile.cmake +++ b/external_imported/vcpkg/ports/luajit/portfile.cmake @@ -1,71 +1,110 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO LuaJIT/LuaJIT - REF v2.0.5 - SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576 - HEAD_REF master - PATCHES - 001-fix-build-path.patch - 002-fix-crt-linkage.patch -) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set (LJIT_STATIC "") -else() - set (LJIT_STATIC "static") -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") - - 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 - ) - - 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) - - 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() -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") - - vcpkg_execute_required_process_repeat(d8un - 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 - ) - - 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) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) - endif() - vcpkg_copy_pdbs() -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}) - -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LuaJIT/LuaJIT + REF 633f265f67f322cbe2c5fd11d3e46d968ac220f7 #2022-08-11 + SHA512 0a1d79ab7d2de6894bcff33309e015fdba0ea67cf0425d75b9301a30006039e81b527178dbb3485e1adea177ffe062e6fcef74307f8e725678e70562d57d1a5b + HEAD_REF master + PATCHES + 003-do-not-set-macosx-deployment-target.patch + 004-fix-build-path-and-crt-linkage.patch +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set (LJIT_STATIC "") +else() + set (LJIT_STATIC "static") +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 + ) + + # 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 reuslted 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") + + 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 clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-debug + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile 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") + 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 + ) + + 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") + + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + endif() + vcpkg_copy_pdbs() + else() + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME clean-${TARGET_TRIPLET}-rel + ) + vcpkg_execute_build_process( + COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile 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") + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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}") + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/luajit/vcpkg.json b/external_imported/vcpkg/ports/luajit/vcpkg.json index 22c50d268..a1090cf0f 100644 --- a/external_imported/vcpkg/ports/luajit/vcpkg.json +++ b/external_imported/vcpkg/ports/luajit/vcpkg.json @@ -1,8 +1,9 @@ { "name": "luajit", - "version": "2.0.5", - "port-version": 5, + "version-date": "2022-08-11", + "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" } diff --git a/external_imported/vcpkg/ports/luasec/portfile.cmake b/external_imported/vcpkg/ports/luasec/portfile.cmake index 31eed4521..ee2fff5a6 100644 --- a/external_imported/vcpkg/ports/luasec/portfile.cmake +++ b/external_imported/vcpkg/ports/luasec/portfile.cmake @@ -1,5 +1,5 @@ -set(LUASEC_REVISION v1.0.1) -set(LUASEC_HASH 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93) +set(LUASEC_REVISION v1.1.0) +set(LUASEC_HASH ce08be2c62e97ebfab30e867790874030d404d195ce336b149d9501d652e9b8efe201cc2d0bcbb3be16214d7e4763b5871e45cbc22db758724baab9f7cd78568) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -15,12 +15,11 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove debug share diff --git a/external_imported/vcpkg/ports/luasec/vcpkg.json b/external_imported/vcpkg/ports/luasec/vcpkg.json index 76d24caaa..98f86d809 100644 --- a/external_imported/vcpkg/ports/luasec/vcpkg.json +++ b/external_imported/vcpkg/ports/luasec/vcpkg.json @@ -1,14 +1,22 @@ { "name": "luasec", - "version": "1.0.1", - "port-version": 1, + "version": "1.1.0", "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", + "license": "MIT", "supports": "!(windows & static)", "dependencies": [ "lua", "luasocket", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/luasocket/portfile.cmake b/external_imported/vcpkg/ports/luasocket/portfile.cmake index b48185c8d..2b08c4769 100644 --- a/external_imported/vcpkg/ports/luasocket/portfile.cmake +++ b/external_imported/vcpkg/ports/luasocket/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO diegonehab/luasocket - REF 5b18e475f38fcf28429b1cc4b17baee3b9793a62 # accessed on 2020-09-14 - SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb + REPO lunarmodules/luasocket + REF v3.0.0 + SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6 HEAD_REF master) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -23,15 +23,23 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGE 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") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") + 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") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") + 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() # Handle mime dll name file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") + 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") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") + 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() endif() # Allow empty include directory diff --git a/external_imported/vcpkg/ports/luasocket/vcpkg.json b/external_imported/vcpkg/ports/luasocket/vcpkg.json index 0fe9652f2..c8a652569 100644 --- a/external_imported/vcpkg/ports/luasocket/vcpkg.json +++ b/external_imported/vcpkg/ports/luasocket/vcpkg.json @@ -1,9 +1,10 @@ { "name": "luasocket", - "version-date": "2020-09-14", - "port-version": 2, + "version": "3.0.0", + "port-version": 1, "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://github.com/diegonehab/luasocket", + "homepage": "https://lunarmodules.github.io/luasocket/", + "license": "MIT", "supports": "windows", "dependencies": [ "lua", diff --git a/external_imported/vcpkg/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch b/external_imported/vcpkg/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch new file mode 100755 index 000000000..d6f444810 --- /dev/null +++ b/external_imported/vcpkg/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch @@ -0,0 +1,26 @@ +From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse +Date: Fri, 26 Feb 2021 15:21:20 +0100 +Subject: [PATCH 001/120] Fix potential memory corruption with negative + memmove() size + +--- + lib/lz4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lz4.c b/lib/lz4.c +index 5f524d0..c2f504e 100644 +--- a/lib/lz4.c ++++ b/lib/lz4.c +@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( + const size_t dictSize /* note : = 0 if noDict */ + ) + { +- if (src == NULL) { return -1; } ++ if ((src == NULL) || (outputSize < 0)) { return -1; } + + { const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; +-- +2.36.1 + diff --git a/external_imported/vcpkg/ports/lz4/portfile.cmake b/external_imported/vcpkg/ports/lz4/portfile.cmake index 80bcecc38..a2e3b74f9 100644 --- a/external_imported/vcpkg/ports/lz4/portfile.cmake +++ b/external_imported/vcpkg/ports/lz4/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.9.3 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c HEAD_REF dev + PATCHES + 0001-Fix-potential-memory-corruption-with-negative-memmov.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/lz4/vcpkg.json b/external_imported/vcpkg/ports/lz4/vcpkg.json index 5167b44ad..597e902dd 100644 --- a/external_imported/vcpkg/ports/lz4/vcpkg.json +++ b/external_imported/vcpkg/ports/lz4/vcpkg.json @@ -1,9 +1,10 @@ { "name": "lz4", "version": "1.9.3", - "port-version": 3, + "port-version": 4, "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", "homepage": "https://github.com/lz4/lz4", + "license": "BSD-2-Clause AND GPL-2.0-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/magic-enum/portfile.cmake b/external_imported/vcpkg/ports/magic-enum/portfile.cmake index b612ccabe..0ea6fc111 100644 --- a/external_imported/vcpkg/ports/magic-enum/portfile.cmake +++ b/external_imported/vcpkg/ports/magic-enum/portfile.cmake @@ -3,25 +3,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.3 - SHA512 7645ef56bbe262ba801c6f5ffb7baf997869de6422a239ef2000d7ff6f4f6d00c34360543c60aa91a02433311b4b996bba410e4f04f96f185a6276ad9e6bb0a8 + REF v0.8.1 + SHA512 97b14ddfa2fec4b582f4658cea96f61510b3eb1f367d770a642136ffbaf7e5d87e6a8c950f7ac6af47cc605899d0ff8e2b9c71a19a28ad1dfaa724f003339edc HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +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 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/magic_enum TARGET_PATH share/magic_enum) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # 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/external_imported/vcpkg/ports/magic-enum/vcpkg.json b/external_imported/vcpkg/ports/magic-enum/vcpkg.json index 449796595..3fc2b956d 100644 --- a/external_imported/vcpkg/ports/magic-enum/vcpkg.json +++ b/external_imported/vcpkg/ports/magic-enum/vcpkg.json @@ -1,7 +1,17 @@ { "name": "magic-enum", - "version-string": "0.7.3", - "port-version": 1, + "version": "0.8.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" + "homepage": "https://github.com/Neargye/magic_enum", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch b/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch new file mode 100644 index 000000000..4222fb247 --- /dev/null +++ b/external_imported/vcpkg/ports/magnum/004-fix-FindOpenAL.patch @@ -0,0 +1,12 @@ +diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +index 64371a4..375ca58 100644 +--- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt ++++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +@@ -24,6 +24,7 @@ + # + + find_package(Corrade REQUIRED PluginManager) ++find_package(OpenAL CONFIG REQUIRED) + + if(BUILD_PLUGINS_STATIC) + set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1) diff --git a/external_imported/vcpkg/ports/magnum/005-fix-find-sdl2.patch b/external_imported/vcpkg/ports/magnum/005-fix-find-sdl2.patch new file mode 100755 index 000000000..83173b60f --- /dev/null +++ b/external_imported/vcpkg/ports/magnum/005-fix-find-sdl2.patch @@ -0,0 +1,13 @@ +diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt +index f1b404f..19babf4 100644 +--- a/src/Magnum/Platform/CMakeLists.txt ++++ b/src/Magnum/Platform/CMakeLists.txt +@@ -292,7 +292,7 @@ endif() + + # SDL2 application + if(WITH_SDL2APPLICATION) +- find_package(SDL2) ++ find_package(SDL2 CONFIG REQUIRED) + if(NOT SDL2_FOUND) + message(FATAL_ERROR "SDL2 library, required by Sdl2Application, was not found. Set WITH_SDL2APPLICATION to OFF to skip building it.") + endif() diff --git a/external_imported/vcpkg/ports/magnum/portfile.cmake b/external_imported/vcpkg/ports/magnum/portfile.cmake index e1dcd30e8..2f1a09266 100644 --- a/external_imported/vcpkg/ports/magnum/portfile.cmake +++ b/external_imported/vcpkg/ports/magnum/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( PATCHES 002-sdl-includes.patch 003-fix-FindGLFW.patch + 004-fix-FindOpenAL.patch + 005-fix-find-sdl2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/magnum/vcpkg.json b/external_imported/vcpkg/ports/magnum/vcpkg.json index 43d3b8224..26c23155f 100644 --- a/external_imported/vcpkg/ports/magnum/vcpkg.json +++ b/external_imported/vcpkg/ports/magnum/vcpkg.json @@ -1,9 +1,10 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 9, + "port-version": 11, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", + "license": null, "dependencies": [ { "name": "corrade", diff --git a/external_imported/vcpkg/ports/mapnik/portfile.cmake b/external_imported/vcpkg/ports/mapnik/portfile.cmake index 7140f07f6..015000a41 100644 --- a/external_imported/vcpkg/ports/mapnik/portfile.cmake +++ b/external_imported/vcpkg/ports/mapnik/portfile.cmake @@ -53,6 +53,7 @@ vcpkg_cmake_configure( -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DBOOST_REGEX_HAS_ICU=ON -DMAPNIK_CMAKE_DIR=share/mapnik/cmake -DFONTS_INSTALL_DIR=share/mapnik/fonts -DMAPNIK_PKGCONF_DIR=lib/pkgconfig diff --git a/external_imported/vcpkg/ports/mapnik/vcpkg.json b/external_imported/vcpkg/ports/mapnik/vcpkg.json index c1dc491ae..40a796611 100644 --- a/external_imported/vcpkg/ports/mapnik/vcpkg.json +++ b/external_imported/vcpkg/ports/mapnik/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mapnik", "version-date": "2022-01-28", - "port-version": 1, + "port-version": 2, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "license": "LGPL-2.1-only", diff --git a/external_imported/vcpkg/ports/marble/portfile.cmake b/external_imported/vcpkg/ports/marble/portfile.cmake index 7136b47c2..b2ad99a5a 100644 --- a/external_imported/vcpkg/ports/marble/portfile.cmake +++ b/external_imported/vcpkg/ports/marble/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/marble - REF 552cb9ae1f34482d1ec56532a703e0d820856286 #v20.04.3 - SHA512 ac6106a6db53534c96d7281b1a07624c2852ed8c78cce0b91c5f865b106487f1f49aaa4c72d00ffb1f79a761d8d2eca18129ef9517bef463a1840554ed3e51fb + REF 7def3b68fd5de9b7f0734410a9f955bd1082097b #v22.04.0 + SHA512 2977a051a7f91603dea5960ddf0fed2fd5a991d554bce899ce4d8a0d3648546ff2c4c75bebcd3704d07d875b656ab7dc64c567b1bc9f6975745be327375faa90 HEAD_REF master - PATCHES "qtfix.patch" + PATCHES + qtfix.patch ) - + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -20,27 +21,40 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # Install plugins and data files -file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") -file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") -file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") -file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") +file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") +file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") +file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") +file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) -file(COPY ${PLUGINS_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins) -file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # have to keep folder structure here -file(COPY ${MKSPECS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins") +file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/plugins") +file(COPY "${CURRENT_PACKAGES_DIR}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") # have to keep folder structure here +file(COPY ${MKSPECS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/mkspecs") # remove plugin folder file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins - ${CURRENT_PACKAGES_DIR}/data ${CURRENT_PACKAGES_DIR}/debug/data - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/mkspecs ${CURRENT_PACKAGES_DIR}/debug/mkspecs - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/lib/plugins + "${CURRENT_PACKAGES_DIR}/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins" + "${CURRENT_PACKAGES_DIR}/data" "${CURRENT_PACKAGES_DIR}/debug/data" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/mkspecs" "${CURRENT_PACKAGES_DIR}/debug/mkspecs" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/lib/plugins" + "${CURRENT_PACKAGES_DIR}/debug/marble-qt.exe" ) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/astro.dll" "${CURRENT_PACKAGES_DIR}/bin/astro.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marbledeclarative.dll" "${CURRENT_PACKAGES_DIR}/bin/marbledeclarative.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marblewidget-qt5.dll" "${CURRENT_PACKAGES_DIR}/bin/marblewidget-qt5.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/marble-qt.exe" "${CURRENT_PACKAGES_DIR}/tools/marble/marble-qt.exe") + +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/astrod.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/astrod.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marbledeclaratived.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marbledeclaratived.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/marblewidget-qt5d.dll") + vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/external_imported/vcpkg/ports/marble/qtfix.patch b/external_imported/vcpkg/ports/marble/qtfix.patch index 39a420be0..8c923ff2c 100644 --- a/external_imported/vcpkg/ports/marble/qtfix.patch +++ b/external_imported/vcpkg/ports/marble/qtfix.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3b2139dc..1f9a10513 100644 +index 65b58c4..a8f024c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -171,7 +171,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr +@@ -184,7 +184,7 @@ set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werr set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") @@ -11,73 +11,12 @@ index a3b2139dc..1f9a10513 100644 if (NOT QT_PLUGINS_DIR) set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) endif() -@@ -248,7 +248,7 @@ add_definitions( - -DQT_NO_URL_CAST_FROM_STRING - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY -- -DQT_STRICT_ITERATORS -+# -DQT_STRICT_ITERATORS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050700 - ) - -diff --git a/src/apps/marble-qt/CMakeLists.txt b/src/apps/marble-qt/CMakeLists.txt -index d28e3aa5e..7bbf4a63c 100644 ---- a/src/apps/marble-qt/CMakeLists.txt -+++ b/src/apps/marble-qt/CMakeLists.txt -@@ -48,7 +48,7 @@ if(STATIC_BUILD) - endif(STATIC_BUILD) - - if(WIN32) --install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) -+ install (TARGETS marble-qt RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/marble) - else(WIN32) - if (APPLE) - # No need for this when installing to a bundle -diff --git a/src/lib/astro/CMakeLists.txt b/src/lib/astro/CMakeLists.txt -index 5e1afd60f..fc53985f4 100644 ---- a/src/lib/astro/CMakeLists.txt -+++ b/src/lib/astro/CMakeLists.txt -@@ -50,7 +50,7 @@ target_include_directories(astro - - # choose the correct target install library path - if(WIN32) -- INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ INSTALL(TARGETS astro EXPORT AstroTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - elseif(APPLE) - INSTALL(TARGETS astro LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index 7d27be94b..f1f377967 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -448,7 +448,7 @@ target_include_directories(marblewidget - - # choose the correct target install library path - if(WIN32) -- install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ install(TARGETS marblewidget EXPORT MarbleTargets RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - elseif(APPLE) - install(TARGETS marblewidget LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) - else() -diff --git a/src/lib/marble/declarative/CMakeLists.txt b/src/lib/marble/declarative/CMakeLists.txt -index dd5d519c4..482a02ad5 100644 ---- a/src/lib/marble/declarative/CMakeLists.txt -+++ b/src/lib/marble/declarative/CMakeLists.txt -@@ -53,7 +53,7 @@ if(Qt5Positioning_FOUND) - endif() - - if(WIN32) -- install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ARCHIVE DESTINATION lib) -+ install(TARGETS marbledeclarative RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - else() - install(TARGETS marbledeclarative LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt -index 85591098e..87011876e 100644 +index ec2ba1a..cc8e52e 100644 --- a/src/plugins/positionprovider/CMakeLists.txt +++ b/src/plugins/positionprovider/CMakeLists.txt @@ -12,12 +12,12 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} - COMPONENTS + OPTIONAL_COMPONENTS Positioning ) -marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) @@ -88,7 +27,7 @@ index 85591098e..87011876e 100644 -endif() +#marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) +#marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" ) -+#arble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) ++#marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) +#if(Qt5Positioning_FOUND) +# ADD_SUBDIRECTORY( qtpositioning ) +#endif() diff --git a/external_imported/vcpkg/ports/marble/vcpkg.json b/external_imported/vcpkg/ports/marble/vcpkg.json index 96ee0b95b..06c6ae814 100644 --- a/external_imported/vcpkg/ports/marble/vcpkg.json +++ b/external_imported/vcpkg/ports/marble/vcpkg.json @@ -1,9 +1,10 @@ { "name": "marble", - "version-string": "19.08.2", - "port-version": 3, + "version-string": "22.04.0", + "port-version": 1, "description": "Marble KDE library", "homepage": "https://marble.kde.org", + "license": "LGPL-2.1-or-later", "supports": "windows & x64 & !static", "dependencies": [ "qt5-base", diff --git a/external_imported/vcpkg/ports/matchit/portfile.cmake b/external_imported/vcpkg/ports/matchit/portfile.cmake new file mode 100644 index 000000000..531a7dd59 --- /dev/null +++ b/external_imported/vcpkg/ports/matchit/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BowenFu/matchit.cpp + REF v1.0.1 + SHA512 60edc6a392f5629391fa9e3ff09b7b98a0a782919a066ad2999eabb58e60f38bd50e080037b1276c5bca986f81ca0dfff2914816d46458b7b4e1c947a6134169 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/matchit") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +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) diff --git a/external_imported/vcpkg/ports/matchit/usage b/external_imported/vcpkg/ports/matchit/usage new file mode 100644 index 000000000..a7697e0af --- /dev/null +++ b/external_imported/vcpkg/ports/matchit/usage @@ -0,0 +1,4 @@ +The package matchit provides CMake targets: + + find_package(matchit CONFIG REQUIRED) + target_link_libraries(main PRIVATE matchit::matchit) diff --git a/external_imported/vcpkg/ports/matchit/vcpkg.json b/external_imported/vcpkg/ports/matchit/vcpkg.json new file mode 100644 index 000000000..3228734cb --- /dev/null +++ b/external_imported/vcpkg/ports/matchit/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "matchit", + "version": "1.0.1", + "description": "matchit is a pattern matching library for C++17 with macro-free APIs", + "homepage": "https://github.com/BowenFu/matchit.cpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/materialx/portfile.cmake b/external_imported/vcpkg/ports/materialx/portfile.cmake new file mode 100644 index 000000000..da56e07be --- /dev/null +++ b/external_imported/vcpkg/ports/materialx/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/MaterialX + REF b1ba83b312576fc58f02a6a7db40b18ddbe4f87f # 1.38.4 + SHA512 3988c42d487e391f9f0f3ab5f34eaa26c7f450079695d96954b871e078eecfe692daa9917279560ba3f10bf771685df3da6e26273d575a23a11c3d17fb897c62 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPTION_BUILD_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DMATERIALX_BUILD_SHARED_LIBS:BOOL=${OPTION_BUILD_SHARED_LIB}" + "-DMATERIALX_BUILD_JS:BOOL=NO" + "-DMATERIALX_BUILD_PYTHON:BOOL=NO" + "-DMATERIALX_BUILD_VIEWER:BOOL=NO" + "-DMATERIALX_BUILD_DOCS:BOOL=NO" + "-DMATERIALX_BUILD_GEN_GLSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_OSL:BOOL=NO" + "-DMATERIALX_BUILD_GEN_MDL:BOOL=NO" + "-DMATERIALX_BUILD_RENDER:BOOL=NO" + "-DMATERIALX_BUILD_OIIO:BOOL=NO" + "-DMATERIALX_BUILD_TESTS:BOOL=NO" + "-DMATERIALX_PYTHON_LTO:BOOL=NO" + "-DMATERIALX_INSTALL_PYTHON:BOOL=NO" + "-DMATERIALX_TEST_RENDER:BOOL=NO" + "-DMATERIALX_WARNINGS_AS_ERRORS:BOOL=NO" + MAYBE_UNUSED_VARIABLES + MATERIALX_PYTHON_LTO # Used when MATERIALX_BUILD_PYTHON=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME MaterialX CONFIG_PATH lib/cmake/MaterialX) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README.md" + "${CURRENT_PACKAGES_DIR}/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/CHANGELOG.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/THIRD-PARTY.md" + "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/materialx/vcpkg.json b/external_imported/vcpkg/ports/materialx/vcpkg.json new file mode 100644 index 000000000..60fc20236 --- /dev/null +++ b/external_imported/vcpkg/ports/materialx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "materialx", + "version": "1.38.4", + "description": "MaterialX is an open standard for the exchange of rich material and look-development content across applications and renderers.", + "homepage": "https://www.materialx.org/", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/mathgl/portfile.cmake b/external_imported/vcpkg/ports/mathgl/portfile.cmake index 65c1abe18..8361bb8ec 100644 --- a/external_imported/vcpkg/ports/mathgl/portfile.cmake +++ b/external_imported/vcpkg/ports/mathgl/portfile.cmake @@ -80,6 +80,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_INSTALL_DIR \"${CURRENT_PACKAGES_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH \"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/share/mathgl/fonts\"" "") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mathgl" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mathgl/vcpkg.json b/external_imported/vcpkg/ports/mathgl/vcpkg.json index 54661f76b..30a0c0e73 100644 --- a/external_imported/vcpkg/ports/mathgl/vcpkg.json +++ b/external_imported/vcpkg/ports/mathgl/vcpkg.json @@ -1,7 +1,9 @@ { "name": "mathgl", "version": "2.5", + "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", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/matio/portfile.cmake b/external_imported/vcpkg/ports/matio/portfile.cmake index c72bd3e4d..924b302ca 100644 --- a/external_imported/vcpkg/ports/matio/portfile.cmake +++ b/external_imported/vcpkg/ports/matio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio - REF ca56394e5672115df1981996ed12524d1d551259 # v1.5.19 - SHA512 67c239d8aabafaa935775f3b260ba0756c196b0d845ef5116365c9aa6a0b24dae70d92c4e74d5d43ae073ae0744f084f0f58ead864eb77c813d43dbbb3e4ec5e + REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23 + SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c HEAD_REF master PATCHES fix-dependencies.patch ) @@ -19,8 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DMATIO_SHARED=${BUILD_SHARED} -DMATIO_USE_CONAN=OFF diff --git a/external_imported/vcpkg/ports/matio/vcpkg.json b/external_imported/vcpkg/ports/matio/vcpkg.json index 7e4b8d05a..c325999aa 100644 --- a/external_imported/vcpkg/ports/matio/vcpkg.json +++ b/external_imported/vcpkg/ports/matio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "matio", - "version-semver": "1.5.19", - "port-version": 1, + "version-semver": "1.5.23", "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake b/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake index 8755fc8f2..155d07384 100644 --- a/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake +++ b/external_imported/vcpkg/ports/matplotplusplus/portfile.cmake @@ -31,8 +31,7 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DCPM_USE_LOCAL_PACKAGES=ON -DBUILD_EXAMPLES=OFF diff --git a/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json b/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json index 296b6f880..dce9fa30f 100644 --- a/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json +++ b/external_imported/vcpkg/ports/matplotplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matplotplusplus", "version-date": "2021-04-11", - "port-version": 5, + "port-version": 6, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", diff --git a/external_imported/vcpkg/ports/mbedtls/portfile.cmake b/external_imported/vcpkg/ports/mbedtls/portfile.cmake index 1f65fff5b..e2aff063c 100644 --- a/external_imported/vcpkg/ports/mbedtls/portfile.cmake +++ b/external_imported/vcpkg/ports/mbedtls/portfile.cmake @@ -3,8 +3,8 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 - SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + REF v2.28.1 + SHA512 b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689 HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch diff --git a/external_imported/vcpkg/ports/mbedtls/vcpkg.json b/external_imported/vcpkg/ports/mbedtls/vcpkg.json index 93c0e9b22..b0eb96bb4 100644 --- a/external_imported/vcpkg/ports/mbedtls/vcpkg.json +++ b/external_imported/vcpkg/ports/mbedtls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mbedtls", - "version": "2.28.0", + "version": "2.28.1", "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/mchehab-zbar/c99.patch b/external_imported/vcpkg/ports/mchehab-zbar/c99.patch new file mode 100644 index 000000000..8b906fcaa --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/c99.patch @@ -0,0 +1,89 @@ +diff --git a/zbar/symbol.c b/zbar/symbol.c +index 27dbc87..1059a72 100644 +--- a/zbar/symbol.c ++++ b/zbar/symbol.c +@@ -100,40 +100,29 @@ const char *zbar_get_orientation_name (zbar_orientation_t orient) + + int _zbar_get_symbol_hash (zbar_symbol_type_t sym) + { +- static const signed char hash[ZBAR_CODE128 + 1] = { +- [0 ... ZBAR_CODE128] = -1, +- +- /* [ZBAR_FOO] = 0, is empty */ +- [ZBAR_SQCODE] = 1, +- [ZBAR_CODE128] = 2, +- [ZBAR_EAN13] = 3, +- [ZBAR_UPCA] = 4, +- [ZBAR_EAN8] = 5, +- [ZBAR_UPCE] = 6, +- [ZBAR_ISBN13] = 7, +- [ZBAR_ISBN10] = 8, +- [ZBAR_CODE39] = 9, +- [ZBAR_I25] = 10, +- [ZBAR_PDF417] = 11, +- [ZBAR_QRCODE] = 12, +- [ZBAR_DATABAR] = 13, +- [ZBAR_DATABAR_EXP] = 14, +- [ZBAR_CODE93] = 15, +- [ZBAR_EAN2] = 16, +- [ZBAR_EAN5] = 17, +- [ZBAR_COMPOSITE] = 18, +- [ZBAR_CODABAR] = 19, +- +- /* Please update NUM_SYMS accordingly */ +- }; +- int h; +- +- assert (sym >= ZBAR_PARTIAL && sym <= ZBAR_CODE128); +- +- h = hash[sym]; +- assert (h >= 0 && h < NUM_SYMS); +- +- return h; ++ switch(sym) ++ { ++ default: return -1; ++ case ZBAR_SQCODE: return 1; ++ case ZBAR_CODE128: return 2; ++ case ZBAR_EAN13: return 3; ++ case ZBAR_UPCA: return 4; ++ case ZBAR_EAN8: return 5; ++ case ZBAR_UPCE: return 6; ++ case ZBAR_ISBN13: return 7; ++ case ZBAR_ISBN10: return 8; ++ case ZBAR_CODE39: return 9; ++ case ZBAR_I25: return 10; ++ case ZBAR_PDF417: return 11; ++ case ZBAR_QRCODE: return 12; ++ case ZBAR_DATABAR: return 13; ++ case ZBAR_DATABAR_EXP: return 14; ++ case ZBAR_CODE93: return 15; ++ case ZBAR_EAN2: return 16; ++ case ZBAR_EAN5: return 17; ++ case ZBAR_COMPOSITE: return 18; ++ case ZBAR_CODABAR: return 19; ++ } + } + + void _zbar_symbol_free (zbar_symbol_t *sym) +diff --git a/zbar/window/win.c b/zbar/window/win.c +index b949f65..7edcfa2 100644 +--- a/zbar/window/win.c ++++ b/zbar/window/win.c +@@ -194,7 +194,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, + win_set_rgb(hdc, rgb); + + point_t org = w->scaled_offset; +- POINT gdipts[npts + 1]; ++ POINT* gdipts = malloc((npts + 1) * sizeof(POINT)); + int i; + for(i = 0; i < npts; i++) { + point_t p = window_scale_pt(w, pts[i]); +@@ -204,6 +204,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, + gdipts[npts] = gdipts[0]; + + Polyline(hdc, gdipts, npts + 1); ++ free(gdipts); + return(0); + } + diff --git a/external_imported/vcpkg/ports/mchehab-zbar/issue219.patch b/external_imported/vcpkg/ports/mchehab-zbar/issue219.patch new file mode 100644 index 000000000..2f86a7c3a --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/issue219.patch @@ -0,0 +1,13 @@ +diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c +index 8cfa848..ffb972e 100644 +--- a/zbar/decoder/databar.c ++++ b/zbar/decoder/databar.c +@@ -695,7 +695,7 @@ lookup_sequence (databar_segment_t *seg, + seq[i++] = s; + } + dbprintf(2, "}"); +- seq[n] = -1; ++ if (n<22) {seq[n]=-1;} /* https://github.com/mchehab/zbar/issues/219 */ + return(fixed < 1); + } + diff --git a/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake b/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake new file mode 100644 index 000000000..57d5da97a --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/portfile.cmake @@ -0,0 +1,48 @@ +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/zbar/copyright) + message(FATAL_ERROR "${PORT} conflicts with zbar. Please remove zbar before installing ${PORT}.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mchehab/zbar + REF 0.23.90 + SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb + HEAD_REF master + PATCHES + c99.patch + issue219.patch + windows.patch + x64.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + NO_ADDITIONAL_PATHS + ADD_BIN_TO_PATH + ADDITIONAL_MSYS_PACKAGES findutils gettext gettext-devel liblzma tar xz + OPTIONS + --disable-video + --without-gtk + --without-imagemagick + --without-java + --without-python + --without-qt +) + +vcpkg_install_make() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +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" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/doc") + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/zbar" "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json b/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json new file mode 100644 index 000000000..8a2be0ce1 --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mchehab-zbar", + "version": "0.23.90", + "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": "windows & !uwp", + "dependencies": [ + "libiconv" + ] +} diff --git a/external_imported/vcpkg/ports/mchehab-zbar/windows.patch b/external_imported/vcpkg/ports/mchehab-zbar/windows.patch new file mode 100644 index 000000000..3e950ec14 --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/windows.patch @@ -0,0 +1,68 @@ +diff --git a/configure.ac b/configure.ac +index c8fea14..eb0a097 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION], + [Library revision]) + + AM_CPPFLAGS="-I\$(top_srcdir)/include" +-AM_CFLAGS="-Wall -Wno-parentheses" ++AM_CFLAGS="-Wall" + AM_CXXFLAGS="$AM_CFLAGS" + AC_SUBST([AM_CPPFLAGS]) + AC_SUBST([AM_CFLAGS]) +diff --git a/zbar/Makefile.am b/zbar/Makefile.am +index ca54d01..6c0cd83 100644 +--- a/zbar/Makefile.am ++++ b/zbar/Makefile.am +@@ -68,7 +68,7 @@ if WIN32 + + libzbar_la_SOURCES += processor/win.c libzbar.rc + libzbar_la_CPPFLAGS += -mthreads +-libzbar_la_LDFLAGS += -mthreads ++libzbar_la_LDFLAGS += -mthreads -Xcompiler -Wl,-DEBUG + # FIXME broken + libzbar_la_LIBADD += libzbar-rc.lo + else +diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc +index 413635b..c241f82 100644 +--- a/zbar/libzbar.rc ++++ b/zbar/libzbar.rc +@@ -17,8 +17,7 @@ VS_VERSION_INFO VERSIONINFO + VALUE "InternalName", "libzbar" + VALUE "OriginalFilename", "libzbar-" XSTR(LIB_VERSION_MAJOR) ".dll" + +- VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." \ +- XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) ++ VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) + VALUE "ProductVersion", PACKAGE_VERSION + + VALUE "FileDescription", "Bar code reader library" +diff --git a/zbar/processor.h b/zbar/processor.h +index d5e9fef..54d6584 100644 +--- a/zbar/processor.h ++++ b/zbar/processor.h +@@ -27,7 +27,9 @@ + #ifdef HAVE_INTTYPES_H + # include + #endif +-#include ++#ifndef WIN32 ++# include ++#endif + #include + #include + +diff --git a/zbar/thread.h b/zbar/thread.h +index 96d6415..252d3f2 100644 +--- a/zbar/thread.h ++++ b/zbar/thread.h +@@ -35,7 +35,7 @@ + # define HAVE_THREADS + # define ZTHREAD DWORD WINAPI + +-typedef ZTHREAD (zbar_thread_proc_t)(void*); ++typedef ZTHREAD zbar_thread_proc_t(void*); + + typedef DWORD zbar_thread_id_t; + diff --git a/external_imported/vcpkg/ports/mchehab-zbar/x64.patch b/external_imported/vcpkg/ports/mchehab-zbar/x64.patch new file mode 100644 index 000000000..c8eefac8e --- /dev/null +++ b/external_imported/vcpkg/ports/mchehab-zbar/x64.patch @@ -0,0 +1,21 @@ +diff --git a/zbar/decoder.c b/zbar/decoder.c +index 7f7336f..e9ffc45 100644 +--- a/zbar/decoder.c ++++ b/zbar/decoder.c +@@ -25,6 +25,7 @@ + #include /* malloc, calloc, free */ + #include /* snprintf */ + #include /* memset, strlen */ ++#include /* offsetof */ + + #include + +@@ -113,7 +114,7 @@ void zbar_decoder_destroy (zbar_decoder_t *dcode) + + void zbar_decoder_reset (zbar_decoder_t *dcode) + { +- memset(dcode, 0, (long)&dcode->buf_alloc - (long)dcode); ++ memset(dcode, 0, offsetof(zbar_decoder_t, buf_alloc)); + #if ENABLE_EAN == 1 + ean_reset(&dcode->ean); + #endif diff --git a/external_imported/vcpkg/ports/mdns/portfile.cmake b/external_imported/vcpkg/ports/mdns/portfile.cmake index 665b7a99a..272ef3b93 100644 --- a/external_imported/vcpkg/ports/mdns/portfile.cmake +++ b/external_imported/vcpkg/ports/mdns/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjansson/mdns - REF 1.4.1 - SHA512 f1268841b5e4ba40ba62e7e08d55ac7f83b675f76c694976097a1c17dd6c662ced953230a4556b81ff5a39a969c67e01d040f1b6c83b9dd27b2cb0adc6af05b9 + REF 1.4.2 + SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/mdns/vcpkg.json b/external_imported/vcpkg/ports/mdns/vcpkg.json index 2cb48af8d..c0dade8e7 100644 --- a/external_imported/vcpkg/ports/mdns/vcpkg.json +++ b/external_imported/vcpkg/ports/mdns/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mdns", - "version": "1.4.1", + "version": "1.4.2", "description": "Public domain mDNS/DNS-SD library in C", "homepage": "https://github.com/mjansson/mdns", + "license": "Unlicense", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake index 5a391a45a..edb814715 100644 --- a/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake +++ b/external_imported/vcpkg/ports/mdnsresponder/portfile.cmake @@ -86,8 +86,5 @@ file(INSTALL "${SOURCE_PATH}/mDNSShared/dns_sd.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -file(INSTALL - "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" -) vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json index 920ce4c4a..add6a23fa 100644 --- a/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json +++ b/external_imported/vcpkg/ports/mdnsresponder/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mdnsresponder", "version": "878.270.2", - "port-version": 1, + "port-version": 2, "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", "homepage": "https://developer.apple.com/bonjour/", + "license": null, "supports": "windows & !uwp & !arm" } diff --git a/external_imported/vcpkg/ports/mesa/clover.patch b/external_imported/vcpkg/ports/mesa/clover.patch new file mode 100644 index 000000000..6e39e180f --- /dev/null +++ b/external_imported/vcpkg/ports/mesa/clover.patch @@ -0,0 +1,63 @@ +From b7c465dc43693cb1ad7e073cc7d8f89f5cfbd0ac Mon Sep 17 00:00:00 2001 +From: pal1000 +Date: Sat, 13 Nov 2021 11:39:58 +0200 +Subject: [PATCH] clover: Use static pipe loader on Windows + +Currently this only supports linking in swrast, but more Windows-supporting +drivers can be added pretty easily. +--- + src/gallium/targets/opencl/meson.build | 18 +++++++++++++++--- + src/gallium/targets/opencl/target.c | 2 ++ + 2 files changed, 17 insertions(+), 3 deletions(-) + create mode 100644 src/gallium/targets/opencl/target.c + +diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build +index ec65fcbe18e..f6ca4a28f20 100644 +--- a/src/gallium/targets/opencl/meson.build ++++ b/src/gallium/targets/opencl/meson.build +@@ -85,19 +85,31 @@ if not (dep_clang.found() and dep_clang_usable) + endif + endif + ++if host_machine.system() == 'windows' ++ libpipe_loader = libpipe_loader_static ++ target_files = ['target.c'] ++else ++ libpipe_loader = libpipe_loader_dynamic ++ target_files = [] ++endif ++ + ocldef = files(opencl_libname + '.def')[0] + + libopencl = shared_library( + opencl_libname, +- [], ++ target_files, ++ include_directories : [ ++ inc_include, inc_util, inc_src, inc_gallium, inc_gallium_winsys, inc_gallium_drivers, inc_gallium_aux ++ ], + vs_module_defs : ocldef, + link_args : [ld_args_gc_sections, opencl_link_args], + link_depends : opencl_link_deps, + link_whole : libclover, +- link_with : [libpipe_loader_dynamic, libgallium], ++ link_with : [libpipe_loader, libgallium, libws_null, libwsw], + dependencies : [ + idep_mesautil, +- dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version ++ dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang, dep_version, ++ driver_swrast + ], + version : '@0@.0.0'.format(opencl_version), + install : true, +diff --git a/src/gallium/targets/opencl/target.c b/src/gallium/targets/opencl/target.c +new file mode 100644 +index 00000000000..308e23bb4a0 +--- /dev/null ++++ b/src/gallium/targets/opencl/target.c +@@ -0,0 +1,2 @@ ++#include "target-helpers/drm_helper.h" ++#include "target-helpers/sw_helper.h" +-- +2.33.1.windows.1 + diff --git a/external_imported/vcpkg/ports/mesa/d3d10sw.patch b/external_imported/vcpkg/ports/mesa/d3d10sw.patch deleted file mode 100644 index 98221873b..000000000 --- a/external_imported/vcpkg/ports/mesa/d3d10sw.patch +++ /dev/null @@ -1,383 +0,0 @@ -diff --git a/src/gallium/frontends/d3d10umd/D3DKMT.cpp b/src/gallium/frontends/d3d10umd/D3DKMT.cpp -index 1649eddc41e8f17fd9e0854acbb8e0c882d94cb5..dc31e9931876cac6ae4e52a80f6da7aa5284415c 100644 ---- a/src/gallium/frontends/d3d10umd/D3DKMT.cpp -+++ b/src/gallium/frontends/d3d10umd/D3DKMT.cpp -@@ -244,7 +244,7 @@ D3DKMTGetMultisampleMethodList(D3DKMT_GETMULTISAMPLEMETHODLIST *pData) - - - EXTERN_C NTSTATUS APIENTRY --D3DKMTPresent(CONST D3DKMT_PRESENT *pData) -+D3DKMTPresent(D3DKMT_PRESENT *pData) - { - LOG_UNSUPPORTED_ENTRYPOINT(); - return STATUS_NOT_IMPLEMENTED; -@@ -409,7 +409,7 @@ D3DKMTSetVidPnSourceOwner(CONST D3DKMT_SETVIDPNSOURCEOWNER *pData) - - - EXTERN_C NTSTATUS APIENTRY --D3DKMTSetVidPnSourceOwner1(const void *pData) -+D3DKMTSetVidPnSourceOwner1(CONST D3DKMT_SETVIDPNSOURCEOWNER1 *pData) - { - LOG_UNSUPPORTED_ENTRYPOINT(); - return STATUS_NOT_IMPLEMENTED; -diff --git a/src/gallium/frontends/d3d10umd/Device.cpp b/src/gallium/frontends/d3d10umd/Device.cpp -index afca18819ce04f28b23fee9ebdaa57b52a04426c..cd2c6cd9180eb03612500aa8d8475994a2f836fc 100644 ---- a/src/gallium/frontends/d3d10umd/Device.cpp -+++ b/src/gallium/frontends/d3d10umd/Device.cpp -@@ -32,7 +32,7 @@ - - - #include "Draw.h" --#include "Dxgi.h" -+#include "DxgiFns.h" - #include "InputAssembly.h" - #include "OutputMerger.h" - #include "Query.h" -diff --git a/src/gallium/frontends/d3d10umd/DriverIncludes.h b/src/gallium/frontends/d3d10umd/DriverIncludes.h -index e78d46fafc55557f3266e700fdc2a72305827ce6..c7df64042b5b013680ec3c8190cfac7b4b958ded 100644 ---- a/src/gallium/frontends/d3d10umd/DriverIncludes.h -+++ b/src/gallium/frontends/d3d10umd/DriverIncludes.h -@@ -43,12 +43,21 @@ - - #include - --#include "winddk/winddk_compat.h" -+#include "winddk_compat.h" - - //typedef LARGE_INTEGER PHYSICAL_ADDRESS; - //typedef __success(return >= 0) LONG NTSTATUS; - --#define D3D10DDI_MINOR_HEADER_VERSION 1 -+#define D3D10DDI_MINOR_HEADER_VERSION 2 -+ -+/* Unfortunately WinDDK's d3d10umddi.h defines D3D10.x constants as global -+ * const variables instead of preprocessor defines, causing LINK to fail due -+ * to duplicate symbols. Include d3d10_1.h to avoid the issue. -+ */ -+#ifdef _MSC_VER -+#include -+#endif -+ - #include - - #include "Debug.h" -diff --git a/src/gallium/frontends/d3d10umd/Dxgi.cpp b/src/gallium/frontends/d3d10umd/DxgiFns.cpp -similarity index 97% -rename from src/gallium/frontends/d3d10umd/Dxgi.cpp -rename to src/gallium/frontends/d3d10umd/DxgiFns.cpp -index 253f81ed283b55dd4bff29df8658f386c08cbc95..cd844a2b0fa19e23c46da0ddc3a92a9a2c9d81b6 100644 ---- a/src/gallium/frontends/d3d10umd/Dxgi.cpp -+++ b/src/gallium/frontends/d3d10umd/DxgiFns.cpp -@@ -26,13 +26,13 @@ - **************************************************************************/ - - /* -- * Dxgi.cpp -- -+ * DxgiFns.cpp -- - * DXGI related functions. - */ - - #include - --#include "Dxgi.h" -+#include "DxgiFns.h" - #include "Format.h" - #include "State.h" - -@@ -97,11 +97,11 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) - - void *map; - struct pipe_transfer *transfer; -- map = pipe_transfer_map(pipe, -- pSrcResource->resource, -- 0, 0, PIPE_MAP_READ, -- 0, 0, w, h, -- &transfer); -+ map = pipe_texture_map(pipe, -+ pSrcResource->resource, -+ 0, 0, PIPE_MAP_READ, -+ 0, 0, w, h, -+ &transfer); - if (map) { - - BITMAPINFO bmi; -@@ -172,7 +172,7 @@ _Present(DXGI_DDI_ARG_PRESENT *pPresentData) - DeleteDC(hdcMem); - DeleteObject(hBmp); - -- pipe_transfer_unmap(pipe, transfer); -+ pipe_texture_unmap(pipe, transfer); - } - - ReleaseDC(hWnd, hDC); -diff --git a/src/gallium/frontends/d3d10umd/Dxgi.h b/src/gallium/frontends/d3d10umd/DxgiFns.h -similarity index 96% -rename from src/gallium/frontends/d3d10umd/Dxgi.h -rename to src/gallium/frontends/d3d10umd/DxgiFns.h -index dedc2542d6ab016111a78b713b9cbe54581ba92a..3689faa307c07deb62c3f5c39b4788dd8d60cb35 100644 ---- a/src/gallium/frontends/d3d10umd/Dxgi.h -+++ b/src/gallium/frontends/d3d10umd/DxgiFns.h -@@ -26,8 +26,8 @@ - **************************************************************************/ - - /* -- * Dxgi.h -- -- * Functions that manipulate GPU resources. -+ * DxgiFns.h -- -+ * DXGI related functions - */ - - #ifndef WRAP_DXGI_H -diff --git a/src/gallium/frontends/d3d10umd/Resource.cpp b/src/gallium/frontends/d3d10umd/Resource.cpp -index a7910d2e3cf186597bb35d7c5a98464c4e844cf7..3dd91365b23e5608108a0e09e1296cb0a7bc65df 100644 ---- a/src/gallium/frontends/d3d10umd/Resource.cpp -+++ b/src/gallium/frontends/d3d10umd/Resource.cpp -@@ -270,6 +270,7 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN - - templat.target = translate_texture_target( pCreateResource->ResourceDimension, - pCreateResource->ArraySize ); -+ pResource->buffer = templat.target == PIPE_BUFFER; - - if (pCreateResource->Format == DXGI_FORMAT_UNKNOWN) { - assert(pCreateResource->ResourceDimension == D3D10DDIRESOURCE_BUFFER); -@@ -315,37 +316,62 @@ CreateResource(D3D10DDI_HDEVICE hDevice, // IN - sizeof *pResource->transfers); - - if (pCreateResource->pInitialDataUP) { -- for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { -+ if (pResource->buffer) { -+ assert(pResource->NumSubResources == 1); - const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = -- &pCreateResource->pInitialDataUP[SubResource]; -+ &pCreateResource->pInitialDataUP[0]; - - unsigned level; - struct pipe_box box; -- subResourceBox(pResource->resource, SubResource, &level, &box); -+ subResourceBox(pResource->resource, 0, &level, &box); - - struct pipe_transfer *transfer; - void *map; -- map = pipe->transfer_map(pipe, -- pResource->resource, -- level, -- PIPE_MAP_WRITE | -- PIPE_MAP_UNSYNCHRONIZED, -- &box, -- &transfer); -+ map = pipe->buffer_map(pipe, -+ pResource->resource, -+ level, -+ PIPE_MAP_WRITE | -+ PIPE_MAP_UNSYNCHRONIZED, -+ &box, -+ &transfer); - assert(map); - if (map) { -- for (int z = 0; z < box.depth; ++z) { -- ubyte *dst = (ubyte*)map + z*transfer->layer_stride; -- const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; -- util_copy_rect(dst, -- templat.format, -- transfer->stride, -- 0, 0, box.width, box.height, -- src, -- pInitialDataUP->SysMemPitch, -- 0, 0); -+ memcpy(map, pInitialDataUP->pSysMem, box.width); -+ pipe_buffer_unmap(pipe, transfer); -+ } -+ } else { -+ for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { -+ const D3D10_DDIARG_SUBRESOURCE_UP* pInitialDataUP = -+ &pCreateResource->pInitialDataUP[SubResource]; -+ -+ unsigned level; -+ struct pipe_box box; -+ subResourceBox(pResource->resource, SubResource, &level, &box); -+ -+ struct pipe_transfer *transfer; -+ void *map; -+ map = pipe->texture_map(pipe, -+ pResource->resource, -+ level, -+ PIPE_MAP_WRITE | -+ PIPE_MAP_UNSYNCHRONIZED, -+ &box, -+ &transfer); -+ assert(map); -+ if (map) { -+ for (int z = 0; z < box.depth; ++z) { -+ ubyte *dst = (ubyte*)map + z*transfer->layer_stride; -+ const ubyte *src = (const ubyte*)pInitialDataUP->pSysMem + z*pInitialDataUP->SysMemSlicePitch; -+ util_copy_rect(dst, -+ templat.format, -+ transfer->stride, -+ 0, 0, box.width, box.height, -+ src, -+ pInitialDataUP->SysMemPitch, -+ 0, 0); -+ } -+ pipe_texture_unmap(pipe, transfer); - } -- pipe_transfer_unmap(pipe, transfer); - } - } - } -@@ -423,7 +449,11 @@ DestroyResource(D3D10DDI_HDEVICE hDevice, // IN - - for (UINT SubResource = 0; SubResource < pResource->NumSubResources; ++SubResource) { - if (pResource->transfers[SubResource]) { -- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); -+ } else { -+ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); -+ } - pResource->transfers[SubResource] = NULL; - } - } -@@ -493,12 +523,21 @@ ResourceMap(D3D10DDI_HDEVICE hDevice, // IN - assert(!pResource->transfers[SubResource]); - - void *map; -- map = pipe->transfer_map(pipe, -- resource, -- level, -- usage, -- &box, -- &pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ map = pipe->buffer_map(pipe, -+ resource, -+ level, -+ usage, -+ &box, -+ &pResource->transfers[SubResource]); -+ } else { -+ map = pipe->texture_map(pipe, -+ resource, -+ level, -+ usage, -+ &box, -+ &pResource->transfers[SubResource]); -+ } - if (!map) { - DebugPrintf("%s: failed to map resource\n", __FUNCTION__); - SetError(hDevice, E_FAIL); -@@ -534,7 +573,11 @@ ResourceUnmap(D3D10DDI_HDEVICE hDevice, // IN - assert(SubResource < pResource->NumSubResources); - - if (pResource->transfers[SubResource]) { -- pipe_transfer_unmap(pipe, pResource->transfers[SubResource]); -+ if (pResource->buffer) { -+ pipe_buffer_unmap(pipe, pResource->transfers[SubResource]); -+ } else { -+ pipe_texture_unmap(pipe, pResource->transfers[SubResource]); -+ } - pResource->transfers[SubResource] = NULL; - } - } -@@ -834,7 +877,8 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - } - - struct pipe_context *pipe = pDevice->pipe; -- struct pipe_resource *dst_resource = CastPipeResource(hDstResource); -+ Resource *pDstResource = CastResource(hDstResource); -+ struct pipe_resource *dst_resource = pDstResource->resource; - - unsigned level; - struct pipe_box box; -@@ -855,12 +899,21 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - - struct pipe_transfer *transfer; - void *map; -- map = pipe->transfer_map(pipe, -- dst_resource, -- level, -- PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -- &box, -- &transfer); -+ if (pDstResource->buffer) { -+ map = pipe->buffer_map(pipe, -+ dst_resource, -+ level, -+ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -+ &box, -+ &transfer); -+ } else { -+ map = pipe->texture_map(pipe, -+ dst_resource, -+ level, -+ PIPE_MAP_WRITE | PIPE_MAP_DISCARD_RANGE, -+ &box, -+ &transfer); -+ } - assert(map); - if (map) { - for (int z = 0; z < box.depth; ++z) { -@@ -874,7 +927,11 @@ ResourceUpdateSubResourceUP(D3D10DDI_HDEVICE hDevice, // IN - RowPitch, - 0, 0); - } -- pipe_transfer_unmap(pipe, transfer); -+ if (pDstResource->buffer) { -+ pipe_buffer_unmap(pipe, transfer); -+ } else { -+ pipe_texture_unmap(pipe, transfer); -+ } - } - } - -diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.c b/src/gallium/frontends/d3d10umd/ShaderParse.c -index e4b6b88aa72909b6dc02c23dd13e442f9d3f4361..1995d381880d172ac49fe0d4461d439f35cf32b5 100644 ---- a/src/gallium/frontends/d3d10umd/ShaderParse.c -+++ b/src/gallium/frontends/d3d10umd/ShaderParse.c -@@ -392,7 +392,7 @@ Shader_parse_opcode(struct Shader_parser *parser, - if (opcode_is_extended) { - /* NOTE: DECODE_IS_D3D10_SB_OPCODE_DOUBLE_EXTENDED is broken. - */ -- assert(!((*curr & D3D10_SB_OPCODE_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); -+ assert(!((*curr & D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK) >> D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT)); - - switch (DECODE_D3D10_SB_EXTENDED_OPCODE_TYPE(*curr)) { - case D3D10_SB_EXTENDED_OPCODE_EMPTY: -diff --git a/src/gallium/frontends/d3d10umd/ShaderParse.h b/src/gallium/frontends/d3d10umd/ShaderParse.h -index 5e8fba044ab5faf92f78d4f2bb75ec110752adb8..df95536f2b53eef900961f221100d4f2821a0f5d 100644 ---- a/src/gallium/frontends/d3d10umd/ShaderParse.h -+++ b/src/gallium/frontends/d3d10umd/ShaderParse.h -@@ -35,9 +35,6 @@ - - #include "DriverIncludes.h" - --//#include "winddk/winddk_compat.h" --#include "winddk/d3d10tokenizedprogramformat.hpp" -- - #ifdef __cplusplus - extern "C" { - #endif -diff --git a/src/gallium/frontends/d3d10umd/State.h b/src/gallium/frontends/d3d10umd/State.h -index 5cb865ce69573a16e24e14df88e53a0e48c80130..3e45cb797435b40da0a4a1f5476fab2aecca08fd 100644 ---- a/src/gallium/frontends/d3d10umd/State.h -+++ b/src/gallium/frontends/d3d10umd/State.h -@@ -150,6 +150,7 @@ struct Resource - DXGI_FORMAT Format; - UINT MipLevels; - UINT NumSubResources; -+ bool buffer; - struct pipe_resource *resource; - struct pipe_transfer **transfers; - struct pipe_stream_output_target *so_target; -diff --git a/src/gallium/frontends/d3d10umd/meson.build b/src/gallium/frontends/d3d10umd/meson.build -index 90774d9217d3ab5f4267974ae9018f55ab709f42..7141c8da17f7500b2d6e8e20faba9b5c70ab01d8 100644 ---- a/src/gallium/frontends/d3d10umd/meson.build -+++ b/src/gallium/frontends/d3d10umd/meson.build -@@ -14,7 +14,7 @@ libd3d10umd = static_library( - 'Debug.cpp', - 'Device.cpp', - 'Draw.cpp', -- 'Dxgi.cpp', -+ 'DxgiFns.cpp', - 'Format.cpp', - 'InputAssembly.cpp', - 'OutputMerger.cpp', diff --git a/external_imported/vcpkg/ports/mesa/def-fixes.patch b/external_imported/vcpkg/ports/mesa/def-fixes.patch new file mode 100644 index 000000000..650187273 --- /dev/null +++ b/external_imported/vcpkg/ports/mesa/def-fixes.patch @@ -0,0 +1,3571 @@ +diff --git a/bin/gen_vs_module_defs.py b/bin/gen_vs_module_defs.py +new file mode 100644 +index 0000000000000000000000000000000000000000..dff8ab36f92ffbc18dbb2779563c25df567bb7b0 +--- /dev/null ++++ b/bin/gen_vs_module_defs.py +@@ -0,0 +1,98 @@ ++#!/usr/bin/env python3 ++# Copyright © 2021-2021 Yonggang Luo ++ ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to deal ++# in the Software without restriction, including without limitation the rights ++# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++# copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++ ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++ ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++# SOFTWARE. ++ ++gen_help = """Generates visual studio module definition file.""" ++ ++import argparse ++ ++""" ++For input template definition file ++For gcc/x64,gcc/arm64,visual studio ++`wglMakeCurrent@8 @357` => `wglMakeCurrent @357` ++`DrvCopyContext@12` => `DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++For gcc/x86,gcc/arm ++`wglMakeCurrent@8 @357` => `wglMakeCurrent@8 @357 == wglMakeCurrent` ++`DrvCopyContext@12` => `DrvCopyContext@12 == DrvCopyContext` ++`stw_get_device` => `stw_get_device` ++ ++""" ++def gen_vs_module_def(in_file: str, out_file: str, compiler_id: str, cpu_family: str) -> None: ++ out_file_lines = ['EXPORTS'] ++ with open(in_file, 'r', encoding='utf-8') as f: ++ lines = f.readlines() ++ for line in lines: ++ line = line.strip() ++ tokens = line.split(';') ++ if not tokens: ++ continue ++ def_infos = [x for x in tokens[0].split(' ') if len(x) > 0] ++ if not def_infos: ++ if line: ++ out_file_lines.append('\t' + line) ++ else: ++ out_file_lines.append('') ++ continue ++ name_infos = def_infos[0].split('@') ++ if not name_infos: ++ out_file_lines.append('\t;' + line) ++ continue ++ order_info = '' if len(def_infos) <= 1 else def_infos[1] ++ if def_infos[0] != name_infos[0] and \ ++ (compiler_id == 'gcc') and (cpu_family not in {'x86_64', 'aarch64'}): ++ if order_info: ++ out_file_lines.append('\t' + def_infos[0] + ' ' + order_info + ' == ' + name_infos[0]) ++ else: ++ out_file_lines.append('\t' + def_infos[0] + ' == ' + name_infos[0]) ++ else: ++ if order_info: ++ out_file_lines.append('\t' + name_infos[0] + ' ' + order_info) ++ else: ++ out_file_lines.append('\t' + name_infos[0]) ++ with open(out_file, 'wb') as f: ++ out_file_content = '\n'.join(out_file_lines) + '\n' ++ f.write(out_file_content.encode('utf-8')) ++''' ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/libgl-gdi/opengl32.def.in --out_file src/gallium/targets/libgl-gdi/opengl32.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/osmesa/osmesa.def.in --out_file src/gallium/targets/osmesa/osmesa.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/wgl/gallium_wgl.def.in --out_file src/gallium/targets/wgl/gallium_wgl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/egl/main/egl.def.in --out_file src/egl/main/egl.mingw.def --compiler_id gcc --cpu_family x86 ++ ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.def --compiler_id gcc --cpu_family x86_64 ++python ./bin/gen_vs_module_defs.py --in_file src/gallium/targets/lavapipe/vulkan_lvp.def.in --out_file src/gallium/targets/lavapipe/vulkan_lvp.mingw.def --compiler_id gcc --cpu_family x86 ++ ++''' ++if __name__ == "__main__": ++ parser = argparse.ArgumentParser(description=gen_help) ++ parser.add_argument('--in_file', help='input template moudle definition file') ++ parser.add_argument('--out_file', help='output moudle definition file') ++ parser.add_argument('--compiler_id', help='compiler id') ++ parser.add_argument('--cpu_family', help='cpu family') ++ args = parser.parse_args() ++ # print(args) ++ gen_vs_module_def(args.in_file, args.out_file, args.compiler_id, args.cpu_family) +diff --git a/bin/meson.build b/bin/meson.build +index 000abef770966c4baecd0b47922f42c532a8c2cf..1b7301585f9e4b0f0556ce2ae11b03b128ab4677 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -19,5 +19,6 @@ + # SOFTWARE. + + git_sha1_gen_py = files('git_sha1_gen.py') ++gen_vs_module_defs_py = files('gen_vs_module_defs.py') + symbols_check = find_program('symbols-check.py') + install_megadrivers_py = find_program('install_megadrivers.py') +diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build +index 523782f281f650d0558af64a0c0a2bf77c217e1e..b6ecd999e71ab3ecb780af4fa2146c617e3c8e41 100644 +--- a/src/amd/vulkan/meson.build ++++ b/src/amd/vulkan/meson.build +@@ -149,12 +149,10 @@ if with_ld_version_script + libvulkan_radeon_link_depends += files('vulkan.sym') + endif + +-vulkan_radv_def = 'vulkan_radv.def' +- + libvulkan_radeon = shared_library( + 'vulkan_radeon', + [libradv_files, radv_entrypoints, sha1_h], +- vs_module_defs : vulkan_radv_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, + ], +diff --git a/src/amd/vulkan/vulkan_radv.def b/src/amd/vulkan/vulkan_radv.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/amd/vulkan/vulkan_radv.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/egl/main/egl.def b/src/egl/main/egl.def +deleted file mode 100644 +index 54ae76b330929db865dc4ef0fd1723a88dc47979..0000000000000000000000000000000000000000 +--- a/src/egl/main/egl.def ++++ /dev/null +@@ -1,47 +0,0 @@ +-EXPORTS +- eglBindAPI +- eglBindTexImage +- eglChooseConfig +- eglClientWaitSync +- eglCopyBuffers +- eglCreateContext +- eglCreateImage +- eglCreatePbufferFromClientBuffer +- eglCreatePbufferSurface +- eglCreatePixmapSurface +- eglCreatePlatformPixmapSurface +- eglCreatePlatformWindowSurface +- eglCreateSync +- eglCreateWindowSurface +- eglDestroyContext +- eglDestroyImage +- eglDestroySurface +- eglDestroySync +- eglGetConfigAttrib +- eglGetConfigs +- eglGetCurrentContext +- eglGetCurrentDisplay +- eglGetCurrentSurface +- eglGetDisplay +- eglGetError +- eglGetPlatformDisplay +- eglGetProcAddress +- eglGetSyncAttrib +- eglInitialize +- eglMakeCurrent +- eglQueryAPI +- eglQueryContext +- eglQueryString +- eglQuerySurface +- eglReleaseTexImage +- eglReleaseThread +- eglSurfaceAttrib +- eglSwapBuffers +- eglSwapInterval +- eglTerminate +- eglWaitClient +- eglWaitGL +- eglWaitNative +- eglWaitSync +- MesaGLInteropEGLQueryDeviceInfo +- MesaGLInteropEGLExportObject +diff --git a/src/egl/main/egl.def.in b/src/egl/main/egl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b2439d9a2caaef26b48e737c8f6cd8314398ddeb +--- /dev/null ++++ b/src/egl/main/egl.def.in +@@ -0,0 +1,49 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++eglBindAPI@4 ++eglBindTexImage@12 ++eglChooseConfig@20 ++eglClientWaitSync@20 ++eglCopyBuffers@12 ++eglCreateContext@16 ++eglCreateImage@20 ++eglCreatePbufferFromClientBuffer@20 ++eglCreatePbufferSurface@12 ++eglCreatePixmapSurface@16 ++eglCreatePlatformPixmapSurface@16 ++eglCreatePlatformWindowSurface@16 ++eglCreateSync@12 ++eglCreateWindowSurface@16 ++eglDestroyContext@8 ++eglDestroyImage@8 ++eglDestroySurface@8 ++eglDestroySync@8 ++eglGetConfigAttrib@16 ++eglGetConfigs@16 ++eglGetCurrentContext@0 ++eglGetCurrentDisplay@0 ++eglGetCurrentSurface@4 ++eglGetDisplay@4 ++eglGetError@0 ++eglGetPlatformDisplay@12 ++eglGetProcAddress@4 ++eglGetSyncAttrib@16 ++eglInitialize@12 ++eglMakeCurrent@16 ++eglQueryAPI@0 ++eglQueryContext@16 ++eglQueryString@8 ++eglQuerySurface@16 ++eglReleaseTexImage@12 ++eglReleaseThread@0 ++eglSurfaceAttrib@16 ++eglSwapBuffers@8 ++eglSwapInterval@8 ++eglTerminate@4 ++eglWaitClient@0 ++eglWaitGL@0 ++eglWaitNative@4 ++eglWaitSync@12 ++ ++; __cdecl calling convention have no @number suffix ++MesaGLInteropEGLQueryDeviceInfo ++MesaGLInteropEGLExportObject +diff --git a/src/egl/meson.build b/src/egl/meson.build +index 315a95013f39b76a47067073f106eda518dc6b71..53044297322ad6ea3137bd1fe48b778a61608f5e 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -177,6 +177,15 @@ else + ) + endif + ++egl_def = custom_target( ++ 'egl.def', ++ input: 'main/egl.def.in', ++ output : 'egl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libegl = shared_library( + egl_lib_name, + files_egl, +@@ -194,7 +203,7 @@ libegl = shared_library( + version : egl_lib_version, + soversion : egl_lib_soversion, + name_prefix : 'lib', # even on windows +- vs_module_defs : 'main/egl.def' ++ vs_module_defs : egl_def + ) + + if not with_glvnd +diff --git a/src/gallium/frontends/d3d10umd/d3d10_sw.def b/src/gallium/frontends/d3d10umd/d3d10_sw.def +deleted file mode 100644 +index 5b76bfccefaabc9c09e000ffab579d1487a3a31c..0000000000000000000000000000000000000000 +--- a/src/gallium/frontends/d3d10umd/d3d10_sw.def ++++ /dev/null +@@ -1,53 +0,0 @@ +-EXPORTS +- OpenAdapter10 +- OpenAdapter10_2 +- D3DKMTAcquireKeyedMutex +- D3DKMTCloseAdapter +- D3DKMTConfigureSharedResource +- D3DKMTCreateAllocation +- D3DKMTCreateAllocation2 +- D3DKMTCreateContext +- D3DKMTCreateDevice +- D3DKMTCreateKeyedMutex +- D3DKMTCreateSynchronizationObject +- D3DKMTCreateSynchronizationObject2 +- D3DKMTDestroyAllocation +- D3DKMTDestroyContext +- D3DKMTDestroyDevice +- D3DKMTDestroyKeyedMutex +- D3DKMTDestroySynchronizationObject +- D3DKMTEscape +- D3DKMTGetContextSchedulingPriority +- ;D3DKMTGetDeviceSchedulingPriority +- D3DKMTGetDeviceState +- D3DKMTGetDisplayModeList +- D3DKMTGetMultisampleMethodList +- D3DKMTGetRuntimeData +- D3DKMTGetSharedPrimaryHandle +- D3DKMTLock +- D3DKMTOpenAdapterFromDeviceName +- D3DKMTOpenAdapterFromGdiDisplayName +- D3DKMTOpenKeyedMutex +- D3DKMTOpenResource +- D3DKMTOpenResource2 +- D3DKMTOpenSynchronizationObject +- D3DKMTPresent +- D3DKMTQueryAdapterInfo +- D3DKMTQueryAllocationResidency +- D3DKMTQueryResourceInfo +- D3DKMTReleaseKeyedMutex +- D3DKMTRender +- D3DKMTSetAllocationPriority +- D3DKMTSetContextSchedulingPriority +- ;D3DKMTSetDeviceSchedulingPriority +- D3DKMTSetDisplayMode +- D3DKMTSetDisplayPrivateDriverFormat +- D3DKMTSetGammaRamp +- D3DKMTSetVidPnSourceOwner +- D3DKMTSetVidPnSourceOwner1 +- D3DKMTSignalSynchronizationObject +- D3DKMTSignalSynchronizationObject2 +- D3DKMTUnlock +- D3DKMTWaitForSynchronizationObject +- D3DKMTWaitForSynchronizationObject2 +- D3DKMTWaitForVerticalBlankEvent +diff --git a/src/gallium/frontends/osmesa/meson.build b/src/gallium/frontends/osmesa/meson.build +index e5848fd9934afc22119a14122e6c2d095ab8f350..fe78a4daa31bb01bf8535ff4498172241e554610 100644 +--- a/src/gallium/frontends/osmesa/meson.build ++++ b/src/gallium/frontends/osmesa/meson.build +@@ -20,7 +20,7 @@ + + osmesa_st_c_args = [] + if with_platform_windows +- osmesa_st_c_args += ['-DBUILD_GL32', '-DWIN32_LEAN_AND_MEAN'] ++ osmesa_st_c_args += ['-DWIN32_LEAN_AND_MEAN'] + if not with_shared_glapi + osmesa_st_c_args += ['-D_GLAPI_NO_EXPORTS'] + endif +diff --git a/src/gallium/targets/d3d10sw/d3d10_sw.def.in b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..a81de54c4d285c67b1dd9a6da855a65446239831 +--- /dev/null ++++ b/src/gallium/targets/d3d10sw/d3d10_sw.def.in +@@ -0,0 +1,76 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OpenAdapter10@4 ++OpenAdapter10_2@4 ++D3DKMTAcquireKeyedMutex@4 ++;D3DKMTCheckExclusiveOwnership@0 ++;D3DKMTCheckMonitorPowerState@4 ++;D3DKMTCheckOcclusion@4 ++;D3DKMTCheckSharedResourceAccess@4 ++;D3DKMTCheckVidPnExclusiveOwnership@4 ++D3DKMTCloseAdapter@4 ++D3DKMTConfigureSharedResource@4 ++D3DKMTCreateAllocation2@4 ++D3DKMTCreateAllocation@4 ++D3DKMTCreateContext@4 ++;D3DKMTCreateDCFromMemory@4 ++D3DKMTCreateDevice@4 ++D3DKMTCreateKeyedMutex@4 ++;D3DKMTCreateOverlay@4 ++D3DKMTCreateSynchronizationObject2@4 ++D3DKMTCreateSynchronizationObject@4 ++D3DKMTDestroyAllocation@4 ++D3DKMTDestroyContext@4 ++;D3DKMTDestroyDCFromMemory@4 ++D3DKMTDestroyDevice@4 ++D3DKMTDestroyKeyedMutex@4 ++;D3DKMTDestroyOverlay@4 ++D3DKMTDestroySynchronizationObject@4 ++D3DKMTEscape@4 ++;D3DKMTFlipOverlay@4 ++D3DKMTGetContextSchedulingPriority@4 ++D3DKMTGetDeviceState@4 ++D3DKMTGetDisplayModeList@4 ++D3DKMTGetMultisampleMethodList@4 ++;D3DKMTGetOverlayState@4 ++;D3DKMTGetPresentHistory@4 ++;D3DKMTGetPresentQueueEvent@8 ++;D3DKMTGetProcessSchedulingPriorityClass@8 ++D3DKMTGetRuntimeData@4 ++;D3DKMTGetScanLine@4 ++D3DKMTGetSharedPrimaryHandle@4 ++;D3DKMTInvalidateActiveVidPn@4 ++D3DKMTLock@4 ++D3DKMTOpenAdapterFromDeviceName@4 ++D3DKMTOpenAdapterFromGdiDisplayName@4 ++;D3DKMTOpenAdapterFromHdc@4 ++D3DKMTOpenKeyedMutex@4 ++D3DKMTOpenResource2@4 ++D3DKMTOpenResource@4 ++D3DKMTOpenSynchronizationObject@4 ++;D3DKMTPollDisplayChildren@4 ++D3DKMTPresent@4 ++D3DKMTQueryAdapterInfo@4 ++D3DKMTQueryAllocationResidency@4 ++D3DKMTQueryResourceInfo@4 ++;D3DKMTQueryStatistics@4 ++D3DKMTReleaseKeyedMutex@4 ++;D3DKMTReleaseProcessVidPnSourceOwners@4 ++D3DKMTRender@4 ++D3DKMTSetAllocationPriority@4 ++D3DKMTSetContextSchedulingPriority@4 ++D3DKMTSetDisplayMode@4 ++D3DKMTSetDisplayPrivateDriverFormat@4 ++D3DKMTSetGammaRamp@4 ++;D3DKMTSetProcessSchedulingPriorityClass@8 ++;D3DKMTSetQueuedLimit@4 ++D3DKMTSetVidPnSourceOwner@4 ++;D3DKMTSharedPrimaryLockNotification@4 ++;D3DKMTSharedPrimaryUnLockNotification@4 ++D3DKMTSignalSynchronizationObject2@4 ++D3DKMTSignalSynchronizationObject@4 ++D3DKMTUnlock@4 ++;D3DKMTUpdateOverlay@4 ++;D3DKMTWaitForIdle@4 ++D3DKMTWaitForSynchronizationObject2@4 ++D3DKMTWaitForSynchronizationObject@4 ++D3DKMTWaitForVerticalBlankEvent@4 +diff --git a/src/gallium/targets/d3d10sw/meson.build b/src/gallium/targets/d3d10sw/meson.build +index fe8632d3c7ff3f1a61a20f6bd88f25e697316e10..8b90c561152f96be787f838467d0e3407a1bd134 100644 +--- a/src/gallium/targets/d3d10sw/meson.build ++++ b/src/gallium/targets/d3d10sw/meson.build +@@ -19,20 +19,22 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-d3d10sw_def = files('../../frontends/d3d10umd/d3d10_sw.def')[0] +-_link_args_d3d10sw = [] +-if cc.get_id() == 'gcc' +- _link_args_d3d10sw += '-Wl,--enable-stdcall-fixup' +-endif ++d3d10_sw_def = custom_target( ++ 'd3d10_sw.def', ++ input: 'd3d10_sw.def.in', ++ output : 'd3d10_sw.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libd3d10sw = shared_library( + 'd3d10sw', + ['d3d10_gdi.c'], +- vs_module_defs : d3d10sw_def, ++ vs_module_defs : d3d10_sw_def, + include_directories : [ + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_d3d10umd, inc_gallium_winsys, inc_gallium_winsys_sw, inc_gallium_drivers, + ], +- link_args : _link_args_d3d10sw, + link_whole : [libd3d10umd], + link_with : [ + libgallium, libwsgdi +diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build +index f2b363099ae154b71efd7c217598e0eb48ff3a0c..bda4fbc574d7f5d7ca2b903ff928c72951022132 100644 +--- a/src/gallium/targets/lavapipe/meson.build ++++ b/src/gallium/targets/lavapipe/meson.build +@@ -1,14 +1,9 @@ + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- vulkan_lvp_def = 'vulkan_lvp.mingw.def' +-else +- vulkan_lvp_def = 'vulkan_lvp.def' +-endif + + libvulkan_lvp = shared_library( + 'vulkan_lvp', + [ 'target.c' ], +- vs_module_defs : vulkan_lvp_def, ++ vs_module_defs : vulkan_api_def, + include_directories : [ inc_src, inc_util, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers ], + link_whole : [ liblavapipe_st ], + link_with : [libpipe_loader_static, libgallium, libwsw, libswdri, libws_null, libswkmsdri ], +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.def b/src/gallium/targets/lavapipe/vulkan_lvp.def +deleted file mode 100644 +index 64a9caae59398a4768f663f18f8598476991f85c..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion +-vk_icdGetInstanceProcAddr +-vk_icdGetPhysicalDeviceProcAddr +diff --git a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def b/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def +deleted file mode 100644 +index c9638323ab044f072ad30f5089074909f769b8d4..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/lavapipe/vulkan_lvp.mingw.def ++++ /dev/null +@@ -1,4 +0,0 @@ +-EXPORTS +-vk_icdNegotiateLoaderICDInterfaceVersion@4 +-vk_icdGetInstanceProcAddr = vk_icdGetInstanceProcAddr@8 +-vk_icdGetPhysicalDeviceProcAddr = vk_icdGetPhysicalDeviceProcAddr@8 +diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build +index 25300000221d44c7d669ec49df1fb88396f5c968..b333eae0f34227b0dfd1abc08006680ea5359224 100644 +--- a/src/gallium/targets/libgl-gdi/meson.build ++++ b/src/gallium/targets/libgl-gdi/meson.build +@@ -20,20 +20,20 @@ + + + opengl32_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- opengl32_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- ogl_def = 'opengl32.mingw.def' +-else +- ogl_def = 'opengl32.def' +-endif ++opengl32_def = custom_target( ++ 'opengl32.def', ++ input: 'opengl32.def.in', ++ output : 'opengl32.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libopengl32 = shared_library( + 'opengl32', + ['stw_wgl.c'], +- vs_module_defs : ogl_def, ++ vs_module_defs : opengl32_def, + include_directories : [ + inc_include, inc_wgl, inc_src, + ], +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def b/src/gallium/targets/libgl-gdi/opengl32.def +deleted file mode 100644 +index d89f0bdb52ab65dc8c1ebb8b9ff79eaf5da41fd8..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.def ++++ /dev/null +@@ -1,388 +0,0 @@ +-EXPORTS +-; GlmfBeginGlsBlock @1 +-; GlmfCloseMetaFile @2 +-; GlmfEndGlsBlock @3 +-; GlmfEndPlayback @4 +-; GlmfInitPlayback @5 +-; GlmfPlayGlsRecord @6 +- glAccum @7 +- glAlphaFunc @8 +- glAreTexturesResident @9 +- glArrayElement @10 +- glBegin @11 +- glBindTexture @12 +- glBitmap @13 +- glBlendFunc @14 +- glCallList @15 +- glCallLists @16 +- glClear @17 +- glClearAccum @18 +- glClearColor @19 +- glClearDepth @20 +- glClearIndex @21 +- glClearStencil @22 +- glClipPlane @23 +- glColor3b @24 +- glColor3bv @25 +- glColor3d @26 +- glColor3dv @27 +- glColor3f @28 +- glColor3fv @29 +- glColor3i @30 +- glColor3iv @31 +- glColor3s @32 +- glColor3sv @33 +- glColor3ub @34 +- glColor3ubv @35 +- glColor3ui @36 +- glColor3uiv @37 +- glColor3us @38 +- glColor3usv @39 +- glColor4b @40 +- glColor4bv @41 +- glColor4d @42 +- glColor4dv @43 +- glColor4f @44 +- glColor4fv @45 +- glColor4i @46 +- glColor4iv @47 +- glColor4s @48 +- glColor4sv @49 +- glColor4ub @50 +- glColor4ubv @51 +- glColor4ui @52 +- glColor4uiv @53 +- glColor4us @54 +- glColor4usv @55 +- glColorMask @56 +- glColorMaterial @57 +- glColorPointer @58 +- glCopyPixels @59 +- glCopyTexImage1D @60 +- glCopyTexImage2D @61 +- glCopyTexSubImage1D @62 +- glCopyTexSubImage2D @63 +- glCullFace @64 +-; glDebugEntry @65 +- glDeleteLists @66 +- glDeleteTextures @67 +- glDepthFunc @68 +- glDepthMask @69 +- glDepthRange @70 +- glDisable @71 +- glDisableClientState @72 +- glDrawArrays @73 +- glDrawBuffer @74 +- glDrawElements @75 +- glDrawPixels @76 +- glEdgeFlag @77 +- glEdgeFlagPointer @78 +- glEdgeFlagv @79 +- glEnable @80 +- glEnableClientState @81 +- glEnd @82 +- glEndList @83 +- glEvalCoord1d @84 +- glEvalCoord1dv @85 +- glEvalCoord1f @86 +- glEvalCoord1fv @87 +- glEvalCoord2d @88 +- glEvalCoord2dv @89 +- glEvalCoord2f @90 +- glEvalCoord2fv @91 +- glEvalMesh1 @92 +- glEvalMesh2 @93 +- glEvalPoint1 @94 +- glEvalPoint2 @95 +- glFeedbackBuffer @96 +- glFinish @97 +- glFlush @98 +- glFogf @99 +- glFogfv @100 +- glFogi @101 +- glFogiv @102 +- glFrontFace @103 +- glFrustum @104 +- glGenLists @105 +- glGenTextures @106 +- glGetBooleanv @107 +- glGetClipPlane @108 +- glGetDoublev @109 +- glGetError @110 +- glGetFloatv @111 +- glGetIntegerv @112 +- glGetLightfv @113 +- glGetLightiv @114 +- glGetMapdv @115 +- glGetMapfv @116 +- glGetMapiv @117 +- glGetMaterialfv @118 +- glGetMaterialiv @119 +- glGetPixelMapfv @120 +- glGetPixelMapuiv @121 +- glGetPixelMapusv @122 +- glGetPointerv @123 +- glGetPolygonStipple @124 +- glGetString @125 +- glGetTexEnvfv @126 +- glGetTexEnviv @127 +- glGetTexGendv @128 +- glGetTexGenfv @129 +- glGetTexGeniv @130 +- glGetTexImage @131 +- glGetTexLevelParameterfv @132 +- glGetTexLevelParameteriv @133 +- glGetTexParameterfv @134 +- glGetTexParameteriv @135 +- glHint @136 +- glIndexMask @137 +- glIndexPointer @138 +- glIndexd @139 +- glIndexdv @140 +- glIndexf @141 +- glIndexfv @142 +- glIndexi @143 +- glIndexiv @144 +- glIndexs @145 +- glIndexsv @146 +- glIndexub @147 +- glIndexubv @148 +- glInitNames @149 +- glInterleavedArrays @150 +- glIsEnabled @151 +- glIsList @152 +- glIsTexture @153 +- glLightModelf @154 +- glLightModelfv @155 +- glLightModeli @156 +- glLightModeliv @157 +- glLightf @158 +- glLightfv @159 +- glLighti @160 +- glLightiv @161 +- glLineStipple @162 +- glLineWidth @163 +- glListBase @164 +- glLoadIdentity @165 +- glLoadMatrixd @166 +- glLoadMatrixf @167 +- glLoadName @168 +- glLogicOp @169 +- glMap1d @170 +- glMap1f @171 +- glMap2d @172 +- glMap2f @173 +- glMapGrid1d @174 +- glMapGrid1f @175 +- glMapGrid2d @176 +- glMapGrid2f @177 +- glMaterialf @178 +- glMaterialfv @179 +- glMateriali @180 +- glMaterialiv @181 +- glMatrixMode @182 +- glMultMatrixd @183 +- glMultMatrixf @184 +- glNewList @185 +- glNormal3b @186 +- glNormal3bv @187 +- glNormal3d @188 +- glNormal3dv @189 +- glNormal3f @190 +- glNormal3fv @191 +- glNormal3i @192 +- glNormal3iv @193 +- glNormal3s @194 +- glNormal3sv @195 +- glNormalPointer @196 +- glOrtho @197 +- glPassThrough @198 +- glPixelMapfv @199 +- glPixelMapuiv @200 +- glPixelMapusv @201 +- glPixelStoref @202 +- glPixelStorei @203 +- glPixelTransferf @204 +- glPixelTransferi @205 +- glPixelZoom @206 +- glPointSize @207 +- glPolygonMode @208 +- glPolygonOffset @209 +- glPolygonStipple @210 +- glPopAttrib @211 +- glPopClientAttrib @212 +- glPopMatrix @213 +- glPopName @214 +- glPrioritizeTextures @215 +- glPushAttrib @216 +- glPushClientAttrib @217 +- glPushMatrix @218 +- glPushName @219 +- glRasterPos2d @220 +- glRasterPos2dv @221 +- glRasterPos2f @222 +- glRasterPos2fv @223 +- glRasterPos2i @224 +- glRasterPos2iv @225 +- glRasterPos2s @226 +- glRasterPos2sv @227 +- glRasterPos3d @228 +- glRasterPos3dv @229 +- glRasterPos3f @230 +- glRasterPos3fv @231 +- glRasterPos3i @232 +- glRasterPos3iv @233 +- glRasterPos3s @234 +- glRasterPos3sv @235 +- glRasterPos4d @236 +- glRasterPos4dv @237 +- glRasterPos4f @238 +- glRasterPos4fv @239 +- glRasterPos4i @240 +- glRasterPos4iv @241 +- glRasterPos4s @242 +- glRasterPos4sv @243 +- glReadBuffer @244 +- glReadPixels @245 +- glRectd @246 +- glRectdv @247 +- glRectf @248 +- glRectfv @249 +- glRecti @250 +- glRectiv @251 +- glRects @252 +- glRectsv @253 +- glRenderMode @254 +- glRotated @255 +- glRotatef @256 +- glScaled @257 +- glScalef @258 +- glScissor @259 +- glSelectBuffer @260 +- glShadeModel @261 +- glStencilFunc @262 +- glStencilMask @263 +- glStencilOp @264 +- glTexCoord1d @265 +- glTexCoord1dv @266 +- glTexCoord1f @267 +- glTexCoord1fv @268 +- glTexCoord1i @269 +- glTexCoord1iv @270 +- glTexCoord1s @271 +- glTexCoord1sv @272 +- glTexCoord2d @273 +- glTexCoord2dv @274 +- glTexCoord2f @275 +- glTexCoord2fv @276 +- glTexCoord2i @277 +- glTexCoord2iv @278 +- glTexCoord2s @279 +- glTexCoord2sv @280 +- glTexCoord3d @281 +- glTexCoord3dv @282 +- glTexCoord3f @283 +- glTexCoord3fv @284 +- glTexCoord3i @285 +- glTexCoord3iv @286 +- glTexCoord3s @287 +- glTexCoord3sv @288 +- glTexCoord4d @289 +- glTexCoord4dv @290 +- glTexCoord4f @291 +- glTexCoord4fv @292 +- glTexCoord4i @293 +- glTexCoord4iv @294 +- glTexCoord4s @295 +- glTexCoord4sv @296 +- glTexCoordPointer @297 +- glTexEnvf @298 +- glTexEnvfv @299 +- glTexEnvi @300 +- glTexEnviv @301 +- glTexGend @302 +- glTexGendv @303 +- glTexGenf @304 +- glTexGenfv @305 +- glTexGeni @306 +- glTexGeniv @307 +- glTexImage1D @308 +- glTexImage2D @309 +- glTexParameterf @310 +- glTexParameterfv @311 +- glTexParameteri @312 +- glTexParameteriv @313 +- glTexSubImage1D @314 +- glTexSubImage2D @315 +- glTranslated @316 +- glTranslatef @317 +- glVertex2d @318 +- glVertex2dv @319 +- glVertex2f @320 +- glVertex2fv @321 +- glVertex2i @322 +- glVertex2iv @323 +- glVertex2s @324 +- glVertex2sv @325 +- glVertex3d @326 +- glVertex3dv @327 +- glVertex3f @328 +- glVertex3fv @329 +- glVertex3i @330 +- glVertex3iv @331 +- glVertex3s @332 +- glVertex3sv @333 +- glVertex4d @334 +- glVertex4dv @335 +- glVertex4f @336 +- glVertex4fv @337 +- glVertex4i @338 +- glVertex4iv @339 +- glVertex4s @340 +- glVertex4sv @341 +- glVertexPointer @342 +- glViewport @343 +- wglChoosePixelFormat @344 +- wglCopyContext @345 +- wglCreateContext @346 +- wglCreateLayerContext @347 +- wglDeleteContext @348 +- wglDescribeLayerPlane @349 +- wglDescribePixelFormat @350 +- wglGetCurrentContext @351 +- wglGetCurrentDC @352 +-; wglGetDefaultProcAddress @353 +- wglGetLayerPaletteEntries @354 +- wglGetPixelFormat @355 +- wglGetProcAddress @356 +- wglMakeCurrent @357 +- wglRealizeLayerPalette @358 +- wglSetLayerPaletteEntries @359 +- wglSetPixelFormat @360 +- wglShareLists @361 +- wglSwapBuffers @362 +- wglSwapLayerBuffers @363 +- wglSwapMultipleBuffers @364 +- wglUseFontBitmapsA @365 +- wglUseFontBitmapsW @366 +- wglUseFontOutlinesA @367 +- wglUseFontOutlinesW @368 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/libgl-gdi/opengl32.def.in b/src/gallium/targets/libgl-gdi/opengl32.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..ceffdf09936f95506090d79a99ef95ef89cc7ddc +--- /dev/null ++++ b/src/gallium/targets/libgl-gdi/opengl32.def.in +@@ -0,0 +1,389 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++;GlmfBeginGlsBlock@4 @1 ++;GlmfCloseMetaFile@4 @2 ++;GlmfEndGlsBlock@4 @3 ++;GlmfEndPlayback@4 @4 ++;GlmfInitPlayback@12 @5 ++;GlmfPlayGlsRecord@16 @6 ++glAccum@8 @7 ++glAlphaFunc@8 @8 ++glAreTexturesResident@12 @9 ++glArrayElement@4 @10 ++glBegin@4 @11 ++glBindTexture@8 @12 ++glBitmap@28 @13 ++glBlendFunc@8 @14 ++glCallList@4 @15 ++glCallLists@12 @16 ++glClear@4 @17 ++glClearAccum@16 @18 ++glClearColor@16 @19 ++glClearDepth@8 @20 ++glClearIndex@4 @21 ++glClearStencil@4 @22 ++glClipPlane@8 @23 ++glColor3b@12 @24 ++glColor3bv@4 @25 ++glColor3d@24 @26 ++glColor3dv@4 @27 ++glColor3f@12 @28 ++glColor3fv@4 @29 ++glColor3i@12 @30 ++glColor3iv@4 @31 ++glColor3s@12 @32 ++glColor3sv@4 @33 ++glColor3ub@12 @34 ++glColor3ubv@4 @35 ++glColor3ui@12 @36 ++glColor3uiv@4 @37 ++glColor3us@12 @38 ++glColor3usv@4 @39 ++glColor4b@16 @40 ++glColor4bv@4 @41 ++glColor4d@32 @42 ++glColor4dv@4 @43 ++glColor4f@16 @44 ++glColor4fv@4 @45 ++glColor4i@16 @46 ++glColor4iv@4 @47 ++glColor4s@16 @48 ++glColor4sv@4 @49 ++glColor4ub@16 @50 ++glColor4ubv@4 @51 ++glColor4ui@16 @52 ++glColor4uiv@4 @53 ++glColor4us@16 @54 ++glColor4usv@4 @55 ++glColorMask@16 @56 ++glColorMaterial@8 @57 ++glColorPointer@16 @58 ++glCopyPixels@20 @59 ++glCopyTexImage1D@28 @60 ++glCopyTexImage2D@32 @61 ++glCopyTexSubImage1D@24 @62 ++glCopyTexSubImage2D@32 @63 ++glCullFace@4 @64 ++;glDebugEntry@8 @65 ++glDeleteLists@8 @66 ++glDeleteTextures@8 @67 ++glDepthFunc@4 @68 ++glDepthMask@4 @69 ++glDepthRange@16 @70 ++glDisable@4 @71 ++glDisableClientState@4 @72 ++glDrawArrays@12 @73 ++glDrawBuffer@4 @74 ++glDrawElements@16 @75 ++glDrawPixels@20 @76 ++glEdgeFlag@4 @77 ++glEdgeFlagPointer@8 @78 ++glEdgeFlagv@4 @79 ++glEnable@4 @80 ++glEnableClientState@4 @81 ++glEnd@0 @82 ++glEndList@0 @83 ++glEvalCoord1d@8 @84 ++glEvalCoord1dv@4 @85 ++glEvalCoord1f@4 @86 ++glEvalCoord1fv@4 @87 ++glEvalCoord2d@16 @88 ++glEvalCoord2dv@4 @89 ++glEvalCoord2f@8 @90 ++glEvalCoord2fv@4 @91 ++glEvalMesh1@12 @92 ++glEvalMesh2@20 @93 ++glEvalPoint1@4 @94 ++glEvalPoint2@8 @95 ++glFeedbackBuffer@12 @96 ++glFinish@0 @97 ++glFlush@0 @98 ++glFogf@8 @99 ++glFogfv@8 @100 ++glFogi@8 @101 ++glFogiv@8 @102 ++glFrontFace@4 @103 ++glFrustum@48 @104 ++glGenLists@4 @105 ++glGenTextures@8 @106 ++glGetBooleanv@8 @107 ++glGetClipPlane@8 @108 ++glGetDoublev@8 @109 ++glGetError@0 @110 ++glGetFloatv@8 @111 ++glGetIntegerv@8 @112 ++glGetLightfv@12 @113 ++glGetLightiv@12 @114 ++glGetMapdv@12 @115 ++glGetMapfv@12 @116 ++glGetMapiv@12 @117 ++glGetMaterialfv@12 @118 ++glGetMaterialiv@12 @119 ++glGetPixelMapfv@8 @120 ++glGetPixelMapuiv@8 @121 ++glGetPixelMapusv@8 @122 ++glGetPointerv@8 @123 ++glGetPolygonStipple@4 @124 ++glGetString@4 @125 ++glGetTexEnvfv@12 @126 ++glGetTexEnviv@12 @127 ++glGetTexGendv@12 @128 ++glGetTexGenfv@12 @129 ++glGetTexGeniv@12 @130 ++glGetTexImage@20 @131 ++glGetTexLevelParameterfv@16 @132 ++glGetTexLevelParameteriv@16 @133 ++glGetTexParameterfv@12 @134 ++glGetTexParameteriv@12 @135 ++glHint@8 @136 ++glIndexMask@4 @137 ++glIndexPointer@12 @138 ++glIndexd@8 @139 ++glIndexdv@4 @140 ++glIndexf@4 @141 ++glIndexfv@4 @142 ++glIndexi@4 @143 ++glIndexiv@4 @144 ++glIndexs@4 @145 ++glIndexsv@4 @146 ++glIndexub@4 @147 ++glIndexubv@4 @148 ++glInitNames@0 @149 ++glInterleavedArrays@12 @150 ++glIsEnabled@4 @151 ++glIsList@4 @152 ++glIsTexture@4 @153 ++glLightModelf@8 @154 ++glLightModelfv@8 @155 ++glLightModeli@8 @156 ++glLightModeliv@8 @157 ++glLightf@12 @158 ++glLightfv@12 @159 ++glLighti@12 @160 ++glLightiv@12 @161 ++glLineStipple@8 @162 ++glLineWidth@4 @163 ++glListBase@4 @164 ++glLoadIdentity@0 @165 ++glLoadMatrixd@4 @166 ++glLoadMatrixf@4 @167 ++glLoadName@4 @168 ++glLogicOp@4 @169 ++glMap1d@32 @170 ++glMap1f@24 @171 ++glMap2d@56 @172 ++glMap2f@40 @173 ++glMapGrid1d@20 @174 ++glMapGrid1f@12 @175 ++glMapGrid2d@40 @176 ++glMapGrid2f@24 @177 ++glMaterialf@12 @178 ++glMaterialfv@12 @179 ++glMateriali@12 @180 ++glMaterialiv@12 @181 ++glMatrixMode@4 @182 ++glMultMatrixd@4 @183 ++glMultMatrixf@4 @184 ++glNewList@8 @185 ++glNormal3b@12 @186 ++glNormal3bv@4 @187 ++glNormal3d@24 @188 ++glNormal3dv@4 @189 ++glNormal3f@12 @190 ++glNormal3fv@4 @191 ++glNormal3i@12 @192 ++glNormal3iv@4 @193 ++glNormal3s@12 @194 ++glNormal3sv@4 @195 ++glNormalPointer@12 @196 ++glOrtho@48 @197 ++glPassThrough@4 @198 ++glPixelMapfv@12 @199 ++glPixelMapuiv@12 @200 ++glPixelMapusv@12 @201 ++glPixelStoref@8 @202 ++glPixelStorei@8 @203 ++glPixelTransferf@8 @204 ++glPixelTransferi@8 @205 ++glPixelZoom@8 @206 ++glPointSize@4 @207 ++glPolygonMode@8 @208 ++glPolygonOffset@8 @209 ++glPolygonStipple@4 @210 ++glPopAttrib@0 @211 ++glPopClientAttrib@0 @212 ++glPopMatrix@0 @213 ++glPopName@0 @214 ++glPrioritizeTextures@12 @215 ++glPushAttrib@4 @216 ++glPushClientAttrib@4 @217 ++glPushMatrix@0 @218 ++glPushName@4 @219 ++glRasterPos2d@16 @220 ++glRasterPos2dv@4 @221 ++glRasterPos2f@8 @222 ++glRasterPos2fv@4 @223 ++glRasterPos2i@8 @224 ++glRasterPos2iv@4 @225 ++glRasterPos2s@8 @226 ++glRasterPos2sv@4 @227 ++glRasterPos3d@24 @228 ++glRasterPos3dv@4 @229 ++glRasterPos3f@12 @230 ++glRasterPos3fv@4 @231 ++glRasterPos3i@12 @232 ++glRasterPos3iv@4 @233 ++glRasterPos3s@12 @234 ++glRasterPos3sv@4 @235 ++glRasterPos4d@32 @236 ++glRasterPos4dv@4 @237 ++glRasterPos4f@16 @238 ++glRasterPos4fv@4 @239 ++glRasterPos4i@16 @240 ++glRasterPos4iv@4 @241 ++glRasterPos4s@16 @242 ++glRasterPos4sv@4 @243 ++glReadBuffer@4 @244 ++glReadPixels@28 @245 ++glRectd@32 @246 ++glRectdv@8 @247 ++glRectf@16 @248 ++glRectfv@8 @249 ++glRecti@16 @250 ++glRectiv@8 @251 ++glRects@16 @252 ++glRectsv@8 @253 ++glRenderMode@4 @254 ++glRotated@32 @255 ++glRotatef@16 @256 ++glScaled@24 @257 ++glScalef@12 @258 ++glScissor@16 @259 ++glSelectBuffer@8 @260 ++glShadeModel@4 @261 ++glStencilFunc@12 @262 ++glStencilMask@4 @263 ++glStencilOp@12 @264 ++glTexCoord1d@8 @265 ++glTexCoord1dv@4 @266 ++glTexCoord1f@4 @267 ++glTexCoord1fv@4 @268 ++glTexCoord1i@4 @269 ++glTexCoord1iv@4 @270 ++glTexCoord1s@4 @271 ++glTexCoord1sv@4 @272 ++glTexCoord2d@16 @273 ++glTexCoord2dv@4 @274 ++glTexCoord2f@8 @275 ++glTexCoord2fv@4 @276 ++glTexCoord2i@8 @277 ++glTexCoord2iv@4 @278 ++glTexCoord2s@8 @279 ++glTexCoord2sv@4 @280 ++glTexCoord3d@24 @281 ++glTexCoord3dv@4 @282 ++glTexCoord3f@12 @283 ++glTexCoord3fv@4 @284 ++glTexCoord3i@12 @285 ++glTexCoord3iv@4 @286 ++glTexCoord3s@12 @287 ++glTexCoord3sv@4 @288 ++glTexCoord4d@32 @289 ++glTexCoord4dv@4 @290 ++glTexCoord4f@16 @291 ++glTexCoord4fv@4 @292 ++glTexCoord4i@16 @293 ++glTexCoord4iv@4 @294 ++glTexCoord4s@16 @295 ++glTexCoord4sv@4 @296 ++glTexCoordPointer@16 @297 ++glTexEnvf@12 @298 ++glTexEnvfv@12 @299 ++glTexEnvi@12 @300 ++glTexEnviv@12 @301 ++glTexGend@16 @302 ++glTexGendv@12 @303 ++glTexGenf@12 @304 ++glTexGenfv@12 @305 ++glTexGeni@12 @306 ++glTexGeniv@12 @307 ++glTexImage1D@32 @308 ++glTexImage2D@36 @309 ++glTexParameterf@12 @310 ++glTexParameterfv@12 @311 ++glTexParameteri@12 @312 ++glTexParameteriv@12 @313 ++glTexSubImage1D@28 @314 ++glTexSubImage2D@36 @315 ++glTranslated@24 @316 ++glTranslatef@12 @317 ++glVertex2d@16 @318 ++glVertex2dv@4 @319 ++glVertex2f@8 @320 ++glVertex2fv@4 @321 ++glVertex2i@8 @322 ++glVertex2iv@4 @323 ++glVertex2s@8 @324 ++glVertex2sv@4 @325 ++glVertex3d@24 @326 ++glVertex3dv@4 @327 ++glVertex3f@12 @328 ++glVertex3fv@4 @329 ++glVertex3i@12 @330 ++glVertex3iv@4 @331 ++glVertex3s@12 @332 ++glVertex3sv@4 @333 ++glVertex4d@32 @334 ++glVertex4dv@4 @335 ++glVertex4f@16 @336 ++glVertex4fv@4 @337 ++glVertex4i@16 @338 ++glVertex4iv@4 @339 ++glVertex4s@16 @340 ++glVertex4sv@4 @341 ++glVertexPointer@16 @342 ++glViewport@16 @343 ++wglChoosePixelFormat@8 @344 ++wglCopyContext@12 @345 ++wglCreateContext@4 @346 ++wglCreateLayerContext@8 @347 ++wglDeleteContext@4 @348 ++wglDescribeLayerPlane@20 @349 ++wglDescribePixelFormat@16 @350 ++wglGetCurrentContext@0 @351 ++wglGetCurrentDC@0 @352 ++;wglGetDefaultProcAddress@4 @353 ++wglGetLayerPaletteEntries@20 @354 ++wglGetPixelFormat@4 @355 ++wglGetProcAddress@4 @356 ++wglMakeCurrent@8 @357 ++wglRealizeLayerPalette@12 @358 ++wglSetLayerPaletteEntries@20 @359 ++wglSetPixelFormat@12 @360 ++wglShareLists@8 @361 ++wglSwapBuffers@4 @362 ++wglSwapLayerBuffers@8 @363 ++wglSwapMultipleBuffers@8 @364 ++wglUseFontBitmapsA@16 @365 ++wglUseFontBitmapsW@16 @366 ++wglUseFontOutlinesA@32 @367 ++wglUseFontOutlinesW@32 @368 ++ ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 +diff --git a/src/gallium/targets/libgl-gdi/opengl32.mingw.def b/src/gallium/targets/libgl-gdi/opengl32.mingw.def +deleted file mode 100644 +index 485c9d44a877e59827d48cb967f30710f6f5749d..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/libgl-gdi/opengl32.mingw.def ++++ /dev/null +@@ -1,357 +0,0 @@ +-EXPORTS +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build +index 38fcaca13b9513d7d69122f3f3734330697695f4..97a9fd954ac61fb6945217e193eb9f1eaab5c590 100644 +--- a/src/gallium/targets/osmesa/meson.build ++++ b/src/gallium/targets/osmesa/meson.build +@@ -32,11 +32,14 @@ if with_ld_version_script + osmesa_link_deps += files('osmesa.sym') + endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- osmesa_def = 'osmesa.mingw.def' +-else +- osmesa_def = 'osmesa.def' +-endif ++osmesa_def = custom_target( ++ 'osmesa.def', ++ input: 'osmesa.def.in', ++ output : 'osmesa.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libosmesa = shared_library( + osmesa_lib_name, +diff --git a/src/gallium/targets/osmesa/osmesa.def b/src/gallium/targets/osmesa/osmesa.def +deleted file mode 100644 +index f6d09b81ef8c42463f8b3a67ac0ced2525b0599a..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.def ++++ /dev/null +@@ -1,354 +0,0 @@ +-;DESCRIPTION 'Mesa OSMesa lib for Win32' +-VERSION 4.1 +- +-EXPORTS +- OSMesaCreateContext +- OSMesaCreateContextAttribs +- OSMesaCreateContextExt +- OSMesaDestroyContext +- OSMesaMakeCurrent +- OSMesaGetCurrentContext +- OSMesaPixelStore +- OSMesaGetIntegerv +- OSMesaGetDepthBuffer +- OSMesaGetColorBuffer +- OSMesaGetProcAddress +- OSMesaColorClamp +- OSMesaPostprocess +- glAccum +- glAlphaFunc +- glAreTexturesResident +- glArrayElement +- glBegin +- glBindTexture +- glBitmap +- glBlendFunc +- glCallList +- glCallLists +- glClear +- glClearAccum +- glClearColor +- glClearDepth +- glClearIndex +- glClearStencil +- glClipPlane +- glColor3b +- glColor3bv +- glColor3d +- glColor3dv +- glColor3f +- glColor3fv +- glColor3i +- glColor3iv +- glColor3s +- glColor3sv +- glColor3ub +- glColor3ubv +- glColor3ui +- glColor3uiv +- glColor3us +- glColor3usv +- glColor4b +- glColor4bv +- glColor4d +- glColor4dv +- glColor4f +- glColor4fv +- glColor4i +- glColor4iv +- glColor4s +- glColor4sv +- glColor4ub +- glColor4ubv +- glColor4ui +- glColor4uiv +- glColor4us +- glColor4usv +- glColorMask +- glColorMaterial +- glColorPointer +- glCopyPixels +- glCopyTexImage1D +- glCopyTexImage2D +- glCopyTexSubImage1D +- glCopyTexSubImage2D +- glCullFace +-; glDebugEntry +- glDeleteLists +- glDeleteTextures +- glDepthFunc +- glDepthMask +- glDepthRange +- glDisable +- glDisableClientState +- glDrawArrays +- glDrawBuffer +- glDrawElements +- glDrawPixels +- glEdgeFlag +- glEdgeFlagPointer +- glEdgeFlagv +- glEnable +- glEnableClientState +- glEnd +- glEndList +- glEvalCoord1d +- glEvalCoord1dv +- glEvalCoord1f +- glEvalCoord1fv +- glEvalCoord2d +- glEvalCoord2dv +- glEvalCoord2f +- glEvalCoord2fv +- glEvalMesh1 +- glEvalMesh2 +- glEvalPoint1 +- glEvalPoint2 +- glFeedbackBuffer +- glFinish +- glFlush +- glFogf +- glFogfv +- glFogi +- glFogiv +- glFrontFace +- glFrustum +- glGenLists +- glGenTextures +- glGetBooleanv +- glGetClipPlane +- glGetDoublev +- glGetError +- glGetFloatv +- glGetIntegerv +- glGetLightfv +- glGetLightiv +- glGetMapdv +- glGetMapfv +- glGetMapiv +- glGetMaterialfv +- glGetMaterialiv +- glGetPixelMapfv +- glGetPixelMapuiv +- glGetPixelMapusv +- glGetPointerv +- glGetPolygonStipple +- glGetString +- glGetTexEnvfv +- glGetTexEnviv +- glGetTexGendv +- glGetTexGenfv +- glGetTexGeniv +- glGetTexImage +- glGetTexLevelParameterfv +- glGetTexLevelParameteriv +- glGetTexParameterfv +- glGetTexParameteriv +- glHint +- glIndexMask +- glIndexPointer +- glIndexd +- glIndexdv +- glIndexf +- glIndexfv +- glIndexi +- glIndexiv +- glIndexs +- glIndexsv +- glIndexub +- glIndexubv +- glInitNames +- glInterleavedArrays +- glIsEnabled +- glIsList +- glIsTexture +- glLightModelf +- glLightModelfv +- glLightModeli +- glLightModeliv +- glLightf +- glLightfv +- glLighti +- glLightiv +- glLineStipple +- glLineWidth +- glListBase +- glLoadIdentity +- glLoadMatrixd +- glLoadMatrixf +- glLoadName +- glLogicOp +- glMap1d +- glMap1f +- glMap2d +- glMap2f +- glMapGrid1d +- glMapGrid1f +- glMapGrid2d +- glMapGrid2f +- glMaterialf +- glMaterialfv +- glMateriali +- glMaterialiv +- glMatrixMode +- glMultMatrixd +- glMultMatrixf +- glNewList +- glNormal3b +- glNormal3bv +- glNormal3d +- glNormal3dv +- glNormal3f +- glNormal3fv +- glNormal3i +- glNormal3iv +- glNormal3s +- glNormal3sv +- glNormalPointer +- glOrtho +- glPassThrough +- glPixelMapfv +- glPixelMapuiv +- glPixelMapusv +- glPixelStoref +- glPixelStorei +- glPixelTransferf +- glPixelTransferi +- glPixelZoom +- glPointSize +- glPolygonMode +- glPolygonOffset +- glPolygonStipple +- glPopAttrib +- glPopClientAttrib +- glPopMatrix +- glPopName +- glPrioritizeTextures +- glPushAttrib +- glPushClientAttrib +- glPushMatrix +- glPushName +- glRasterPos2d +- glRasterPos2dv +- glRasterPos2f +- glRasterPos2fv +- glRasterPos2i +- glRasterPos2iv +- glRasterPos2s +- glRasterPos2sv +- glRasterPos3d +- glRasterPos3dv +- glRasterPos3f +- glRasterPos3fv +- glRasterPos3i +- glRasterPos3iv +- glRasterPos3s +- glRasterPos3sv +- glRasterPos4d +- glRasterPos4dv +- glRasterPos4f +- glRasterPos4fv +- glRasterPos4i +- glRasterPos4iv +- glRasterPos4s +- glRasterPos4sv +- glReadBuffer +- glReadPixels +- glRectd +- glRectdv +- glRectf +- glRectfv +- glRecti +- glRectiv +- glRects +- glRectsv +- glRenderMode +- glRotated +- glRotatef +- glScaled +- glScalef +- glScissor +- glSelectBuffer +- glShadeModel +- glStencilFunc +- glStencilMask +- glStencilOp +- glTexCoord1d +- glTexCoord1dv +- glTexCoord1f +- glTexCoord1fv +- glTexCoord1i +- glTexCoord1iv +- glTexCoord1s +- glTexCoord1sv +- glTexCoord2d +- glTexCoord2dv +- glTexCoord2f +- glTexCoord2fv +- glTexCoord2i +- glTexCoord2iv +- glTexCoord2s +- glTexCoord2sv +- glTexCoord3d +- glTexCoord3dv +- glTexCoord3f +- glTexCoord3fv +- glTexCoord3i +- glTexCoord3iv +- glTexCoord3s +- glTexCoord3sv +- glTexCoord4d +- glTexCoord4dv +- glTexCoord4f +- glTexCoord4fv +- glTexCoord4i +- glTexCoord4iv +- glTexCoord4s +- glTexCoord4sv +- glTexCoordPointer +- glTexEnvf +- glTexEnvfv +- glTexEnvi +- glTexEnviv +- glTexGend +- glTexGendv +- glTexGenf +- glTexGenfv +- glTexGeni +- glTexGeniv +- glTexImage1D +- glTexImage2D +- glTexParameterf +- glTexParameterfv +- glTexParameteri +- glTexParameteriv +- glTexSubImage1D +- glTexSubImage2D +- glTranslated +- glTranslatef +- glVertex2d +- glVertex2dv +- glVertex2f +- glVertex2fv +- glVertex2i +- glVertex2iv +- glVertex2s +- glVertex2sv +- glVertex3d +- glVertex3dv +- glVertex3f +- glVertex3fv +- glVertex3i +- glVertex3iv +- glVertex3s +- glVertex3sv +- glVertex4d +- glVertex4dv +- glVertex4f +- glVertex4fv +- glVertex4i +- glVertex4iv +- glVertex4s +- glVertex4sv +- glVertexPointer +- glViewport +diff --git a/src/gallium/targets/osmesa/osmesa.def.in b/src/gallium/targets/osmesa/osmesa.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..d60457797963451ff3fd4f13690d1bab971bc5b3 +--- /dev/null ++++ b/src/gallium/targets/osmesa/osmesa.def.in +@@ -0,0 +1,353 @@ ++; Mesa OSMesa lib for Win32 ++ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++OSMesaCreateContext@8 ++OSMesaCreateContextAttribs@8 ++OSMesaCreateContextExt@20 ++OSMesaDestroyContext@4 ++OSMesaMakeCurrent@20 ++OSMesaGetCurrentContext@0 ++OSMesaPixelStore@8 ++OSMesaGetIntegerv@8 ++OSMesaGetDepthBuffer@20 ++OSMesaGetColorBuffer@20 ++OSMesaGetProcAddress@4 ++OSMesaColorClamp@4 ++OSMesaPostprocess@12 ++glAccum@8 ++glAlphaFunc@8 ++glAreTexturesResident@12 ++glArrayElement@4 ++glBegin@4 ++glBindTexture@8 ++glBitmap@28 ++glBlendFunc@8 ++glCallList@4 ++glCallLists@12 ++glClear@4 ++glClearAccum@16 ++glClearColor@16 ++glClearDepth@8 ++glClearIndex@4 ++glClearStencil@4 ++glClipPlane@8 ++glColor3b@12 ++glColor3bv@4 ++glColor3d@24 ++glColor3dv@4 ++glColor3f@12 ++glColor3fv@4 ++glColor3i@12 ++glColor3iv@4 ++glColor3s@12 ++glColor3sv@4 ++glColor3ub@12 ++glColor3ubv@4 ++glColor3ui@12 ++glColor3uiv@4 ++glColor3us@12 ++glColor3usv@4 ++glColor4b@16 ++glColor4bv@4 ++glColor4d@32 ++glColor4dv@4 ++glColor4f@16 ++glColor4fv@4 ++glColor4i@16 ++glColor4iv@4 ++glColor4s@16 ++glColor4sv@4 ++glColor4ub@16 ++glColor4ubv@4 ++glColor4ui@16 ++glColor4uiv@4 ++glColor4us@16 ++glColor4usv@4 ++glColorMask@16 ++glColorMaterial@8 ++glColorPointer@16 ++glCopyPixels@20 ++glCopyTexImage1D@28 ++glCopyTexImage2D@32 ++glCopyTexSubImage1D@24 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++;glDebugEntry@8 ++glDeleteLists@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRange@16 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawBuffer@4 ++glDrawElements@16 ++glDrawPixels@20 ++glEdgeFlag@4 ++glEdgeFlagPointer@8 ++glEdgeFlagv@4 ++glEnable@4 ++glEnableClientState@4 ++glEnd@0 ++glEndList@0 ++glEvalCoord1d@8 ++glEvalCoord1dv@4 ++glEvalCoord1f@4 ++glEvalCoord1fv@4 ++glEvalCoord2d@16 ++glEvalCoord2dv@4 ++glEvalCoord2f@8 ++glEvalCoord2fv@4 ++glEvalMesh1@12 ++glEvalMesh2@20 ++glEvalPoint1@4 ++glEvalPoint2@8 ++glFeedbackBuffer@12 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogi@8 ++glFogiv@8 ++glFrontFace@4 ++glFrustum@48 ++glGenLists@4 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetClipPlane@8 ++glGetDoublev@8 ++glGetError@0 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightiv@12 ++glGetMapdv@12 ++glGetMapfv@12 ++glGetMapiv@12 ++glGetMaterialfv@12 ++glGetMaterialiv@12 ++glGetPixelMapfv@8 ++glGetPixelMapuiv@8 ++glGetPixelMapusv@8 ++glGetPointerv@8 ++glGetPolygonStipple@4 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexGendv@12 ++glGetTexGenfv@12 ++glGetTexGeniv@12 ++glGetTexImage@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glHint@8 ++glIndexMask@4 ++glIndexPointer@12 ++glIndexd@8 ++glIndexdv@4 ++glIndexf@4 ++glIndexfv@4 ++glIndexi@4 ++glIndexiv@4 ++glIndexs@4 ++glIndexsv@4 ++glIndexub@4 ++glIndexubv@4 ++glInitNames@0 ++glInterleavedArrays@12 ++glIsEnabled@4 ++glIsList@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModeli@8 ++glLightModeliv@8 ++glLightf@12 ++glLightfv@12 ++glLighti@12 ++glLightiv@12 ++glLineStipple@8 ++glLineWidth@4 ++glListBase@4 ++glLoadIdentity@0 ++glLoadMatrixd@4 ++glLoadMatrixf@4 ++glLoadName@4 ++glLogicOp@4 ++glMap1d@32 ++glMap1f@24 ++glMap2d@56 ++glMap2f@40 ++glMapGrid1d@20 ++glMapGrid1f@12 ++glMapGrid2d@40 ++glMapGrid2f@24 ++glMaterialf@12 ++glMaterialfv@12 ++glMateriali@12 ++glMaterialiv@12 ++glMatrixMode@4 ++glMultMatrixd@4 ++glMultMatrixf@4 ++glNewList@8 ++glNormal3b@12 ++glNormal3bv@4 ++glNormal3d@24 ++glNormal3dv@4 ++glNormal3f@12 ++glNormal3fv@4 ++glNormal3i@12 ++glNormal3iv@4 ++glNormal3s@12 ++glNormal3sv@4 ++glNormalPointer@12 ++glOrtho@48 ++glPassThrough@4 ++glPixelMapfv@12 ++glPixelMapuiv@12 ++glPixelMapusv@12 ++glPixelStoref@8 ++glPixelStorei@8 ++glPixelTransferf@8 ++glPixelTransferi@8 ++glPixelZoom@8 ++glPointSize@4 ++glPolygonMode@8 ++glPolygonOffset@8 ++glPolygonStipple@4 ++glPopAttrib@0 ++glPopClientAttrib@0 ++glPopMatrix@0 ++glPopName@0 ++glPrioritizeTextures@12 ++glPushAttrib@4 ++glPushClientAttrib@4 ++glPushMatrix@0 ++glPushName@4 ++glRasterPos2d@16 ++glRasterPos2dv@4 ++glRasterPos2f@8 ++glRasterPos2fv@4 ++glRasterPos2i@8 ++glRasterPos2iv@4 ++glRasterPos2s@8 ++glRasterPos2sv@4 ++glRasterPos3d@24 ++glRasterPos3dv@4 ++glRasterPos3f@12 ++glRasterPos3fv@4 ++glRasterPos3i@12 ++glRasterPos3iv@4 ++glRasterPos3s@12 ++glRasterPos3sv@4 ++glRasterPos4d@32 ++glRasterPos4dv@4 ++glRasterPos4f@16 ++glRasterPos4fv@4 ++glRasterPos4i@16 ++glRasterPos4iv@4 ++glRasterPos4s@16 ++glRasterPos4sv@4 ++glReadBuffer@4 ++glReadPixels@28 ++glRectd@32 ++glRectdv@8 ++glRectf@16 ++glRectfv@8 ++glRecti@16 ++glRectiv@8 ++glRects@16 ++glRectsv@8 ++glRenderMode@4 ++glRotated@32 ++glRotatef@16 ++glScaled@24 ++glScalef@12 ++glScissor@16 ++glSelectBuffer@8 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoord1d@8 ++glTexCoord1dv@4 ++glTexCoord1f@4 ++glTexCoord1fv@4 ++glTexCoord1i@4 ++glTexCoord1iv@4 ++glTexCoord1s@4 ++glTexCoord1sv@4 ++glTexCoord2d@16 ++glTexCoord2dv@4 ++glTexCoord2f@8 ++glTexCoord2fv@4 ++glTexCoord2i@8 ++glTexCoord2iv@4 ++glTexCoord2s@8 ++glTexCoord2sv@4 ++glTexCoord3d@24 ++glTexCoord3dv@4 ++glTexCoord3f@12 ++glTexCoord3fv@4 ++glTexCoord3i@12 ++glTexCoord3iv@4 ++glTexCoord3s@12 ++glTexCoord3sv@4 ++glTexCoord4d@32 ++glTexCoord4dv@4 ++glTexCoord4f@16 ++glTexCoord4fv@4 ++glTexCoord4i@16 ++glTexCoord4iv@4 ++glTexCoord4s@16 ++glTexCoord4sv@4 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexGend@16 ++glTexGendv@12 ++glTexGenf@12 ++glTexGenfv@12 ++glTexGeni@12 ++glTexGeniv@12 ++glTexImage1D@32 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexSubImage1D@28 ++glTexSubImage2D@36 ++glTranslated@24 ++glTranslatef@12 ++glVertex2d@16 ++glVertex2dv@4 ++glVertex2f@8 ++glVertex2fv@4 ++glVertex2i@8 ++glVertex2iv@4 ++glVertex2s@8 ++glVertex2sv@4 ++glVertex3d@24 ++glVertex3dv@4 ++glVertex3f@12 ++glVertex3fv@4 ++glVertex3i@12 ++glVertex3iv@4 ++glVertex3s@12 ++glVertex3sv@4 ++glVertex4d@32 ++glVertex4dv@4 ++glVertex4f@16 ++glVertex4fv@4 ++glVertex4i@16 ++glVertex4iv@4 ++glVertex4s@16 ++glVertex4sv@4 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/gallium/targets/osmesa/osmesa.mingw.def b/src/gallium/targets/osmesa/osmesa.mingw.def +deleted file mode 100644 +index b77af60a93f2fcf9c73262993d6d204563e3eeae..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/osmesa/osmesa.mingw.def ++++ /dev/null +@@ -1,351 +0,0 @@ +-EXPORTS +- OSMesaCreateContext = OSMesaCreateContext@8 +- OSMesaCreateContextAttribs = OSMesaCreateContextAttribs@8 +- OSMesaCreateContextExt = OSMesaCreateContextExt@20 +- OSMesaDestroyContext = OSMesaDestroyContext@4 +- OSMesaMakeCurrent = OSMesaMakeCurrent@20 +- OSMesaGetCurrentContext = OSMesaGetCurrentContext@0 +- OSMesaPixelStore = OSMesaPixelStore@8 +- OSMesaGetIntegerv = OSMesaGetIntegerv@8 +- OSMesaGetDepthBuffer = OSMesaGetDepthBuffer@20 +- OSMesaGetColorBuffer = OSMesaGetColorBuffer@20 +- OSMesaGetProcAddress = OSMesaGetProcAddress@4 +- OSMesaColorClamp = OSMesaColorClamp@4 +- OSMesaPostprocess = OSMesaPostprocess@12 +- glAccum = glAccum@8 +- glAlphaFunc = glAlphaFunc@8 +- glAreTexturesResident = glAreTexturesResident@12 +- glArrayElement = glArrayElement@4 +- glBegin = glBegin@4 +- glBindTexture = glBindTexture@8 +- glBitmap = glBitmap@28 +- glBlendFunc = glBlendFunc@8 +- glCallList = glCallList@4 +- glCallLists = glCallLists@12 +- glClear = glClear@4 +- glClearAccum = glClearAccum@16 +- glClearColor = glClearColor@16 +- glClearDepth = glClearDepth@8 +- glClearIndex = glClearIndex@4 +- glClearStencil = glClearStencil@4 +- glClipPlane = glClipPlane@8 +- glColor3b = glColor3b@12 +- glColor3bv = glColor3bv@4 +- glColor3d = glColor3d@24 +- glColor3dv = glColor3dv@4 +- glColor3f = glColor3f@12 +- glColor3fv = glColor3fv@4 +- glColor3i = glColor3i@12 +- glColor3iv = glColor3iv@4 +- glColor3s = glColor3s@12 +- glColor3sv = glColor3sv@4 +- glColor3ub = glColor3ub@12 +- glColor3ubv = glColor3ubv@4 +- glColor3ui = glColor3ui@12 +- glColor3uiv = glColor3uiv@4 +- glColor3us = glColor3us@12 +- glColor3usv = glColor3usv@4 +- glColor4b = glColor4b@16 +- glColor4bv = glColor4bv@4 +- glColor4d = glColor4d@32 +- glColor4dv = glColor4dv@4 +- glColor4f = glColor4f@16 +- glColor4fv = glColor4fv@4 +- glColor4i = glColor4i@16 +- glColor4iv = glColor4iv@4 +- glColor4s = glColor4s@16 +- glColor4sv = glColor4sv@4 +- glColor4ub = glColor4ub@16 +- glColor4ubv = glColor4ubv@4 +- glColor4ui = glColor4ui@16 +- glColor4uiv = glColor4uiv@4 +- glColor4us = glColor4us@16 +- glColor4usv = glColor4usv@4 +- glColorMask = glColorMask@16 +- glColorMaterial = glColorMaterial@8 +- glColorPointer = glColorPointer@16 +- glCopyPixels = glCopyPixels@20 +- glCopyTexImage1D = glCopyTexImage1D@28 +- glCopyTexImage2D = glCopyTexImage2D@32 +- glCopyTexSubImage1D = glCopyTexSubImage1D@24 +- glCopyTexSubImage2D = glCopyTexSubImage2D@32 +- glCullFace = glCullFace@4 +-; glDebugEntry = glDebugEntry@8 +- glDeleteLists = glDeleteLists@8 +- glDeleteTextures = glDeleteTextures@8 +- glDepthFunc = glDepthFunc@4 +- glDepthMask = glDepthMask@4 +- glDepthRange = glDepthRange@16 +- glDisable = glDisable@4 +- glDisableClientState = glDisableClientState@4 +- glDrawArrays = glDrawArrays@12 +- glDrawBuffer = glDrawBuffer@4 +- glDrawElements = glDrawElements@16 +- glDrawPixels = glDrawPixels@20 +- glEdgeFlag = glEdgeFlag@4 +- glEdgeFlagPointer = glEdgeFlagPointer@8 +- glEdgeFlagv = glEdgeFlagv@4 +- glEnable = glEnable@4 +- glEnableClientState = glEnableClientState@4 +- glEnd = glEnd@0 +- glEndList = glEndList@0 +- glEvalCoord1d = glEvalCoord1d@8 +- glEvalCoord1dv = glEvalCoord1dv@4 +- glEvalCoord1f = glEvalCoord1f@4 +- glEvalCoord1fv = glEvalCoord1fv@4 +- glEvalCoord2d = glEvalCoord2d@16 +- glEvalCoord2dv = glEvalCoord2dv@4 +- glEvalCoord2f = glEvalCoord2f@8 +- glEvalCoord2fv = glEvalCoord2fv@4 +- glEvalMesh1 = glEvalMesh1@12 +- glEvalMesh2 = glEvalMesh2@20 +- glEvalPoint1 = glEvalPoint1@4 +- glEvalPoint2 = glEvalPoint2@8 +- glFeedbackBuffer = glFeedbackBuffer@12 +- glFinish = glFinish@0 +- glFlush = glFlush@0 +- glFogf = glFogf@8 +- glFogfv = glFogfv@8 +- glFogi = glFogi@8 +- glFogiv = glFogiv@8 +- glFrontFace = glFrontFace@4 +- glFrustum = glFrustum@48 +- glGenLists = glGenLists@4 +- glGenTextures = glGenTextures@8 +- glGetBooleanv = glGetBooleanv@8 +- glGetClipPlane = glGetClipPlane@8 +- glGetDoublev = glGetDoublev@8 +- glGetError = glGetError@0 +- glGetFloatv = glGetFloatv@8 +- glGetIntegerv = glGetIntegerv@8 +- glGetLightfv = glGetLightfv@12 +- glGetLightiv = glGetLightiv@12 +- glGetMapdv = glGetMapdv@12 +- glGetMapfv = glGetMapfv@12 +- glGetMapiv = glGetMapiv@12 +- glGetMaterialfv = glGetMaterialfv@12 +- glGetMaterialiv = glGetMaterialiv@12 +- glGetPixelMapfv = glGetPixelMapfv@8 +- glGetPixelMapuiv = glGetPixelMapuiv@8 +- glGetPixelMapusv = glGetPixelMapusv@8 +- glGetPointerv = glGetPointerv@8 +- glGetPolygonStipple = glGetPolygonStipple@4 +- glGetString = glGetString@4 +- glGetTexEnvfv = glGetTexEnvfv@12 +- glGetTexEnviv = glGetTexEnviv@12 +- glGetTexGendv = glGetTexGendv@12 +- glGetTexGenfv = glGetTexGenfv@12 +- glGetTexGeniv = glGetTexGeniv@12 +- glGetTexImage = glGetTexImage@20 +- glGetTexLevelParameterfv = glGetTexLevelParameterfv@16 +- glGetTexLevelParameteriv = glGetTexLevelParameteriv@16 +- glGetTexParameterfv = glGetTexParameterfv@12 +- glGetTexParameteriv = glGetTexParameteriv@12 +- glHint = glHint@8 +- glIndexMask = glIndexMask@4 +- glIndexPointer = glIndexPointer@12 +- glIndexd = glIndexd@8 +- glIndexdv = glIndexdv@4 +- glIndexf = glIndexf@4 +- glIndexfv = glIndexfv@4 +- glIndexi = glIndexi@4 +- glIndexiv = glIndexiv@4 +- glIndexs = glIndexs@4 +- glIndexsv = glIndexsv@4 +- glIndexub = glIndexub@4 +- glIndexubv = glIndexubv@4 +- glInitNames = glInitNames@0 +- glInterleavedArrays = glInterleavedArrays@12 +- glIsEnabled = glIsEnabled@4 +- glIsList = glIsList@4 +- glIsTexture = glIsTexture@4 +- glLightModelf = glLightModelf@8 +- glLightModelfv = glLightModelfv@8 +- glLightModeli = glLightModeli@8 +- glLightModeliv = glLightModeliv@8 +- glLightf = glLightf@12 +- glLightfv = glLightfv@12 +- glLighti = glLighti@12 +- glLightiv = glLightiv@12 +- glLineStipple = glLineStipple@8 +- glLineWidth = glLineWidth@4 +- glListBase = glListBase@4 +- glLoadIdentity = glLoadIdentity@0 +- glLoadMatrixd = glLoadMatrixd@4 +- glLoadMatrixf = glLoadMatrixf@4 +- glLoadName = glLoadName@4 +- glLogicOp = glLogicOp@4 +- glMap1d = glMap1d@32 +- glMap1f = glMap1f@24 +- glMap2d = glMap2d@56 +- glMap2f = glMap2f@40 +- glMapGrid1d = glMapGrid1d@20 +- glMapGrid1f = glMapGrid1f@12 +- glMapGrid2d = glMapGrid2d@40 +- glMapGrid2f = glMapGrid2f@24 +- glMaterialf = glMaterialf@12 +- glMaterialfv = glMaterialfv@12 +- glMateriali = glMateriali@12 +- glMaterialiv = glMaterialiv@12 +- glMatrixMode = glMatrixMode@4 +- glMultMatrixd = glMultMatrixd@4 +- glMultMatrixf = glMultMatrixf@4 +- glNewList = glNewList@8 +- glNormal3b = glNormal3b@12 +- glNormal3bv = glNormal3bv@4 +- glNormal3d = glNormal3d@24 +- glNormal3dv = glNormal3dv@4 +- glNormal3f = glNormal3f@12 +- glNormal3fv = glNormal3fv@4 +- glNormal3i = glNormal3i@12 +- glNormal3iv = glNormal3iv@4 +- glNormal3s = glNormal3s@12 +- glNormal3sv = glNormal3sv@4 +- glNormalPointer = glNormalPointer@12 +- glOrtho = glOrtho@48 +- glPassThrough = glPassThrough@4 +- glPixelMapfv = glPixelMapfv@12 +- glPixelMapuiv = glPixelMapuiv@12 +- glPixelMapusv = glPixelMapusv@12 +- glPixelStoref = glPixelStoref@8 +- glPixelStorei = glPixelStorei@8 +- glPixelTransferf = glPixelTransferf@8 +- glPixelTransferi = glPixelTransferi@8 +- glPixelZoom = glPixelZoom@8 +- glPointSize = glPointSize@4 +- glPolygonMode = glPolygonMode@8 +- glPolygonOffset = glPolygonOffset@8 +- glPolygonStipple = glPolygonStipple@4 +- glPopAttrib = glPopAttrib@0 +- glPopClientAttrib = glPopClientAttrib@0 +- glPopMatrix = glPopMatrix@0 +- glPopName = glPopName@0 +- glPrioritizeTextures = glPrioritizeTextures@12 +- glPushAttrib = glPushAttrib@4 +- glPushClientAttrib = glPushClientAttrib@4 +- glPushMatrix = glPushMatrix@0 +- glPushName = glPushName@4 +- glRasterPos2d = glRasterPos2d@16 +- glRasterPos2dv = glRasterPos2dv@4 +- glRasterPos2f = glRasterPos2f@8 +- glRasterPos2fv = glRasterPos2fv@4 +- glRasterPos2i = glRasterPos2i@8 +- glRasterPos2iv = glRasterPos2iv@4 +- glRasterPos2s = glRasterPos2s@8 +- glRasterPos2sv = glRasterPos2sv@4 +- glRasterPos3d = glRasterPos3d@24 +- glRasterPos3dv = glRasterPos3dv@4 +- glRasterPos3f = glRasterPos3f@12 +- glRasterPos3fv = glRasterPos3fv@4 +- glRasterPos3i = glRasterPos3i@12 +- glRasterPos3iv = glRasterPos3iv@4 +- glRasterPos3s = glRasterPos3s@12 +- glRasterPos3sv = glRasterPos3sv@4 +- glRasterPos4d = glRasterPos4d@32 +- glRasterPos4dv = glRasterPos4dv@4 +- glRasterPos4f = glRasterPos4f@16 +- glRasterPos4fv = glRasterPos4fv@4 +- glRasterPos4i = glRasterPos4i@16 +- glRasterPos4iv = glRasterPos4iv@4 +- glRasterPos4s = glRasterPos4s@16 +- glRasterPos4sv = glRasterPos4sv@4 +- glReadBuffer = glReadBuffer@4 +- glReadPixels = glReadPixels@28 +- glRectd = glRectd@32 +- glRectdv = glRectdv@8 +- glRectf = glRectf@16 +- glRectfv = glRectfv@8 +- glRecti = glRecti@16 +- glRectiv = glRectiv@8 +- glRects = glRects@16 +- glRectsv = glRectsv@8 +- glRenderMode = glRenderMode@4 +- glRotated = glRotated@32 +- glRotatef = glRotatef@16 +- glScaled = glScaled@24 +- glScalef = glScalef@12 +- glScissor = glScissor@16 +- glSelectBuffer = glSelectBuffer@8 +- glShadeModel = glShadeModel@4 +- glStencilFunc = glStencilFunc@12 +- glStencilMask = glStencilMask@4 +- glStencilOp = glStencilOp@12 +- glTexCoord1d = glTexCoord1d@8 +- glTexCoord1dv = glTexCoord1dv@4 +- glTexCoord1f = glTexCoord1f@4 +- glTexCoord1fv = glTexCoord1fv@4 +- glTexCoord1i = glTexCoord1i@4 +- glTexCoord1iv = glTexCoord1iv@4 +- glTexCoord1s = glTexCoord1s@4 +- glTexCoord1sv = glTexCoord1sv@4 +- glTexCoord2d = glTexCoord2d@16 +- glTexCoord2dv = glTexCoord2dv@4 +- glTexCoord2f = glTexCoord2f@8 +- glTexCoord2fv = glTexCoord2fv@4 +- glTexCoord2i = glTexCoord2i@8 +- glTexCoord2iv = glTexCoord2iv@4 +- glTexCoord2s = glTexCoord2s@8 +- glTexCoord2sv = glTexCoord2sv@4 +- glTexCoord3d = glTexCoord3d@24 +- glTexCoord3dv = glTexCoord3dv@4 +- glTexCoord3f = glTexCoord3f@12 +- glTexCoord3fv = glTexCoord3fv@4 +- glTexCoord3i = glTexCoord3i@12 +- glTexCoord3iv = glTexCoord3iv@4 +- glTexCoord3s = glTexCoord3s@12 +- glTexCoord3sv = glTexCoord3sv@4 +- glTexCoord4d = glTexCoord4d@32 +- glTexCoord4dv = glTexCoord4dv@4 +- glTexCoord4f = glTexCoord4f@16 +- glTexCoord4fv = glTexCoord4fv@4 +- glTexCoord4i = glTexCoord4i@16 +- glTexCoord4iv = glTexCoord4iv@4 +- glTexCoord4s = glTexCoord4s@16 +- glTexCoord4sv = glTexCoord4sv@4 +- glTexCoordPointer = glTexCoordPointer@16 +- glTexEnvf = glTexEnvf@12 +- glTexEnvfv = glTexEnvfv@12 +- glTexEnvi = glTexEnvi@12 +- glTexEnviv = glTexEnviv@12 +- glTexGend = glTexGend@16 +- glTexGendv = glTexGendv@12 +- glTexGenf = glTexGenf@12 +- glTexGenfv = glTexGenfv@12 +- glTexGeni = glTexGeni@12 +- glTexGeniv = glTexGeniv@12 +- glTexImage1D = glTexImage1D@32 +- glTexImage2D = glTexImage2D@36 +- glTexParameterf = glTexParameterf@12 +- glTexParameterfv = glTexParameterfv@12 +- glTexParameteri = glTexParameteri@12 +- glTexParameteriv = glTexParameteriv@12 +- glTexSubImage1D = glTexSubImage1D@28 +- glTexSubImage2D = glTexSubImage2D@36 +- glTranslated = glTranslated@24 +- glTranslatef = glTranslatef@12 +- glVertex2d = glVertex2d@16 +- glVertex2dv = glVertex2dv@4 +- glVertex2f = glVertex2f@8 +- glVertex2fv = glVertex2fv@4 +- glVertex2i = glVertex2i@8 +- glVertex2iv = glVertex2iv@4 +- glVertex2s = glVertex2s@8 +- glVertex2sv = glVertex2sv@4 +- glVertex3d = glVertex3d@24 +- glVertex3dv = glVertex3dv@4 +- glVertex3f = glVertex3f@12 +- glVertex3fv = glVertex3fv@4 +- glVertex3i = glVertex3i@12 +- glVertex3iv = glVertex3iv@4 +- glVertex3s = glVertex3s@12 +- glVertex3sv = glVertex3sv@4 +- glVertex4d = glVertex4d@32 +- glVertex4dv = glVertex4dv@4 +- glVertex4f = glVertex4f@16 +- glVertex4fv = glVertex4fv@4 +- glVertex4i = glVertex4i@16 +- glVertex4iv = glVertex4iv@4 +- glVertex4s = glVertex4s@16 +- glVertex4sv = glVertex4sv@4 +- glVertexPointer = glVertexPointer@16 +- glViewport = glViewport@16 +diff --git a/src/gallium/targets/wgl/gallium_wgl.def b/src/gallium/targets/wgl/gallium_wgl.def +deleted file mode 100644 +index 6d39d2eadc9bb2e941f3399efcc54f4b1c2c79da..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.def ++++ /dev/null +@@ -1,38 +0,0 @@ +-EXPORTS +- DrvCopyContext +- DrvCreateContext +- DrvCreateLayerContext +- DrvDeleteContext +- DrvDescribeLayerPlane +- DrvDescribePixelFormat +- DrvGetLayerPaletteEntries +- DrvGetProcAddress +- DrvPresentBuffers +- DrvRealizeLayerPalette +- DrvReleaseContext +- DrvSetCallbackProcs +- DrvSetContext +- DrvSetLayerPaletteEntries +- DrvSetPixelFormat +- DrvShareLists +- DrvSwapBuffers +- DrvSwapLayerBuffers +- DrvValidateVersion +- +- stw_get_device +- stw_init_screen +- stw_get_current_context +- stw_get_current_dc +- stw_pixelformat_choose +- stw_pixelformat_get +- stw_pixelformat_get_info +- stw_override_opengl32_entry_points +- stw_create_context_attribs +- stw_destroy_context +- stw_unbind_context +- stw_current_context +- stw_make_current +- stw_framebuffer_create +- stw_framebuffer_release_locked +- stw_framebuffer_unlock +- stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.def.in b/src/gallium/targets/wgl/gallium_wgl.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..860389d48cc44bd61c4a3df6d1405c2ccf06f099 +--- /dev/null ++++ b/src/gallium/targets/wgl/gallium_wgl.def.in +@@ -0,0 +1,39 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++DrvCopyContext@12 ++DrvCreateContext@4 ++DrvCreateLayerContext@8 ++DrvDeleteContext@4 ++DrvDescribeLayerPlane@20 ++DrvDescribePixelFormat@16 ++DrvGetLayerPaletteEntries@20 ++DrvGetProcAddress@4 ++DrvPresentBuffers@8 ++DrvRealizeLayerPalette@12 ++DrvReleaseContext@4 ++DrvSetCallbackProcs@8 ++DrvSetContext@12 ++DrvSetLayerPaletteEntries@20 ++DrvSetPixelFormat@8 ++DrvShareLists@8 ++DrvSwapBuffers@4 ++DrvSwapLayerBuffers@8 ++DrvValidateVersion@4 ++ ++; __cdecl calling convention have no @number suffix ++stw_get_device ++stw_init_screen ++stw_get_current_context ++stw_get_current_dc ++stw_pixelformat_choose ++stw_pixelformat_get ++stw_pixelformat_get_info ++stw_override_opengl32_entry_points ++stw_create_context_attribs ++stw_destroy_context ++stw_unbind_context ++stw_current_context ++stw_make_current ++stw_framebuffer_create ++stw_framebuffer_release_locked ++stw_framebuffer_unlock ++stw_framebuffer_swap_locked +diff --git a/src/gallium/targets/wgl/gallium_wgl.mingw.def b/src/gallium/targets/wgl/gallium_wgl.mingw.def +deleted file mode 100644 +index ee23392d95ec26ca1d774f57b5979a153eab76a0..0000000000000000000000000000000000000000 +--- a/src/gallium/targets/wgl/gallium_wgl.mingw.def ++++ /dev/null +@@ -1,26 +0,0 @@ +-EXPORTS +- DrvCopyContext = DrvCopyContext@12 +- DrvCreateContext = DrvCreateContext@4 +- DrvCreateLayerContext = DrvCreateLayerContext@8 +- DrvDeleteContext = DrvDeleteContext@4 +- DrvDescribeLayerPlane = DrvDescribeLayerPlane@20 +- DrvDescribePixelFormat = DrvDescribePixelFormat@16 +- DrvGetLayerPaletteEntries = DrvGetLayerPaletteEntries@20 +- DrvGetProcAddress = DrvGetProcAddress@4 +- DrvPresentBuffers = DrvPresentBuffers@8 +- DrvRealizeLayerPalette = DrvRealizeLayerPalette@12 +- DrvReleaseContext = DrvReleaseContext@4 +- DrvSetCallbackProcs = DrvSetCallbackProcs@8 +- DrvSetContext = DrvSetContext@12 +- DrvSetLayerPaletteEntries = DrvSetLayerPaletteEntries@20 +- DrvSetPixelFormat = DrvSetPixelFormat@8 +- DrvShareLists = DrvShareLists@8 +- DrvSwapBuffers = DrvSwapBuffers@4 +- DrvSwapLayerBuffers = DrvSwapLayerBuffers@8 +- DrvValidateVersion = DrvValidateVersion@4 +- +- stw_get_current_context = stw_get_current_context@0 +- stw_get_current_dc = stw_get_current_dc@0 +- stw_pixelformat_choose = stw_pixelformat_choose@8 +- stw_pixelformat_get = stw_pixelformat_get@4 +- stw_override_opengl32_entry_points = stw_override_opengl32_entry_points@8 +diff --git a/src/gallium/targets/wgl/meson.build b/src/gallium/targets/wgl/meson.build +index 92571a7c8f7bcf6847360bcd725732bd144f35c9..ace7c33eb9499a8058598570890d3e408918e7ff 100644 +--- a/src/gallium/targets/wgl/meson.build ++++ b/src/gallium/targets/wgl/meson.build +@@ -20,15 +20,15 @@ + + + gallium_wgl_link_args = [] +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- gallium_wgl_link_args += ['-Wl,--enable-stdcall-fixup'] +-endif + +-if cc.get_id() == 'gcc' and host_machine.cpu_family() != 'x86_64' +- wgl_def = 'gallium_wgl.mingw.def' +-else +- wgl_def = 'gallium_wgl.def' +-endif ++wgl_def = custom_target( ++ 'gallium_wgl.def', ++ input: 'gallium_wgl.def.in', ++ output : 'gallium_wgl.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) + + libgallium_wgl = shared_library( + 'gallium_wgl', +diff --git a/src/mapi/es1api/gles1.def.in b/src/mapi/es1api/gles1.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..b09aff6a8739e1ce197f8abe481f4b79a94d3adb +--- /dev/null ++++ b/src/mapi/es1api/gles1.def.in +@@ -0,0 +1,146 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveTexture@4 ++glAlphaFunc@8 ++glAlphaFuncx@8 ++glBindBuffer@8 ++glBindTexture@8 ++glBlendFunc@8 ++glBufferData@16 ++glBufferSubData@16 ++glClear@4 ++glClearColor@16 ++glClearColorx@16 ++glClearDepthf@4 ++glClearDepthx@4 ++glClearStencil@4 ++glClientActiveTexture@4 ++glClipPlanef@8 ++glClipPlanex@8 ++glColor4f@16 ++glColor4ub@16 ++glColor4x@16 ++glColorMask@16 ++glColorPointer@16 ++glCompressedTexImage2D@32 ++glCompressedTexSubImage2D@36 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCullFace@4 ++glDeleteBuffers@8 ++glDeleteTextures@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDepthRangex@8 ++glDisable@4 ++glDisableClientState@4 ++glDrawArrays@12 ++glDrawElements@16 ++glEnable@4 ++glEnableClientState@4 ++glFinish@0 ++glFlush@0 ++glFogf@8 ++glFogfv@8 ++glFogx@8 ++glFogxv@8 ++glFrontFace@4 ++glFrustumf@24 ++glFrustumx@24 ++glGenBuffers@8 ++glGenTextures@8 ++glGetBooleanv@8 ++glGetBufferParameteriv@12 ++glGetClipPlanef@8 ++glGetClipPlanex@8 ++glGetError@0 ++glGetFixedv@8 ++glGetFloatv@8 ++glGetIntegerv@8 ++glGetLightfv@12 ++glGetLightxv@12 ++glGetMaterialfv@12 ++glGetMaterialxv@12 ++glGetPointerv@8 ++glGetString@4 ++glGetTexEnvfv@12 ++glGetTexEnviv@12 ++glGetTexEnvxv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTexParameterxv@12 ++glHint@8 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsTexture@4 ++glLightModelf@8 ++glLightModelfv@8 ++glLightModelx@8 ++glLightModelxv@8 ++glLightf@12 ++glLightfv@12 ++glLightx@12 ++glLightxv@12 ++glLineWidth@4 ++glLineWidthx@4 ++glLoadIdentity@0 ++glLoadMatrixf@4 ++glLoadMatrixx@4 ++glLogicOp@4 ++glMaterialf@12 ++glMaterialfv@12 ++glMaterialx@12 ++glMaterialxv@12 ++glMatrixMode@4 ++glMultMatrixf@4 ++glMultMatrixx@4 ++glMultiTexCoord4f@20 ++glMultiTexCoord4x@20 ++glNormal3f@12 ++glNormal3x@12 ++glNormalPointer@12 ++glOrthof@24 ++glOrthox@24 ++glPixelStorei@8 ++glPointParameterf@8 ++glPointParameterfv@8 ++glPointParameterx@8 ++glPointParameterxv@8 ++glPointSize@4 ++glPointSizePointerOES@12 ++glPointSizex@4 ++glPolygonOffset@8 ++glPolygonOffsetx@8 ++glPopMatrix@0 ++glPushMatrix@0 ++glReadPixels@28 ++glRotatef@16 ++glRotatex@16 ++glSampleCoverage@8 ++glSampleCoveragex@8 ++glScalef@12 ++glScalex@12 ++glScissor@16 ++glShadeModel@4 ++glStencilFunc@12 ++glStencilMask@4 ++glStencilOp@12 ++glTexCoordPointer@16 ++glTexEnvf@12 ++glTexEnvfv@12 ++glTexEnvi@12 ++glTexEnviv@12 ++glTexEnvx@12 ++glTexEnvxv@12 ++glTexImage2D@36 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexParameterx@12 ++glTexParameterxv@12 ++glTexSubImage2D@36 ++glTranslatef@12 ++glTranslatex@12 ++glVertexPointer@16 ++glViewport@16 +diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build +index 8b749b1a3324be96f0d69816e638f1131ec8c307..4bca37b5e32f77d55655c49ca0580b75707edc6b 100644 +--- a/src/mapi/es1api/meson.build ++++ b/src/mapi/es1api/meson.build +@@ -29,12 +29,22 @@ es1_glapi_mapi_tmp_h = custom_target( + + _es1_c_args = [] + if with_platform_windows +- _es1_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es1_c_args += ['-D_GDI32_'] + endif + ++gles1_def = custom_target( ++ 'gles1.def', ++ input: 'gles1.def.in', ++ output : 'gles1.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libglesv1_cm = shared_library( + 'GLESv1_CM' + get_option('gles-lib-suffix'), + ['../entry.c', es1_glapi_mapi_tmp_h], ++ vs_module_defs : gles1_def, + c_args : [ + c_msvc_compat_args, + _es1_c_args, +diff --git a/src/mapi/es2api/gles2.def.in b/src/mapi/es2api/gles2.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..4517ea8b739e72d950930ee94b51dc71829dea8e +--- /dev/null ++++ b/src/mapi/es2api/gles2.def.in +@@ -0,0 +1,359 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++glActiveShaderProgram@8 ++glActiveTexture@4 ++glAttachShader@8 ++glBeginQuery@8 ++glBeginTransformFeedback@4 ++glBindAttribLocation@12 ++glBindBuffer@8 ++glBindBufferBase@12 ++glBindBufferRange@20 ++glBindFramebuffer@8 ++glBindImageTexture@28 ++glBindProgramPipeline@4 ++glBindRenderbuffer@8 ++glBindSampler@8 ++glBindTexture@8 ++glBindTransformFeedback@8 ++glBindVertexArray@4 ++glBindVertexBuffer@16 ++glBlendBarrier@0 ++glBlendColor@16 ++glBlendEquation@4 ++glBlendEquationSeparate@8 ++glBlendEquationSeparatei@12 ++glBlendEquationi@8 ++glBlendFunc@8 ++glBlendFuncSeparate@16 ++glBlendFuncSeparatei@20 ++glBlendFunci@12 ++glBlitFramebuffer@40 ++glBufferData@16 ++glBufferSubData@16 ++glCheckFramebufferStatus@4 ++glClear@4 ++glClearBufferfi@16 ++glClearBufferfv@12 ++glClearBufferiv@12 ++glClearBufferuiv@12 ++glClearColor@16 ++glClearDepthf@4 ++glClearStencil@4 ++glClientWaitSync@16 ++glColorMask@16 ++glColorMaski@20 ++glCompileShader@4 ++glCompressedTexImage2D@32 ++glCompressedTexImage3D@36 ++glCompressedTexSubImage2D@36 ++glCompressedTexSubImage3D@44 ++glCopyBufferSubData@20 ++glCopyImageSubData@60 ++glCopyTexImage2D@32 ++glCopyTexSubImage2D@32 ++glCopyTexSubImage3D@36 ++glCreateProgram@0 ++glCreateShader@4 ++glCreateShaderProgramv@12 ++glCullFace@4 ++glDebugMessageCallback@8 ++glDebugMessageControl@24 ++glDebugMessageInsert@24 ++glDeleteBuffers@8 ++glDeleteFramebuffers@8 ++glDeleteProgram@4 ++glDeleteProgramPipelines@8 ++glDeleteQueries@8 ++glDeleteRenderbuffers@8 ++glDeleteSamplers@8 ++glDeleteShader@4 ++glDeleteSync@4 ++glDeleteTextures@8 ++glDeleteTransformFeedbacks@8 ++glDeleteVertexArrays@8 ++glDepthFunc@4 ++glDepthMask@4 ++glDepthRangef@8 ++glDetachShader@8 ++glDisable@4 ++glDisableVertexAttribArray@4 ++glDisablei@8 ++glDispatchCompute@12 ++glDispatchComputeIndirect@4 ++glDrawArrays@12 ++glDrawArraysIndirect@8 ++glDrawArraysInstanced@16 ++glDrawBuffers@8 ++glDrawElements@16 ++glDrawElementsBaseVertex@20 ++glDrawElementsIndirect@12 ++glDrawElementsInstanced@20 ++glDrawElementsInstancedBaseVertex@24 ++glDrawRangeElements@24 ++glDrawRangeElementsBaseVertex@28 ++glEnable@4 ++glEnableVertexAttribArray@4 ++glEnablei@8 ++glEndQuery@4 ++glEndTransformFeedback@0 ++glFenceSync@8 ++glFinish@0 ++glFlush@0 ++glFlushMappedBufferRange@12 ++glFramebufferParameteri@12 ++glFramebufferRenderbuffer@16 ++glFramebufferTexture2D@20 ++glFramebufferTexture@16 ++glFramebufferTextureLayer@20 ++glFrontFace@4 ++glGenBuffers@8 ++glGenFramebuffers@8 ++glGenProgramPipelines@8 ++glGenQueries@8 ++glGenRenderbuffers@8 ++glGenSamplers@8 ++glGenTextures@8 ++glGenTransformFeedbacks@8 ++glGenVertexArrays@8 ++glGenerateMipmap@4 ++glGetActiveAttrib@28 ++glGetActiveUniform@28 ++glGetActiveUniformBlockName@20 ++glGetActiveUniformBlockiv@16 ++glGetActiveUniformsiv@20 ++glGetAttachedShaders@16 ++glGetAttribLocation@8 ++glGetBooleani_v@12 ++glGetBooleanv@8 ++glGetBufferParameteri64v@12 ++glGetBufferParameteriv@12 ++glGetBufferPointerv@12 ++glGetDebugMessageLog@32 ++glGetError@0 ++glGetFloatv@8 ++glGetFragDataLocation@8 ++glGetFramebufferAttachmentParameteriv@16 ++glGetFramebufferParameteriv@12 ++glGetGraphicsResetStatus@0 ++glGetInteger64i_v@12 ++glGetInteger64v@8 ++glGetIntegeri_v@12 ++glGetIntegerv@8 ++glGetInternalformativ@20 ++glGetMultisamplefv@12 ++glGetObjectLabel@20 ++glGetObjectPtrLabel@16 ++glGetPointerv@8 ++glGetProgramBinary@20 ++glGetProgramInfoLog@16 ++glGetProgramInterfaceiv@16 ++glGetProgramPipelineInfoLog@16 ++glGetProgramPipelineiv@12 ++glGetProgramResourceIndex@12 ++glGetProgramResourceLocation@12 ++glGetProgramResourceName@24 ++glGetProgramResourceiv@32 ++glGetProgramiv@12 ++glGetQueryObjectuiv@12 ++glGetQueryiv@12 ++glGetRenderbufferParameteriv@12 ++glGetSamplerParameterIiv@12 ++glGetSamplerParameterIuiv@12 ++glGetSamplerParameterfv@12 ++glGetSamplerParameteriv@12 ++glGetShaderInfoLog@16 ++glGetShaderPrecisionFormat@16 ++glGetShaderSource@16 ++glGetShaderiv@12 ++glGetString@4 ++glGetStringi@8 ++glGetSynciv@20 ++glGetTexLevelParameterfv@16 ++glGetTexLevelParameteriv@16 ++glGetTexParameterIiv@12 ++glGetTexParameterIuiv@12 ++glGetTexParameterfv@12 ++glGetTexParameteriv@12 ++glGetTransformFeedbackVarying@28 ++glGetUniformBlockIndex@8 ++glGetUniformIndices@16 ++glGetUniformLocation@8 ++glGetUniformfv@12 ++glGetUniformiv@12 ++glGetUniformuiv@12 ++glGetVertexAttribIiv@12 ++glGetVertexAttribIuiv@12 ++glGetVertexAttribPointerv@12 ++glGetVertexAttribfv@12 ++glGetVertexAttribiv@12 ++glGetnUniformfv@16 ++glGetnUniformiv@16 ++glGetnUniformuiv@16 ++glHint@8 ++glInvalidateFramebuffer@12 ++glInvalidateSubFramebuffer@28 ++glIsBuffer@4 ++glIsEnabled@4 ++glIsEnabledi@8 ++glIsFramebuffer@4 ++glIsProgram@4 ++glIsProgramPipeline@4 ++glIsQuery@4 ++glIsRenderbuffer@4 ++glIsSampler@4 ++glIsShader@4 ++glIsSync@4 ++glIsTexture@4 ++glIsTransformFeedback@4 ++glIsVertexArray@4 ++glLineWidth@4 ++glLinkProgram@4 ++glMapBufferRange@16 ++glMemoryBarrier@4 ++glMemoryBarrierByRegion@4 ++glMinSampleShading@4 ++glObjectLabel@16 ++glObjectPtrLabel@12 ++glPatchParameteri@8 ++glPauseTransformFeedback@0 ++glPixelStorei@8 ++glPolygonOffset@8 ++glPopDebugGroup@0 ++glPrimitiveBoundingBox@32 ++glProgramBinary@16 ++glProgramParameteri@12 ++glProgramUniform1f@12 ++glProgramUniform1fv@16 ++glProgramUniform1i@12 ++glProgramUniform1iv@16 ++glProgramUniform1ui@12 ++glProgramUniform1uiv@16 ++glProgramUniform2f@16 ++glProgramUniform2fv@16 ++glProgramUniform2i@16 ++glProgramUniform2iv@16 ++glProgramUniform2ui@16 ++glProgramUniform2uiv@16 ++glProgramUniform3f@20 ++glProgramUniform3fv@16 ++glProgramUniform3i@20 ++glProgramUniform3iv@16 ++glProgramUniform3ui@20 ++glProgramUniform3uiv@16 ++glProgramUniform4f@24 ++glProgramUniform4fv@16 ++glProgramUniform4i@24 ++glProgramUniform4iv@16 ++glProgramUniform4ui@24 ++glProgramUniform4uiv@16 ++glProgramUniformMatrix2fv@20 ++glProgramUniformMatrix2x3fv@20 ++glProgramUniformMatrix2x4fv@20 ++glProgramUniformMatrix3fv@20 ++glProgramUniformMatrix3x2fv@20 ++glProgramUniformMatrix3x4fv@20 ++glProgramUniformMatrix4fv@20 ++glProgramUniformMatrix4x2fv@20 ++glProgramUniformMatrix4x3fv@20 ++glPushDebugGroup@16 ++glReadBuffer@4 ++glReadPixels@28 ++glReadnPixels@32 ++glReleaseShaderCompiler@0 ++glRenderbufferStorage@16 ++glRenderbufferStorageMultisample@20 ++glResumeTransformFeedback@0 ++glSampleCoverage@8 ++glSampleMaski@8 ++glSamplerParameterIiv@12 ++glSamplerParameterIuiv@12 ++glSamplerParameterf@12 ++glSamplerParameterfv@12 ++glSamplerParameteri@12 ++glSamplerParameteriv@12 ++glScissor@16 ++glShaderBinary@20 ++glShaderSource@16 ++glStencilFunc@12 ++glStencilFuncSeparate@16 ++glStencilMask@4 ++glStencilMaskSeparate@8 ++glStencilOp@12 ++glStencilOpSeparate@16 ++glTexBuffer@12 ++glTexBufferRange@20 ++glTexImage2D@36 ++glTexImage3D@40 ++glTexParameterIiv@12 ++glTexParameterIuiv@12 ++glTexParameterf@12 ++glTexParameterfv@12 ++glTexParameteri@12 ++glTexParameteriv@12 ++glTexStorage2D@20 ++glTexStorage2DMultisample@24 ++glTexStorage3D@24 ++glTexStorage3DMultisample@28 ++glTexSubImage2D@36 ++glTexSubImage3D@44 ++glTransformFeedbackVaryings@16 ++glUniform1f@8 ++glUniform1fv@12 ++glUniform1i@8 ++glUniform1iv@12 ++glUniform1ui@8 ++glUniform1uiv@12 ++glUniform2f@12 ++glUniform2fv@12 ++glUniform2i@12 ++glUniform2iv@12 ++glUniform2ui@12 ++glUniform2uiv@12 ++glUniform3f@16 ++glUniform3fv@12 ++glUniform3i@16 ++glUniform3iv@12 ++glUniform3ui@16 ++glUniform3uiv@12 ++glUniform4f@20 ++glUniform4fv@12 ++glUniform4i@20 ++glUniform4iv@12 ++glUniform4ui@20 ++glUniform4uiv@12 ++glUniformBlockBinding@12 ++glUniformMatrix2fv@16 ++glUniformMatrix2x3fv@16 ++glUniformMatrix2x4fv@16 ++glUniformMatrix3fv@16 ++glUniformMatrix3x2fv@16 ++glUniformMatrix3x4fv@16 ++glUniformMatrix4fv@16 ++glUniformMatrix4x2fv@16 ++glUniformMatrix4x3fv@16 ++glUnmapBuffer@4 ++glUseProgram@4 ++glUseProgramStages@12 ++glValidateProgram@4 ++glValidateProgramPipeline@4 ++glVertexAttrib1f@8 ++glVertexAttrib1fv@8 ++glVertexAttrib2f@12 ++glVertexAttrib2fv@8 ++glVertexAttrib3f@16 ++glVertexAttrib3fv@8 ++glVertexAttrib4f@20 ++glVertexAttrib4fv@8 ++glVertexAttribBinding@8 ++glVertexAttribDivisor@8 ++glVertexAttribFormat@20 ++glVertexAttribI4i@20 ++glVertexAttribI4iv@8 ++glVertexAttribI4ui@20 ++glVertexAttribI4uiv@8 ++glVertexAttribIFormat@16 ++glVertexAttribIPointer@20 ++glVertexAttribPointer@24 ++glVertexBindingDivisor@8 ++glViewport@16 ++glWaitSync@16 +diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build +index 356c5760c495e5b8a52abc2c841741f9b2b47222..8b133daa131276025072b4a85318e423206981cc 100644 +--- a/src/mapi/es2api/meson.build ++++ b/src/mapi/es2api/meson.build +@@ -29,12 +29,22 @@ es2_glapi_mapi_tmp_h = custom_target( + + _es2_c_args = [] + if with_platform_windows +- _es2_c_args += ['-D_GDI32_', '-DBUILD_GL32'] ++ _es2_c_args += ['-D_GDI32_'] + endif + ++gles2_def = custom_target( ++ 'gles2.def', ++ input: 'gles2.def.in', ++ output : 'gles2.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + libgles2 = shared_library( + 'GLESv2' + get_option('gles-lib-suffix'), + ['../entry.c', es2_glapi_mapi_tmp_h], ++ vs_module_defs : gles2_def, + c_args : [ + c_msvc_compat_args, + _es2_c_args, +diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build +index 270b9870b400803d5cc8c484242c65b96ba99b9d..9f06207fe0a24e123b542ddf886ce2b325b0e105 100644 +--- a/src/mapi/glapi/meson.build ++++ b/src/mapi/glapi/meson.build +@@ -52,7 +52,7 @@ if with_shared_glapi + else + static_glapi_args += '-DMAPI_MODE_UTIL' + if with_platform_windows +- static_glapi_args += ['-D_GDI32_', '-DBUILD_GL32', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] ++ static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_NO_EXPORTS'] + endif + static_glapi_files += files( + 'glapi_dispatch.c', +diff --git a/src/mesa/meson.build b/src/mesa/meson.build +index bc7963413ff46781ae4a58a7762a58a73e67a23a..08b0cac497490fa40230861bd24bdba6e83016ad 100644 +--- a/src/mesa/meson.build ++++ b/src/mesa/meson.build +@@ -489,7 +489,6 @@ _mesa_windows_args = [] + if with_platform_windows + _mesa_windows_args += [ + '-D_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers +- '-DBUILD_GL32' # declare gl* as __declspec(dllexport) in Mesa headers + ] + if not with_shared_glapi + # prevent _glapi_* from being declared __declspec(dllimport) +diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build +index 6384af782976e3f8300cf5e69d11e98fa6ac5e83..8c2f0dd08632116eebbd982516e1004e9db01e09 100644 +--- a/src/vulkan/meson.build ++++ b/src/vulkan/meson.build +@@ -27,6 +27,15 @@ vulkan_wsi_args = [] + vulkan_wsi_deps = [] + vulkan_wsi_list = [] + ++vulkan_api_def = custom_target( ++ 'vulkan_api.def', ++ input: 'vulkan_api.def.in', ++ output : 'vulkan_api.def', ++ command : [prog_python, gen_vs_module_defs_py, ++ '--in_file', '@INPUT@', '--out_file', '@OUTPUT@', ++ '--compiler_id', cc.get_id(), '--cpu_family', host_machine.cpu_family()] ++) ++ + if with_platform_x11 + vulkan_wsi_deps += [ + dep_xcb, +diff --git a/src/vulkan/vulkan_api.def.in b/src/vulkan/vulkan_api.def.in +new file mode 100644 +index 0000000000000000000000000000000000000000..678e4d99278b96d0ef1ee15c51e5febf8fcea58e +--- /dev/null ++++ b/src/vulkan/vulkan_api.def.in +@@ -0,0 +1,4 @@ ++; stdcall calling convention have @number suffix on 32 bits architecture for gcc ++vk_icdNegotiateLoaderICDInterfaceVersion@4 ++vk_icdGetInstanceProcAddr@8 ++vk_icdGetPhysicalDeviceProcAddr@8 diff --git a/external_imported/vcpkg/ports/mesa/portfile.cmake b/external_imported/vcpkg/ports/mesa/portfile.cmake index 5fa919888..1e29f998d 100644 --- a/external_imported/vcpkg/ports/mesa/portfile.cmake +++ b/external_imported/vcpkg/ports/mesa/portfile.cmake @@ -3,16 +3,10 @@ # Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches set(PATCHES - # Fix swrAVX512 build - swravx512-post-static-link.patch - # Fix swr build with MSVC - swr-msvc-2.patch - # Fix swr build with LLVM 13 - swr-llvm13.patch - # Fix radv MSVC build with LLVM 13 - radv-msvc-llvm13-2.patch - # Fix d3d10sw MSVC build - d3d10sw.patch + # Fix symbols exporting for MinGW GCC x86 + def-fixes.patch + # Clover build on Windows + clover.patch ) vcpkg_check_linkage(ONLY_DYNAMIC_CRT) @@ -24,19 +18,15 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-21.2.5 - SHA512 a9ead27f08e862738938cf728928b7937ff37e4c26967f2e46e40a3c8419159397f75b2f4ce43f9b453b35bb3716df581087fb7ba8434fafdfab9488c3db6f92 + REF mesa-22.1.7 + SHA512 41302fc55ef429c14b1595832db3a898380230f86d2b84ac1ae3bd453d0aad87ec7ad310004dc64fcf34f58d8ea2736c13971c04eba056bcc549a4e3cc7c9470 FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES ${PATCHES} ) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") -set(ENV{PYTHON} "${PYTHON3}") -x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako ) vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) @@ -63,7 +53,6 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison! endif() # For features https://github.com/pal1000/mesa-dist-win should be probably studied a bit more. -#string(APPEND GALLIUM_DRIVERS 'auto') list(APPEND MESA_OPTIONS -Dzstd=enabled) list(APPEND MESA_OPTIONS -Dshared-llvm=auto) list(APPEND MESA_OPTIONS -Dlibunwind=disabled) @@ -72,26 +61,19 @@ list(APPEND MESA_OPTIONS -Dvalgrind=disabled) list(APPEND MESA_OPTIONS -Dglvnd=false) list(APPEND MESA_OPTIONS -Dglx=disabled) list(APPEND MESA_OPTIONS -Dgbm=disabled) -list(APPEND MESA_OPTIONS -Dosmesa=true) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND MESA_OPTIONS -Dshared-swr=false) - list(APPEND MESA_OPTIONS "-Dswr-arches=['avx']") +if("offscreen" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dosmesa=true) else() - list(APPEND MESA_OPTIONS -Dshared-swr=true) - list(APPEND MESA_OPTIONS "-Dswr-arches=['avx','avx2','knl','skx']") + list(APPEND MESA_OPTIONS -Dosmesa=false) endif() -string(APPEND GALLIUM_DRIVERS 'swrast') if("llvm" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dllvm=enabled) - string(APPEND GALLIUM_DRIVERS ",'swr'") # SWR always requires llvm else() list(APPEND MESA_OPTIONS -Dllvm=disabled) endif() -list(APPEND MESA_OPTIONS -Dgallium-drivers=[${GALLIUM_DRIVERS}]) - if("gles1" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dgles1=enabled) else() @@ -118,12 +100,12 @@ list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when bu if(VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dplatforms=['windows']) list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled) - if(NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") - set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") - endif() + if(NOT VCPKG_TARGET_IS_MINGW) + set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}") + set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}") + endif() endif() - + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/external_imported/vcpkg/ports/mesa/radv-msvc-llvm13-2.patch b/external_imported/vcpkg/ports/mesa/radv-msvc-llvm13-2.patch deleted file mode 100644 index 039ef66d9..000000000 --- a/external_imported/vcpkg/ports/mesa/radv-msvc-llvm13-2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp -index dcc7c4bc747..413e6464c79 100644 ---- a/src/amd/compiler/aco_print_asm.cpp -+++ b/src/amd/compiler/aco_print_asm.cpp -@@ -24,6 +24,9 @@ - - #include "aco_ir.h" - -+#if defined(_MSC_VER) && defined(restrict) -+#undef restrict -+#endif - #include "llvm/ac_llvm_util.h" - - #include "llvm-c/Disassembler.h" diff --git a/external_imported/vcpkg/ports/mesa/swr-llvm13.patch b/external_imported/vcpkg/ports/mesa/swr-llvm13.patch deleted file mode 100644 index e0da05bf5..000000000 --- a/external_imported/vcpkg/ports/mesa/swr-llvm13.patch +++ /dev/null @@ -1,334 +0,0 @@ -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -index 44482939c7649a2bcc39f3b2eb75720de90bcef0..1124e3773b99430c8da5ccb061d92b1b3a1bf1a6 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp -@@ -56,6 +56,14 @@ - using namespace llvm; - using namespace SwrJit; - -+#if LLVM_VERSION_MAJOR >= 7 -+static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::OF_None; -+static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::OF_Text; -+#else -+static constexpr llvm::sys::fs::OpenFlags OF_NONE = llvm::sys::fs::F_None; -+static constexpr llvm::sys::fs::OpenFlags OF_TEXT = llvm::sys::fs::F_Text; -+#endif -+ - ////////////////////////////////////////////////////////////////////////// - /// @brief Contructor for JitManager. - /// @param simdWidth - SIMD width to be used in generated program. -@@ -437,7 +445,7 @@ void JitManager::DumpAsm(Function* pFunction, const char* fileName) - sprintf(fName, "%s.%s.asm", funcName, fileName); - #endif - -- raw_fd_ostream filestream(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream filestream(fName, EC, OF_NONE); - - legacy::PassManager* pMPasses = new legacy::PassManager(); - auto* pTarget = mpExec->getTargetMachine(); -@@ -490,7 +498,7 @@ void JitManager::DumpToFile(Module* M, - #else - sprintf(fName, "%s.%s.ll", funcName, fileName); - #endif -- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream fd(fName, EC, OF_NONE); - M->print(fd, annotater); - fd.flush(); - } -@@ -512,7 +520,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) - #else - sprintf(fName, "%s.%s.ll", funcName, fileName); - #endif -- raw_fd_ostream fd(fName, EC, llvm::sys::fs::F_None); -+ raw_fd_ostream fd(fName, EC, OF_NONE); - f->print(fd, nullptr); - - #if defined(_WIN32) -@@ -522,7 +530,7 @@ void JitManager::DumpToFile(Function* f, const char* fileName) - #endif - fd.flush(); - -- raw_fd_ostream fd_cfg(fName, EC, llvm::sys::fs::F_Text); -+ raw_fd_ostream fd_cfg(fName, EC, OF_TEXT); - WriteGraph(fd_cfg, (const Function*)f); - - fd_cfg.flush(); -@@ -726,7 +734,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef - - { - std::error_code err; -- llvm::raw_fd_ostream fileObj(objPath.c_str(), err, llvm::sys::fs::F_None); -+ llvm::raw_fd_ostream fileObj(objPath.c_str(), err, OF_NONE); - fileObj << Obj.getBuffer(); - fileObj.flush(); - } -@@ -734,7 +742,7 @@ void JitCache::notifyObjectCompiled(const llvm::Module* M, llvm::MemoryBufferRef - - { - std::error_code err; -- llvm::raw_fd_ostream fileObj(filePath.c_str(), err, llvm::sys::fs::F_None); -+ llvm::raw_fd_ostream fileObj(filePath.c_str(), err, OF_NONE); - - uint32_t objcrc = ComputeCRC(0, Obj.getBufferStart(), Obj.getBufferSize()); - -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -index c361959b76ff0799f5102ad4b8ddf23d345105d9..64a690b47fac9ee99eba8f1259ffccf20f0e5fa0 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_gfx_mem.h -@@ -41,31 +41,29 @@ namespace SwrJit - BuilderGfxMem(JitManager* pJitMgr); - virtual ~BuilderGfxMem() {} - -- virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = ""); -- virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = ""); -- virtual Value* -- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); -- virtual Value* -- GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr); -+ virtual Value* GEP(Value* Ptr, Value* Idx, Type* Ty = nullptr, bool isReadOnly = true, const Twine& Name = "") override; -+ virtual Value* GEP(Type* Ty, Value* Ptr, Value* Idx, const Twine& Name = "") override; -+ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; -+ virtual Value* GEP(Value* Ptr, const std::initializer_list& indexList, Type* Ty = nullptr) override; - - virtual LoadInst* LOAD(Value* Ptr, - const char* Name, - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* Ptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* Ptr, - bool isVolatile, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual LoadInst* LOAD(Value* BasePtr, - const std::initializer_list& offset, - const llvm::Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual CallInst* MASKED_LOAD(Value* Ptr, - unsigned Align, -@@ -73,32 +71,32 @@ namespace SwrJit - Value* PassThru = nullptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - -- virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -- -- virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - -- virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ virtual StoreInst* STORE(Value* Val, Value* BasePtr, const std::initializer_list& offset, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; -+ -+ virtual CallInst* MASKED_STORE(Value *Val, Value *Ptr, unsigned Align, Value *Mask, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual Value* GATHERPS(Value* src, - Value* pBase, - Value* indices, - Value* mask, - uint8_t scale = 1, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - virtual Value* GATHERDD(Value* src, - Value* pBase, - Value* indices, - Value* mask, - uint8_t scale = 1, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - virtual void SCATTERPS(Value* pDst, - Value* vSrc, - Value* vOffsets, - Value* vMask, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) override; - - Value* TranslateGfxAddressForRead(Value* xpGfxAddress, - Type* PtrTy = nullptr, -@@ -108,13 +106,13 @@ namespace SwrJit - Type* PtrTy = nullptr, - const Twine& Name = "", - MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); -- -+ - protected: - void AssertGFXMemoryParams(Value* ptr, MEM_CLIENT usage); - - virtual void NotifyPrivateContextSet(); - -- virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset); -+ virtual Value* OFFSET_TO_NEXT_COMPONENT(Value* base, Constant* offset) override; - - Value* TranslationHelper(Value* Ptr, Type* Ty, Value* pfnTranslateGfxAddress); - void TrackerHelper(Value* Ptr, Type* Ty, MEM_CLIENT usage, bool isRead); -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -index b5eb0a782b15214bcf954a7893cd628649a990fc..a16b5d11dbb2f2f1a0bcdc07e4d306b14a90dc4c 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.cpp -@@ -82,7 +82,12 @@ namespace SwrJit - std::vector indices; - for (auto i : indexList) - indices.push_back(i); -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(ptr->getType())->getElementType(); -+ return IN_BOUNDS_GEP(EltTy, ptr, indices); -+#else - return IN_BOUNDS_GEP(ptr, indices); -+#endif - } - - Value* Builder::IN_BOUNDS_GEP(Value* ptr, const std::initializer_list& indexList) -@@ -90,7 +95,12 @@ namespace SwrJit - std::vector indices; - for (auto i : indexList) - indices.push_back(C(i)); -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(ptr->getType())->getElementType(); -+ return IN_BOUNDS_GEP(EltTy, ptr, indices); -+#else - return IN_BOUNDS_GEP(ptr, indices); -+#endif - } - - LoadInst* Builder::LOAD(Value* Ptr, const char* Name, Type* Ty, MEM_CLIENT usage) -@@ -130,6 +140,22 @@ namespace SwrJit - return Builder::LOAD(GEPA(basePtr, valIndices), name); - } - -+ CallInst* Builder::MASKED_LOAD(Value* Ptr, -+ unsigned Align, -+ Value* Mask, -+ Value* PassThru, -+ const Twine& Name, -+ Type* Ty, -+ MEM_CLIENT usage) -+ { -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(Ptr->getType())->getElementType(); -+ return IRB()->CreateMaskedLoad(EltTy, Ptr, AlignType(Align), Mask, PassThru, Name); -+#else -+ return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); -+#endif -+ } -+ - LoadInst* Builder::LOADV(Value* basePtr, - const std::initializer_list& indices, - const llvm::Twine& name) -@@ -234,7 +260,12 @@ namespace SwrJit - /// @param pVecPassthru - SIMD wide vector of values to load when lane is inactive - Value* Builder::GATHER_PTR(Value* pVecSrcPtr, Value* pVecMask, Value* pVecPassthru) - { -+#if LLVM_VERSION_MAJOR >= 13 -+ Type *EltTy = cast(pVecSrcPtr->getType())->getElementType(); -+ return MASKED_GATHER(EltTy, pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); -+#else - return MASKED_GATHER(pVecSrcPtr, AlignType(4), pVecMask, pVecPassthru); -+#endif - } - - void Builder::SCATTER_PTR(Value* pVecDstPtr, Value* pVecSrc, Value* pVecMask) -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -index 429d5779a4db2a6a3b6c7a7d02169773c935bb95..6682ad892b4038d4b3172b932a34e31a89cd7790 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_mem.h -@@ -82,10 +82,7 @@ virtual CallInst* MASKED_LOAD(Value* Ptr, - Value* PassThru = nullptr, - const Twine& Name = "", - Type* Ty = nullptr, -- MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) --{ -- return IRB()->CreateMaskedLoad(Ptr, AlignType(Align), Mask, PassThru, Name); --} -+ MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL); - - virtual StoreInst* STORE(Value *Val, Value *Ptr, bool isVolatile = false, Type* Ty = nullptr, MEM_CLIENT usage = MEM_CLIENT::MEM_CLIENT_INTERNAL) - { -diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -index bd5f7588c9189275ddaf3075b0a75e2e8fc1ecf5..2a4cf74722bc9ef1831d25fe6c2bb2f510b8fceb 100644 ---- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -+++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp -@@ -276,7 +276,8 @@ Function* FetchJit::Create(const FETCH_COMPILE_STATE& fetchState) - JitManager::DumpToFile(fetch, "src"); - - #if defined(_DEBUG) -- verifyFunction(*fetch); -+ // Note that false is returned if there are no errors -+ SWR_ASSERT(!verifyFunction(*fetch, &llvm::errs())); - #endif - - ::FunctionPassManager setupPasses(JM()->mpCurrentModule); -diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp -index 315036920fb3ad364d0039349e148c70e5ba1818..a643b46cd081c026b5a3558d22be557338d4f220 100644 ---- a/src/gallium/drivers/swr/swr_shader.cpp -+++ b/src/gallium/drivers/swr/swr_shader.cpp -@@ -1557,8 +1557,10 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -1785,8 +1787,10 @@ BuilderSWR::CompileTES(struct swr_context *ctx, swr_jit_tes_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2086,8 +2090,10 @@ BuilderSWR::CompileTCS(struct swr_context *ctx, swr_jit_tcs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2341,8 +2347,10 @@ BuilderSWR::CompileVS(struct swr_context *ctx, swr_jit_vs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); -@@ -2646,8 +2654,10 @@ BuilderSWR::CompileFS(struct swr_context *ctx, swr_jit_fs_key &key) - AttributeSet attrSet = AttributeSet::get( - JM()->mContext, AttributeSet::FunctionIndex, attrBuilder); - pFunction->addAttributes(AttributeSet::FunctionIndex, attrSet); --#else -+#elif LLVM_VERSION_MAJOR < 14 - pFunction->addAttributes(AttributeList::FunctionIndex, attrBuilder); -+#else -+ pFunction->addFnAttrs(attrBuilder); - #endif - - BasicBlock *block = BasicBlock::Create(JM()->mContext, "entry", pFunction); diff --git a/external_imported/vcpkg/ports/mesa/swr-msvc-2.patch b/external_imported/vcpkg/ports/mesa/swr-msvc-2.patch deleted file mode 100644 index f202fa0e8..000000000 --- a/external_imported/vcpkg/ports/mesa/swr-msvc-2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 68d1addf6f0cf693fdb42db3555112e257a3d771 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= -Date: Sun, 24 Oct 2021 21:36:09 -0400 -Subject: [PATCH] swr: fix MSVC build - ---- - src/gallium/drivers/swr/swr_draw.cpp | 6 +++--- - src/gallium/drivers/swr/swr_state.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/gallium/drivers/swr/swr_draw.cpp b/src/gallium/drivers/swr/swr_draw.cpp -index 4b42a8e0390..5d862adb39d 100644 ---- a/src/gallium/drivers/swr/swr_draw.cpp -+++ b/src/gallium/drivers/swr/swr_draw.cpp -@@ -62,7 +62,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - - if (!indirect && - !info->primitive_restart && -- !u_trim_pipe_prim(info->mode, (unsigned*)&draws[0].count)) -+ !u_trim_pipe_prim((enum pipe_prim_type)info->mode, (unsigned*)&draws[0].count)) - return; - - if (!swr_check_render_cond(pipe)) -@@ -102,7 +102,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - STREAMOUT_COMPILE_STATE state = {0}; - struct pipe_stream_output_info *so = &ctx->vs->pipe.stream_output; - -- state.numVertsPerPrim = u_vertices_per_prim(info->mode); -+ state.numVertsPerPrim = u_vertices_per_prim((enum pipe_prim_type)info->mode); - - uint32_t offsets[MAX_SO_STREAMS] = {0}; - uint32_t num = 0; -@@ -221,7 +221,7 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info, - if (ctx->gs) - topology = (pipe_prim_type)ctx->gs->info.base.properties[TGSI_PROPERTY_GS_OUTPUT_PRIM]; - else -- topology = info->mode; -+ topology = (enum pipe_prim_type)info->mode; - - switch (topology) { - case PIPE_PRIM_TRIANGLE_FAN: -diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp -index 5f1464e6d0e..818328750bd 100644 ---- a/src/gallium/drivers/swr/swr_state.cpp -+++ b/src/gallium/drivers/swr/swr_state.cpp -@@ -1731,7 +1731,7 @@ swr_update_derived(struct pipe_context *pipe, - /* Has to be before fragment shader, since it sets SWR_NEW_FS */ - if (p_draw_info) { - bool new_prim_is_poly = -- (u_reduced_prim(p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && -+ (u_reduced_prim((enum pipe_prim_type)p_draw_info->mode) == PIPE_PRIM_TRIANGLES) && - (ctx->derived.rastState.fillMode == SWR_FILLMODE_SOLID); - if (new_prim_is_poly != ctx->poly_stipple.prim_is_poly) { - ctx->dirty |= SWR_NEW_FS; --- -2.25.1 - diff --git a/external_imported/vcpkg/ports/mesa/swravx512-post-static-link.patch b/external_imported/vcpkg/ports/mesa/swravx512-post-static-link.patch deleted file mode 100644 index ac88d9bd7..000000000 --- a/external_imported/vcpkg/ports/mesa/swravx512-post-static-link.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build -index 11ea7d3f43e..f34e88b1eec 100644 ---- a/src/gallium/drivers/swr/meson.build -+++ b/src/gallium/drivers/swr/meson.build -@@ -213,7 +213,7 @@ endif - - if with_swr_arches.contains('skx') - swr_skx_args = cpp.first_supported_argument( -- '-march=skylake-avx512', '-target-cpu=x86-skylake', '-xCORE-AVX512', -+ '-march=skylake-avx512', '-target-cpu=x86-skylake', '-xCORE-AVX512', '/arch:AVX512', - ) - if swr_skx_args == [] - error('Cannot find SKX support for swr.') -@@ -252,7 +252,7 @@ endif - - if with_swr_arches.contains('knl') - swr_knl_args = cpp.first_supported_argument( -- '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', -+ '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512', - ) - if swr_knl_args == [] - error('Cannot find KNL support for swr.') diff --git a/external_imported/vcpkg/ports/mesa/vcpkg.json b/external_imported/vcpkg/ports/mesa/vcpkg.json index 8643b1e88..4fd11853b 100644 --- a/external_imported/vcpkg/ports/mesa/vcpkg.json +++ b/external_imported/vcpkg/ports/mesa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mesa", - "version": "21.2.5", - "port-version": 3, + "version": "22.1.7", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", @@ -90,11 +89,39 @@ "name": "llvm", "default-features": false, "features": [ + "enable-rtti", "libclc" ] + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm32" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x64 | x86" } ] }, + "offscreen": { + "description": "Build with support for offscreen rendering (OSMesa)" + }, "opengl": { "description": "Build support for OpenGL (all versions)", "dependencies": [ diff --git a/external_imported/vcpkg/ports/meschach/vcpkg.json b/external_imported/vcpkg/ports/meschach/vcpkg.json index b22ceba58..2cd52bfb1 100644 --- a/external_imported/vcpkg/ports/meschach/vcpkg.json +++ b/external_imported/vcpkg/ports/meschach/vcpkg.json @@ -1,7 +1,8 @@ { "name": "meschach", "version-string": "1.2b", - "port-version": 4, + "port-version": 5, "description": "Matrix computations in C", - "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach" + "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach", + "supports": "windows & !uwp" } diff --git a/external_imported/vcpkg/ports/metis/build-fixes.patch b/external_imported/vcpkg/ports/metis/build-fixes.patch new file mode 100644 index 000000000..c9e42193b --- /dev/null +++ b/external_imported/vcpkg/ports/metis/build-fixes.patch @@ -0,0 +1,144 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a15d19a..7210a61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(METIS C) + + set(SHARED FALSE CACHE BOOL "build a shared library") + +-if(MSVC) ++if(0) + set(METIS_INSTALL FALSE) + else() + set(METIS_INSTALL TRUE) +@@ -34,19 +34,13 @@ include(./conf/gkbuild.cmake) + # + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${METIS_COPTIONS}") + +- +-# Add include directories. +-# i.e., the -I equivalent +-include_directories(build/xinclude) +-include_directories(${GKLIB_PATH}/include) +-include_directories(${CMAKE_INSTALL_PREFIX}/include) +- +-# List of paths that the compiler will search for library files. +-# i.e., the -L equivalent +-link_directories(${GKLIB_PATH}/lib) +-link_directories(${CMAKE_INSTALL_PREFIX}/lib) +- + # Recursively look for CMakeLists.txt in subdirs. +-add_subdirectory("build/xinclude") ++add_subdirectory("include") + add_subdirectory("libmetis") +-add_subdirectory("programs") ++ ++install(EXPORT metisTargets FILE "metisTargets.cmake" DESTINATION "share/metis") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/metis/metisConfig.cmake" [=[ ++include(CMakeFindDependencyMacro) ++find_dependency(GKlib CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/metisTargets.cmake") ++]=]) +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index 96435e5..ff43f05 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -16,7 +16,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GK_COPTS "/Ox") + set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GK_COPTS "-DUSE_GKREGEX") +@@ -38,7 +37,7 @@ endif(VALGRIND) + set(GK_COPTIONS "${GK_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GK_COPTIONS "${GK_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -69,7 +68,7 @@ endif(OPENMP) + if(GDB) + set(GK_COPTS "${GK_COPTS} -g") + set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() ++elseif(0) + set(GK_COPTS "-O3") + endif(GDB) + +diff --git a/include/metis.h b/include/metis.h +index 7fef0e7..f8e5dcf 100644 +--- a/include/metis.h ++++ b/include/metis.h +@@ -30,7 +30,7 @@ + GCC does provides these definitions in stdint.h, but it may require some + modifications on other architectures. + --------------------------------------------------------------------------*/ +-//#define IDXTYPEWIDTH 32 ++#define IDXTYPEWIDTH 32 + + + /*-------------------------------------------------------------------------- +@@ -40,7 +40,7 @@ + 32 : single precission floating point (float) + 64 : double precission floating point (double) + --------------------------------------------------------------------------*/ +-//#define REALTYPEWIDTH 32 ++#define REALTYPEWIDTH 32 + + + +@@ -72,10 +72,14 @@ typedef __int64 int64_t; + #define PRId64 "I64d" + #define SCNd32 "ld" + #define SCNd64 "I64d" ++#ifdef _WIN32 ++#include ++#else + #define INT32_MIN ((int32_t)_I32_MIN) + #define INT32_MAX _I32_MAX + #define INT64_MIN ((int64_t)_I64_MIN) + #define INT64_MAX _I64_MAX ++#endif // ^^^ !_WIN32 + #else + #include + #endif +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index fc6cec6..8aeb89a 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -6,10 +6,9 @@ file(GLOB metis_sources *.c) + + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${metis_sources}) ++find_package(GKlib CONFIG REQUIRED) ++target_link_libraries(metis PUBLIC GKlib) ++target_include_directories(metis PRIVATE "../include") + +-if(METIS_INSTALL) +- install(TARGETS metis +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- ARCHIVE DESTINATION lib) +-endif() ++install(TARGETS metis EXPORT metisTargets ++ INCLUDES DESTINATION include) +diff --git a/libmetis/metislib.h b/libmetis/metislib.h +index dc224f4..1efccda 100644 +--- a/libmetis/metislib.h ++++ b/libmetis/metislib.h +@@ -31,7 +31,7 @@ + #include "proto.h" + + +-#if defined(COMPILER_MSC) ++#if defined(COMPILER_MSC) && (_MSC_VER < 1900) + #if defined(rint) + #undef rint + #endif diff --git a/external_imported/vcpkg/ports/metis/disable-programs.patch b/external_imported/vcpkg/ports/metis/disable-programs.patch deleted file mode 100644 index 0c23be553..000000000 --- a/external_imported/vcpkg/ports/metis/disable-programs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt Wed Dec 21 18:24:22 2016 -+++ b/CMakeLists.txt Wed Dec 21 18:24:26 2016 -@@ -20,4 +20,4 @@ - # Recursively look for CMakeLists.txt in subdirs. - add_subdirectory("include") - add_subdirectory("libmetis") --add_subdirectory("programs") -+# add_subdirectory("programs") diff --git a/external_imported/vcpkg/ports/metis/enable-install.patch b/external_imported/vcpkg/ports/metis/enable-install.patch deleted file mode 100644 index 9f36623ad..000000000 --- a/external_imported/vcpkg/ports/metis/enable-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt Sat Mar 30 17:24:45 2013 -+++ b/CMakeLists.txt Wed Dec 21 18:23:43 2016 -@@ -4,11 +4,7 @@ - set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") - set(SHARED FALSE CACHE BOOL "build a shared library") - --if(MSVC) -- set(METIS_INSTALL FALSE) --else() -- set(METIS_INSTALL TRUE) --endif() -+set(METIS_INSTALL TRUE) - - # Configure libmetis library. - if(SHARED) diff --git a/external_imported/vcpkg/ports/metis/fix-INT_MIN_define.patch b/external_imported/vcpkg/ports/metis/fix-INT_MIN_define.patch deleted file mode 100644 index 97d7881f5..000000000 --- a/external_imported/vcpkg/ports/metis/fix-INT_MIN_define.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/include/metis.h b/include/metis.h -index dc5406a..7732437 100644 ---- a/include/metis.h -+++ b/include/metis.h -@@ -72,10 +72,14 @@ typedef __int64 int64_t; - #define PRId64 "I64d" - #define SCNd32 "ld" - #define SCNd64 "I64d" -+#ifdef _WIN32 -+#include -+#else - #define INT32_MIN ((int32_t)_I32_MIN) - #define INT32_MAX _I32_MAX - #define INT64_MIN ((int64_t)_I64_MIN) - #define INT64_MAX _I64_MAX -+#endif - #else - #include - #endif -diff --git a/GKlib/gk_arch.h b/GKlib/gk_arch.h -index 78b1431..7258763 100644 ---- a/GKlib/gk_arch.h -+++ b/GKlib/gk_arch.h -@@ -32,8 +32,8 @@ - - - #ifdef __MSC__ -- #include "ms_stdint.h" -- #include "ms_inttypes.h" -+ #include -+ #include - #include "ms_stat.h" - #else - #ifndef SUNOS diff --git a/external_imported/vcpkg/ports/metis/fix-gklib-vs14-math.patch b/external_imported/vcpkg/ports/metis/fix-gklib-vs14-math.patch deleted file mode 100644 index e83a68230..000000000 --- a/external_imported/vcpkg/ports/metis/fix-gklib-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 -+++ b/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 -@@ -58,7 +58,7 @@ - #define PTRDIFF_MAX INT64_MAX - #endif - --#ifdef __MSC__ -+#if defined(__MSC__) && (_MSC_VER < 1900) - /* MSC does not have rint() function */ - #define rint(x) ((int)((x)+0.5)) - diff --git a/external_imported/vcpkg/ports/metis/fix-linux-build-error.patch b/external_imported/vcpkg/ports/metis/fix-linux-build-error.patch deleted file mode 100644 index b3563a881..000000000 --- a/external_imported/vcpkg/ports/metis/fix-linux-build-error.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e94f050..b9613a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,8 @@ - cmake_minimum_required(VERSION 2.8) - project(METIS) - --set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") -+set(GKLIB_PATH "${CMAKE_SOURCE_DIR}/GKlib" CACHE PATH "path to GKlib") -+ - set(SHARED FALSE CACHE BOOL "build a shared library") - - set(METIS_INSTALL TRUE) diff --git a/external_imported/vcpkg/ports/metis/fix-metis-vs14-math.patch b/external_imported/vcpkg/ports/metis/fix-metis-vs14-math.patch deleted file mode 100644 index a296213e8..000000000 --- a/external_imported/vcpkg/ports/metis/fix-metis-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libmetis/metislib.h Sat Mar 30 17:24:45 2013 -+++ b/libmetis/metislib.h Wed Dec 21 18:30:59 2016 -@@ -31,7 +31,7 @@ - #include - - --#if defined(COMPILER_MSC) -+#if defined(COMPILER_MSC) && (_MSC_VER < 1900) - #if defined(rint) - #undef rint - #endif diff --git a/external_imported/vcpkg/ports/metis/fix-runtime-install-destination.patch b/external_imported/vcpkg/ports/metis/fix-runtime-install-destination.patch deleted file mode 100644 index 8d9147e5f..000000000 --- a/external_imported/vcpkg/ports/metis/fix-runtime-install-destination.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libmetis/CMakeLists.txt Sat Mar 30 17:24:45 2013 -+++ b/libmetis/CMakeLists.txt Wed Dec 21 17:41:37 2016 -@@ -11,6 +11,6 @@ - if(METIS_INSTALL) - install(TARGETS metis - LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -+ RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib) - endif() diff --git a/external_imported/vcpkg/ports/metis/install-metisConfig.patch b/external_imported/vcpkg/ports/metis/install-metisConfig.patch deleted file mode 100644 index c07600a85..000000000 --- a/external_imported/vcpkg/ports/metis/install-metisConfig.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9613a7..e43ffee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,3 +22,23 @@ include_directories(include) - add_subdirectory("include") - add_subdirectory("libmetis") - # add_subdirectory("programs") -+ -+if(METIS_INSTALL) -+ set(PRJ_NAME metis) -+ set(PRJ_VER 5.1.0) -+ install(EXPORT metisTargets -+ FILE ${PRJ_NAME}Targets.cmake -+ DESTINATION lib/cmake/${PRJ_NAME}) -+ include(CMakePackageConfigHelpers) -+ write_basic_package_version_file( -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake -+ VERSION ${PRJ_VER} -+ COMPATIBILITY SameMajorVersion) -+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake -+ "include(\${CMAKE_CURRENT_LIST_DIR}/${PRJ_NAME}Targets.cmake)") -+ install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake -+ DESTINATION lib/cmake/${PRJ_NAME}) -+endif() -+ -diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt -index 7a5fc74..5a68cf0 100644 ---- a/libmetis/CMakeLists.txt -+++ b/libmetis/CMakeLists.txt -@@ -9,8 +9,9 @@ if(UNIX) - endif() - - if(METIS_INSTALL) -- install(TARGETS metis -+ install(TARGETS metis EXPORT metisTargets - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION lib -+ INCLUDES DESTINATION include) - endif() diff --git a/external_imported/vcpkg/ports/metis/portfile.cmake b/external_imported/vcpkg/ports/metis/portfile.cmake index 07f5d0257..1004a2fe1 100644 --- a/external_imported/vcpkg/ports/metis/portfile.cmake +++ b/external_imported/vcpkg/ports/metis/portfile.cmake @@ -1,41 +1,22 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(OPTIONS -DSHARED=OFF) - -set(METIS_VERSION 5.1.0) - -vcpkg_download_distfile(ARCHIVE - URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${METIS_VERSION}.tar.gz" - FILENAME "metis-${METIS_VERSION}.tar.gz" - SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${METIS_VERSION} - PATCHES - enable-install.patch - disable-programs.patch - fix-runtime-install-destination.patch - fix-metis-vs14-math.patch - fix-gklib-vs14-math.patch - fix-linux-build-error.patch - install-metisConfig.patch - fix-INT_MIN_define.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${OPTIONS} -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/metis) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/metis) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO KarypisLab/METIS + REF 94c03a6e2d1860128c2d0675cbbb86ad4f261256 + SHA512 9f24329fa0f0856d0b5d10a489574d857bc4538d9639055fc895363cf70aa37342eaf7bc08819500ff6d5b98a4aa99f4241880622b540d4c484ca19e693d3480 + PATCHES + build-fixes.patch + ) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +metis provides CMake targets: + find_package(metis CONFIG REQUIRED) + target_link_libraries(main PRIVATE metis) +]=]) diff --git a/external_imported/vcpkg/ports/metis/vcpkg.json b/external_imported/vcpkg/ports/metis/vcpkg.json index 82baa5438..f5b9c260d 100644 --- a/external_imported/vcpkg/ports/metis/vcpkg.json +++ b/external_imported/vcpkg/ports/metis/vcpkg.json @@ -1,7 +1,18 @@ { "name": "metis", - "version-string": "5.1.0", - "port-version": 8, + "version-date": "2022-07-27", "description": "Serial Graph Partitioning and Fill-reducing Matrix Ordering", - "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/metis/overview" + "homepage": "https://github.com/KarypisLab/METIS", + "license": "Apache-2.0", + "dependencies": [ + "gklib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/mgnlibs/portfile.cmake b/external_imported/vcpkg/ports/mgnlibs/portfile.cmake index cd5ee8d21..fa0295e7c 100644 --- a/external_imported/vcpkg/ports/mgnlibs/portfile.cmake +++ b/external_imported/vcpkg/ports/mgnlibs/portfile.cmake @@ -7,10 +7,8 @@ vcpkg_from_github( HEAD_REF master ) -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/mgnlibs/README.md ${CURRENT_PACKAGES_DIR}/share/mgnlibs/copyright) - # Copy the header files file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/mgnlibs) + +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mgnlibs/vcpkg.json b/external_imported/vcpkg/ports/mgnlibs/vcpkg.json index e6b852258..6758c7365 100644 --- a/external_imported/vcpkg/ports/mgnlibs/vcpkg.json +++ b/external_imported/vcpkg/ports/mgnlibs/vcpkg.json @@ -1,7 +1,8 @@ { "name": "mgnlibs", - "version-string": "2019-09-29", - "port-version": 1, + "version-date": "2019-09-29", + "port-version": 2, "description": "Single-file public domain libraries for C/C++", - "homepage": "https://github.com/mattiasgustavsson/libs" + "homepage": "https://github.com/mattiasgustavsson/libs", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch b/external_imported/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch index a3d8053dd..062e55cde 100644 --- a/external_imported/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch +++ b/external_imported/vcpkg/ports/milerius-sfml-imgui/FixFindPackageIssue.patch @@ -2,15 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 27b8bd8..33fe623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) +@@ -2,8 +2,8 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there") endif () -project(sfml-imgui) -+project(milerius-sfml-imgui) cmake_minimum_required(VERSION 3.9) ++project(milerius-sfml-imgui) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + ##! Package @@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers) install(TARGETS diff --git a/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json b/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json index 62abc101b..9d6055991 100644 --- a/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json +++ b/external_imported/vcpkg/ports/milerius-sfml-imgui/vcpkg.json @@ -1,8 +1,9 @@ { "name": "milerius-sfml-imgui", "version": "1.1", - "port-version": 4, + "port-version": 5, "description": "imgui dll for sfml usage", + "license": "MIT", "dependencies": [ "imgui", "sfml", diff --git a/external_imported/vcpkg/ports/mimalloc/portfile.cmake b/external_imported/vcpkg/ports/mimalloc/portfile.cmake index c1a47d2bd..17645a6a0 100644 --- a/external_imported/vcpkg/ports/mimalloc/portfile.cmake +++ b/external_imported/vcpkg/ports/mimalloc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF v2.0.5 - SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d + REF v2.0.6 + SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3 HEAD_REF master PATCHES fix-cmake.patch diff --git a/external_imported/vcpkg/ports/mimalloc/vcpkg.json b/external_imported/vcpkg/ports/mimalloc/vcpkg.json index 1a9c98b72..60508c3b5 100644 --- a/external_imported/vcpkg/ports/mimalloc/vcpkg.json +++ b/external_imported/vcpkg/ports/mimalloc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mimalloc", - "version": "2.0.5", - "port-version": 1, + "version": "2.0.6", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/external_imported/vcpkg/ports/minimp3/portfile.cmake b/external_imported/vcpkg/ports/minimp3/portfile.cmake index 08ef07032..dc795aadb 100644 --- a/external_imported/vcpkg/ports/minimp3/portfile.cmake +++ b/external_imported/vcpkg/ports/minimp3/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lieff/minimp3 - REF 95864e8e0d3b34402a49ae9af6c66f7e98c13c35 #committed on Nov 27 - SHA512 6e5364a83e882b54fd1eb5ba35ec7c7179b5b5c0ceb2c658615a2306ae0c28252ca8591ec6b515483c6ff0ed608db7eb73fba3d201a20ad4a85ce7b3a091a695 + REF afb604c06bc8beb145fecd42c0ceb5bda8795144 # committed on 2021-11-30 + SHA512 633da0b20982f6f22c87d872c69626b2939ffb4519339cd0c090d7538308007cf633c07af57020cd2332a75c6e7b9bf3ebd5bda1af59dc96a4f0e85ce1b3f751 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/minimp3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(COPY ${SOURCE_PATH}/minimp3_ex.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY "${SOURCE_PATH}/minimp3.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${SOURCE_PATH}/minimp3_ex.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") # 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) diff --git a/external_imported/vcpkg/ports/minimp3/vcpkg.json b/external_imported/vcpkg/ports/minimp3/vcpkg.json index 5fad0a363..e21253915 100644 --- a/external_imported/vcpkg/ports/minimp3/vcpkg.json +++ b/external_imported/vcpkg/ports/minimp3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minimp3", - "version-string": "2020-12-25", - "port-version": 1, + "version-date": "2021-11-30", "description": "Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant).", - "homepage": "https://github.com/lieff/minimp3" + "homepage": "https://github.com/lieff/minimp3", + "license": "CC0-1.0" } diff --git a/external_imported/vcpkg/ports/minio-cpp/fix_cmake_file.patch b/external_imported/vcpkg/ports/minio-cpp/fix_cmake_file.patch deleted file mode 100644 index f4f6d95b4..000000000 --- a/external_imported/vcpkg/ports/minio-cpp/fix_cmake_file.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6df202c..98eeeb0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -114,6 +114,6 @@ else (DOXYGEN_FOUND) - message("Doxygen need to be installed to generate the doxygen documentation") - endif (DOXYGEN_FOUND) - - configure_file(miniocpp.pc.in miniocpp.pc @ONLY) --install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -+install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - diff --git a/external_imported/vcpkg/ports/minio-cpp/portfile.cmake b/external_imported/vcpkg/ports/minio-cpp/portfile.cmake index 1fe139457..771224756 100644 --- a/external_imported/vcpkg/ports/minio-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/minio-cpp/portfile.cmake @@ -1,17 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO minio/minio-cpp - REF 0847e56f31e13d32c924029d5ffaa865f8396462 - SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f + REF v0.1.1 + SHA512 88bd07688f27ca1b1cd7cba592ffe13e08619f0a1f8aa11a37276e455e1dcf025c347452819980452d67e6e4899af11e8f7b1662dc05a87db03000e876d1155b HEAD_REF main - PATCHES - fix_cmake_file.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXAMPLES=OFF + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/minio-cpp/vcpkg.json b/external_imported/vcpkg/ports/minio-cpp/vcpkg.json index ce2726824..b207d4fa6 100644 --- a/external_imported/vcpkg/ports/minio-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/minio-cpp/vcpkg.json @@ -1,10 +1,20 @@ { "name": "minio-cpp", - "version-date": "2022-01-03", - "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", - "supports": "!uwp", + "version": "0.1.1", + "port-version": 1, + "description": "The MinIO C++ Client SDK provides simple APIs to access any Amazon S3 compatible object storage", + "homepage": "https://github.com/minio/minio-cpp", + "license": "Apache-2.0", + "supports": "!windows & !uwp", "dependencies": [ "curlpp", + { + "name": "inih", + "features": [ + "cpp" + ] + }, + "nlohmann-json", "openssl", "pugixml", { diff --git a/external_imported/vcpkg/ports/minizip/0004-define.patch b/external_imported/vcpkg/ports/minizip/0004-define.patch new file mode 100644 index 000000000..f7bf5ff6f --- /dev/null +++ b/external_imported/vcpkg/ports/minizip/0004-define.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c +index 274f39eb1..9736fbb0f 100644 +--- a/contrib/minizip/iowin32.c ++++ b/contrib/minizip/iowin32.c +@@ -27,7 +27,7 @@ + + + // see Include/shared/winapifamily.h in the Windows Kit +-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) ++#if defined(WINAPI_FAMILY_ONE_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) + #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) + #define IOWIN32_USING_WINRT_API 1 + #endif diff --git a/external_imported/vcpkg/ports/minizip/portfile.cmake b/external_imported/vcpkg/ports/minizip/portfile.cmake index 5e5a56e38..006df5863 100644 --- a/external_imported/vcpkg/ports/minizip/portfile.cmake +++ b/external_imported/vcpkg/ports/minizip/portfile.cmake @@ -10,18 +10,18 @@ vcpkg_from_github( 0001-remove-ifndef-NOUNCRYPT.patch 0002-add-declaration-for-mkdir.patch 0003-no-io64.patch + 0004-define.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS bzip2 ENABLE_BZIP2 ) -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) +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) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS} @@ -29,10 +29,10 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip) +vcpkg_cmake_config_fixup() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip") if ("bzip2" IN_LIST FEATURES) file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") @@ -43,4 +43,4 @@ if ("bzip2" IN_LIST FEATURES) endforeach() endif() -file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/minizip/vcpkg.json b/external_imported/vcpkg/ports/minizip/vcpkg.json index c8bc8dbb6..31a55ac10 100644 --- a/external_imported/vcpkg/ports/minizip/vcpkg.json +++ b/external_imported/vcpkg/ports/minizip/vcpkg.json @@ -1,11 +1,19 @@ { "name": "minizip", "version-semver": "1.2.11", - "port-version": 10, + "port-version": 11, "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/external_imported/vcpkg/ports/mmloader/portfile.cmake b/external_imported/vcpkg/ports/mmloader/portfile.cmake index 72d653484..1250881fa 100644 --- a/external_imported/vcpkg/ports/mmloader/portfile.cmake +++ b/external_imported/vcpkg/ports/mmloader/portfile.cmake @@ -1,4 +1,5 @@ -# source +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tishion/mmLoader @@ -7,27 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -# feature vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES shellcode BUILD_SHELLCODE_GEN ) -# config -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -# pre-clean -file(REMOVE_RECURSE "${SOURCE_PATH}/output") - -# build and install -vcpkg_install_cmake(DISABLE_PARALLEL) +vcpkg_cmake_install(DISABLE_PARALLEL) -# remove the debug/include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# collect license files file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mmloader/vcpkg.json b/external_imported/vcpkg/ports/mmloader/vcpkg.json index 30d49748f..e436ab111 100644 --- a/external_imported/vcpkg/ports/mmloader/vcpkg.json +++ b/external_imported/vcpkg/ports/mmloader/vcpkg.json @@ -1,10 +1,17 @@ { "name": "mmloader", - "version-date": "2021-12-13", - "port-version": 1, + "version": "1.0.1", + "port-version": 2, "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", - "supports": "(x86 | x64) & windows & static", + "license": "MIT", + "supports": "(x86 | x64) & windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "shellcode": { "description": "Generate mmLoader shell code headers" diff --git a/external_imported/vcpkg/ports/mnn/use-package-and-install.patch b/external_imported/vcpkg/ports/mnn/use-package-and-install.patch index dce33c8ed..be5329111 100644 --- a/external_imported/vcpkg/ports/mnn/use-package-and-install.patch +++ b/external_imported/vcpkg/ports/mnn/use-package-and-install.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 993f15d..53f24ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,18 +270,24 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "^Linux") @@ -11,7 +9,7 @@ index 993f15d..53f24ae 100644 + find_package(OpenCL REQUIRED) +endif() +find_package(RapidJSON CONFIG REQUIRED) -+find_path(STB_INCLUDE_DIRS "stb.h") ++find_path(STB_INCLUDE_DIRS stb_image.h) +find_package(Flatbuffers CONFIG REQUIRED) include_directories(${CMAKE_CURRENT_LIST_DIR}/include/ ${CMAKE_CURRENT_LIST_DIR}/source/ diff --git a/external_imported/vcpkg/ports/mnn/vcpkg.json b/external_imported/vcpkg/ports/mnn/vcpkg.json index 0b21ba2f4..d23de738e 100644 --- a/external_imported/vcpkg/ports/mnn/vcpkg.json +++ b/external_imported/vcpkg/ports/mnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mnn", "version": "1.1.0", - "port-version": 2, + "port-version": 3, "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba", "homepage": "https://www.mnn.zone/", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake b/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake index 1b208519e..4b03c74d3 100644 --- a/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake +++ b/external_imported/vcpkg/ports/mongo-cxx-driver/portfile.cmake @@ -2,6 +2,7 @@ set(VERSION_MAJOR 3) set(VERSION_MINOR 6) set(VERSION_PATCH 5) set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(BSONCXX_STANDARD 11) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -29,6 +30,7 @@ elseif ("boost" IN_LIST FEATURES) set(BSONCXX_POLY BOOST) elseif("std-experimental" IN_LIST FEATURES) set(BSONCXX_POLY STD_EXPERIMENTAL) + set(BSONCXX_STANDARD 17) else() if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BSONCXX_POLY BOOST) @@ -43,6 +45,7 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include -DBSONCXX_HEADER_INSTALL_DIR=include -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1 + -DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD} -DBUILD_VERSION=${VERSION_FULL} ) diff --git a/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json b/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json index 6b0216a30..c76a2a49a 100644 --- a/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json +++ b/external_imported/vcpkg/ports/mongo-cxx-driver/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mongo-cxx-driver", "version": "3.6.5", - "port-version": 2, + "port-version": 3, "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", + "license": "Apache-2.0", "dependencies": [ "boost-optional", "boost-smart-ptr", diff --git a/external_imported/vcpkg/ports/mongoose/portfile.cmake b/external_imported/vcpkg/ports/mongoose/portfile.cmake index d5912f6e0..e9c0f9903 100644 --- a/external_imported/vcpkg/ports/mongoose/portfile.cmake +++ b/external_imported/vcpkg/ports/mongoose/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose - REF 9d38e26b817b6b151fd925e9a8420a46c99a8375 #v7.5 - SHA512 ce488a6b9dc1e7437b17ea32e62c2c90fe05b298df995e624f24f05c539ee96444fa892dab7958a81541c711bb3e399808f793c8ce317b0fd904b037955d81fa + REF 1b82aa02aa3d6fecfc23ed0a94c6917f139de1ad #v7.6 + SHA512 50f13a2cc5dca6ccbc30e9686166b8615faad0ea010966d215d583c04338396a5d2613fe065cc17d8f918673b20004596ca8f73f1b636679db82dbb063698a80 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/mongoose/vcpkg.json b/external_imported/vcpkg/ports/mongoose/vcpkg.json index 1177b737e..b8f4f4e1a 100644 --- a/external_imported/vcpkg/ports/mongoose/vcpkg.json +++ b/external_imported/vcpkg/ports/mongoose/vcpkg.json @@ -1,9 +1,9 @@ { "name": "mongoose", - "version": "7.5", - "port-version": 1, + "version": "7.6", "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/moos-core/portfile.cmake b/external_imported/vcpkg/ports/moos-core/portfile.cmake index 197467428..b799cc2ed 100644 --- a/external_imported/vcpkg/ports/moos-core/portfile.cmake +++ b/external_imported/vcpkg/ports/moos-core/portfile.cmake @@ -10,22 +10,20 @@ vcpkg_from_github( cmake_fix.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DCMAKE_ENABLE_EXPORT=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MOOS) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MOOS) # Stage tools -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(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") -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/Core/GPLCore.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/moos-core/vcpkg.json b/external_imported/vcpkg/ports/moos-core/vcpkg.json index 43a01cf25..068e390a1 100644 --- a/external_imported/vcpkg/ports/moos-core/vcpkg.json +++ b/external_imported/vcpkg/ports/moos-core/vcpkg.json @@ -1,7 +1,18 @@ { "name": "moos-core", - "version-string": "10.4.0", - "port-version": 6, + "version": "10.4.0", + "port-version": 7, "description": "A very light weight, easy to use middleware.", - "homepage": "https://sites.google.com/site/moossoftware/" + "homepage": "https://sites.google.com/site/moossoftware/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/mosquitto/0001-add-archive-destination-to-install.patch b/external_imported/vcpkg/ports/mosquitto/0001-add-archive-destination-to-install.patch deleted file mode 100644 index 5df6128ed..000000000 --- a/external_imported/vcpkg/ports/mosquitto/0001-add-archive-destination-to-install.patch +++ /dev/null @@ -1,39 +0,0 @@ -From df5ec7ba4e7b1516a2636e47c33a4a6161b5c422 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:38:44 -0700 -Subject: [PATCH 1/5] add archive destination to install - ---- - lib/CMakeLists.txt | 2 +- - lib/cpp/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f1..bd60b75 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -87,7 +87,7 @@ set_target_properties(libmosquitto PROPERTIES - SOVERSION 1 - ) - --install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - if (WITH_STATIC_LIBRARIES) - add_library(libmosquitto_static STATIC ${C_SRC}) -diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt -index b39ac3f..5805244 100644 ---- a/lib/cpp/CMakeLists.txt -+++ b/lib/cpp/CMakeLists.txt -@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES - VERSION ${VERSION} - SOVERSION 1 - ) --install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - if (WITH_STATIC_LIBRARIES) - add_library(mosquittopp_static STATIC --- -2.24.3 (Apple Git-128) - diff --git a/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch b/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch index dae3d03a3..c140a7873 100644 --- a/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch +++ b/external_imported/vcpkg/ports/mosquitto/0002-win64-support.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07eff849..3edc7efa 100644 +index 2775a3da..ddd81b04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) diff --git a/external_imported/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch b/external_imported/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch index b167b0da5..fc61ddfd5 100644 --- a/external_imported/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch +++ b/external_imported/vcpkg/ports/mosquitto/0003-add-find_package-libwebsockets.patch @@ -1,17 +1,8 @@ -From 902ab5bf91937188d3ebf0aece81a704729e5580 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:42:53 -0700 -Subject: [PATCH 3/5] add find_package libwebsockets - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a92fe3..3c78b2c 100644 +index 2775a3da..ef7ce14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,6 +45,7 @@ endif (WITH_TLS) +@@ -55,6 +55,7 @@ endif (WITH_UNIX_SOCKETS AND NOT WIN32) option(WITH_SOCKS "Include SOCKS5 support?" ON) if (WITH_SOCKS) @@ -19,6 +10,3 @@ index 1a92fe3..3c78b2c 100644 add_definitions("-DWITH_SOCKS") endif (WITH_SOCKS) --- -2.24.3 (Apple Git-128) - diff --git a/external_imported/vcpkg/ports/mosquitto/0004-support-static-build.patch b/external_imported/vcpkg/ports/mosquitto/0004-support-static-build.patch index bd3e44d03..858357303 100644 --- a/external_imported/vcpkg/ports/mosquitto/0004-support-static-build.patch +++ b/external_imported/vcpkg/ports/mosquitto/0004-support-static-build.patch @@ -1,5 +1,5 @@ diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt -index 13a7d826..31069306 100644 +index 13a7d826..5e96f49c 100644 --- a/apps/mosquitto_passwd/CMakeLists.txt +++ b/apps/mosquitto_passwd/CMakeLists.txt @@ -13,6 +13,10 @@ if (WITH_TLS) @@ -15,7 +15,7 @@ index 13a7d826..31069306 100644 install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") endif (WITH_TLS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5da221dc..c3e9fce0 100644 +index 31cc35e3..a1a3e01a 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -69,7 +69,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID) diff --git a/external_imported/vcpkg/ports/mosquitto/portfile.cmake b/external_imported/vcpkg/ports/mosquitto/portfile.cmake index c20fe2a9f..ab11f068f 100644 --- a/external_imported/vcpkg/ports/mosquitto/portfile.cmake +++ b/external_imported/vcpkg/ports/mosquitto/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto HEAD_REF master - REF v2.0.12 - SHA512 bf502f4f8c5f8d9ae9ee6e6a417e3f9deea9933c69176903d460a1c91132658ebe093c8e9ed000cb579fe93f15626c15d8041ceb6438e15caca1d153a67975f9 + REF v2.0.14 + SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945 PATCHES - 0001-add-archive-destination-to-install.patch 0002-win64-support.patch 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch @@ -14,9 +13,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_STATIC_LIBRARIES=${STATIC_LINKAGE} -DWITH_SRV=OFF @@ -28,36 +26,36 @@ vcpkg_configure_cmake( -DDOCUMENTATION=OFF -DWITH_PLUGINS=OFF -DWITH_CJSON=OFF + -DWITH_CLIENTS=OFF + -DWITH_APPS=OFF + -DWITH_BROKER=OFF + -DWITH_BUNDLED_DEPS=OFF + MAYBE_UNUSED_VARIABLES + WITH_WEBSOCKETS + STATIC_WEBSOCKETS ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_fixup_pkgconfig() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_passwd${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_passwd${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_pub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_pub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_rr${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_rr${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(GLOB VERSIONED_LIBRARIES LIST_DIRECTORIES FALSE - ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* - ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" + "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*" ) if(NOT "x${VERSIONED_LIBRARIES}x" STREQUAL "xx") @@ -65,16 +63,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() if(NOT "x${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}x" STREQUAL "xx") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}") endif() endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -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_fixup_pkgconfig() +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) diff --git a/external_imported/vcpkg/ports/mosquitto/vcpkg.json b/external_imported/vcpkg/ports/mosquitto/vcpkg.json index b73e452f0..db3138070 100644 --- a/external_imported/vcpkg/ports/mosquitto/vcpkg.json +++ b/external_imported/vcpkg/ports/mosquitto/vcpkg.json @@ -1,13 +1,18 @@ { "name": "mosquitto", - "version": "2.0.12", - "port-version": 3, + "version": "2.0.14", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", - "homepage": "https://mosquitto.org/download/", + "homepage": "https://mosquitto.org/", + "license": "EPL-2.0", "dependencies": [ "c-ares", "libwebsockets", "openssl", - "pthreads" + "pthreads", + "uthash", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/mp-units/cmake.patch b/external_imported/vcpkg/ports/mp-units/cmake.patch deleted file mode 100644 index d2d4a1a54..000000000 --- a/external_imported/vcpkg/ports/mp-units/cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b18a30a96..d89248aa1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,11 +66,21 @@ conan_init(cmake) - add_subdirectory(src) - - # add usage example --add_subdirectory(example) -+option(BUILD_EXAMPLES "Build usage examples" OFF) -+if(BUILD_EXAMPLES) -+ add_subdirectory(example) -+endif() - - # generate project documentation --add_subdirectory(docs) -+option(BUILD_DOCS "Generate docs" OFF) -+if(BUILD_DOCS) -+ add_subdirectory(docs) -+endif() - - # add unit tests --enable_testing() --add_subdirectory(test) -+option(BUILD_TESTING "Build tests" OFF) -+if(BUILD_TESTING) -+ set_warnings(mp-units) -+ enable_testing() -+ add_subdirectory(test) -+endif() diff --git a/external_imported/vcpkg/ports/mp-units/portfile.cmake b/external_imported/vcpkg/ports/mp-units/portfile.cmake index f608f1af1..04236589d 100644 --- a/external_imported/vcpkg/ports/mp-units/portfile.cmake +++ b/external_imported/vcpkg/ports/mp-units/portfile.cmake @@ -4,12 +4,11 @@ vcpkg_from_github( REF v0.7.0 SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 PATCHES - cmake.patch config.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/src" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/mp-units/vcpkg.json b/external_imported/vcpkg/ports/mp-units/vcpkg.json index e4cc95da2..7454612bc 100644 --- a/external_imported/vcpkg/ports/mp-units/vcpkg.json +++ b/external_imported/vcpkg/ports/mp-units/vcpkg.json @@ -1,8 +1,10 @@ { "name": "mp-units", "version-semver": "0.7.0", + "port-version": 1, "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", + "license": "MIT", "dependencies": [ "fmt", "gsl-lite", diff --git a/external_imported/vcpkg/ports/mp3lame/portfile.cmake b/external_imported/vcpkg/ports/mp3lame/portfile.cmake index f30f9e2cb..6d7073347 100644 --- a/external_imported/vcpkg/ports/mp3lame/portfile.cmake +++ b/external_imported/vcpkg/ports/mp3lame/portfile.cmake @@ -13,24 +13,24 @@ vcpkg_from_sourceforge( if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(platform "ARM64") - set(machine "ARM64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(platform "ARM") - set(machine "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(platform "x64") - set(machine "x64") - else() - set(platform "Win32") - set(machine "x86") - endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(platform "ARM64") + set(machine "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(platform "ARM") + set(machine "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(platform "x64") + set(machine "x64") + else() + set(platform "Win32") + set(machine "x86") + endif() - file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con) - string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}") - string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}") - file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}") + file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con) + string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}") + string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}") + file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}") file(GLOB vcxprojs RELATIVE "${SOURCE_PATH}/vc_solution" "${SOURCE_PATH}/vc_solution/vc11_*.vcxproj") @@ -41,10 +41,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "DLL" "" vcxproj_con "${vcxproj_con}") endif() - string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}") - string(REPLACE "Win32" "${platform}" vcxproj_con "${vcxproj_con}") - string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}") - string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}") + string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Win32" "${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}") if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") string(REPLACE "/APPCONTAINER" "" vcxproj_con "${vcxproj_con}") @@ -54,7 +54,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endforeach() vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" TARGET "lame" PLATFORM "${platform}" @@ -62,22 +62,22 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib") endif() set(MP3LAME_LIB "libmp3lame-static.lib") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib") endif() set(MP3LAME_LIB "libmp3lame.lib") endif() @@ -101,20 +101,21 @@ else() endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET OPTIONS ${OPTIONS} ) vcpkg_install_make() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) - endif() -file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame) -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1") + +file(COPY "${SOURCE_PATH}/include/lame.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/lame") +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mp3lame/vcpkg.json b/external_imported/vcpkg/ports/mp3lame/vcpkg.json index f0c7cfca9..13eda2965 100644 --- a/external_imported/vcpkg/ports/mp3lame/vcpkg.json +++ b/external_imported/vcpkg/ports/mp3lame/vcpkg.json @@ -1,7 +1,8 @@ { "name": "mp3lame", - "version-string": "3.100", - "port-version": 7, + "version": "3.100", + "port-version": 8, "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", - "homepage": "http://lame.sourceforge.net/" + "homepage": "https://sourceforge.net/projects/lame", + "license": "LGPL-2.0-only" } diff --git a/external_imported/vcpkg/ports/mpfr/portfile.cmake b/external_imported/vcpkg/ports/mpfr/portfile.cmake index 83354d7d9..2b7960308 100644 --- a/external_imported/vcpkg/ports/mpfr/portfile.cmake +++ b/external_imported/vcpkg/ports/mpfr/portfile.cmake @@ -1,4 +1,4 @@ -if (VCPKG_TARGET_IS_LINUX) +if(VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following packages:\n autoconf-archive\nThese can be installed on Ubuntu systems via\n sudo apt-get update -y\n sudo apt-get install -y autoconf-archive\n") endif() @@ -12,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES + PATCHES dll.patch src-only.patch ) @@ -31,5 +31,14 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE + "${CURRENT_PACKAGES_DIR}/share/${PORT}/AUTHORS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/BUGS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.LESSER" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/NEWS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/TODO" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING.LESSER") diff --git a/external_imported/vcpkg/ports/mpfr/usage b/external_imported/vcpkg/ports/mpfr/usage new file mode 100644 index 000000000..0219b24b7 --- /dev/null +++ b/external_imported/vcpkg/ports/mpfr/usage @@ -0,0 +1,6 @@ +The package mpfr can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(mpfr REQUIRED IMPORTED_TARGET mpfr) + + target_link_libraries(main PRIVATE PkgConfig::mpfr) diff --git a/external_imported/vcpkg/ports/mpfr/vcpkg.json b/external_imported/vcpkg/ports/mpfr/vcpkg.json index 195d7efbe..ec64b8c27 100644 --- a/external_imported/vcpkg/ports/mpfr/vcpkg.json +++ b/external_imported/vcpkg/ports/mpfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpfr", "version": "4.1.0", - "port-version": 4, + "port-version": 6, "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", diff --git a/external_imported/vcpkg/ports/mpg123/fix-m1-build.patch b/external_imported/vcpkg/ports/mpg123/fix-m1-build.patch new file mode 100644 index 000000000..d198d953b --- /dev/null +++ b/external_imported/vcpkg/ports/mpg123/fix-m1-build.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index ee9a1ba..81d23f8 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -185,7 +185,7 @@ if(NO_MESSAGES) + set(NO_ERETURN ON) + endif() + +-if(WIN32) ++if(WIN32 OR APPLE) + set(HAVE_FPU 1) + else() + cmake_host_system_information(RESULT HAVE_FPU QUERY HAS_FPU) diff --git a/external_imported/vcpkg/ports/mpg123/no-executables.patch b/external_imported/vcpkg/ports/mpg123/no-executables.patch deleted file mode 100644 index a7a62ec1d..000000000 --- a/external_imported/vcpkg/ports/mpg123/no-executables.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt -index c7ba36f..7147174 100644 ---- a/ports/cmake/src/CMakeLists.txt -+++ b/ports/cmake/src/CMakeLists.txt -@@ -372,7 +372,7 @@ if(BUILD_LIBOUT123) - endif() - add_subdirectory("libsyn123") - --if(UNIX) -+if(0) - add_subdirectory("tests") - - if(BUILD_LIBOUT123) diff --git a/external_imported/vcpkg/ports/mpg123/portfile.cmake b/external_imported/vcpkg/ports/mpg123/portfile.cmake index 87a07c267..4efadfc92 100644 --- a/external_imported/vcpkg/ports/mpg123/portfile.cmake +++ b/external_imported/vcpkg/ports/mpg123/portfile.cmake @@ -1,15 +1,14 @@ -set(MPG123_VERSION 1.29.2) -set(MPG123_HASH ffb82ffbebedeb12783338b5159bf055afd25cb77e1b705bef29f04fa50bcb2ceaf2a6418d0e111fab1151ea956fe48ba3576d978e6b0c8f4ca72c3883608ec0) +set(MPG123_VERSION 1.29.3) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO mpg123/mpg123 REF ${MPG123_VERSION} FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" - SHA512 ${MPG123_HASH} + SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6 PATCHES - no-executables.patch fix-modulejack.patch + fix-m1-build.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -19,7 +18,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" - OPTIONS -DUSE_MODULES=OFF + OPTIONS + -DUSE_MODULES=OFF + -DBUILD_PROGRAMS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) @@ -28,4 +29,9 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mpg123/vcpkg.json b/external_imported/vcpkg/ports/mpg123/vcpkg.json index a2723881a..018bac57e 100644 --- a/external_imported/vcpkg/ports/mpg123/vcpkg.json +++ b/external_imported/vcpkg/ports/mpg123/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mpg123", - "version": "1.29.2", - "port-version": 2, + "version": "1.29.3", "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", diff --git a/external_imported/vcpkg/ports/mpi/portfile.cmake b/external_imported/vcpkg/ports/mpi/portfile.cmake index 065116c27..89bec5e34 100644 --- a/external_imported/vcpkg/ports/mpi/portfile.cmake +++ b/external_imported/vcpkg/ports/mpi/portfile.cmake @@ -1 +1,5 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if (VCPKG_TARGET_IS_WINDOWS) + file(INSTALL "${CURRENT_INSTALLED_DIR}/share/msmpi/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME vcpkg-cmake-wrapper.cmake) +endif() diff --git a/external_imported/vcpkg/ports/mpi/vcpkg.json b/external_imported/vcpkg/ports/mpi/vcpkg.json index 386b978bd..2d5bbaddf 100644 --- a/external_imported/vcpkg/ports/mpi/vcpkg.json +++ b/external_imported/vcpkg/ports/mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mpi", "version-string": "1", - "port-version": 2, + "port-version": 3, "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", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/mpir/portfile.cmake b/external_imported/vcpkg/ports/mpir/portfile.cmake index 1b8e188c3..db2e2163e 100644 --- a/external_imported/vcpkg/ports/mpir/portfile.cmake +++ b/external_imported/vcpkg/ports/mpir/portfile.cmake @@ -19,12 +19,12 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC "--enable-static --disable-shared") + set(SHARED_STATIC --enable-static --disable-shared --with-pic) else() - set(SHARED_STATIC "--disable-static --enable-shared") + set(SHARED_STATIC --disable-static --enable-shared) endif() - set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") + set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") diff --git a/external_imported/vcpkg/ports/mpir/vcpkg.json b/external_imported/vcpkg/ports/mpir/vcpkg.json index 3d5a05a43..5a9c0cc9f 100644 --- a/external_imported/vcpkg/ports/mpir/vcpkg.json +++ b/external_imported/vcpkg/ports/mpir/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpir", "version-date": "2022-03-02", + "port-version": 1, "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", "license": "GPL-3.0-only", diff --git a/external_imported/vcpkg/ports/mpmcqueue/portfile.cmake b/external_imported/vcpkg/ports/mpmcqueue/portfile.cmake index f1fe1d3a0..5ea35ba3f 100644 --- a/external_imported/vcpkg/ports/mpmcqueue/portfile.cmake +++ b/external_imported/vcpkg/ports/mpmcqueue/portfile.cmake @@ -3,15 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rigtorp/MPMCQueue - REF 5883e32b07e8a60c22d532d9120ea5c11348aea9 - SHA512 4adbbe5e014e0ef5c7030aaa9faa4e07e2c65753cd89c770da250811c13776576c4f1caf4144542318c41ebc7433b106e802c482a5d44572963a5ab59047257e + REF 28d05c021d68fc5280b593329d1982ed02f9d7b3 + SHA512 e3305ecac05d48814d75adcb85fa165eec3a439a17dd99f8b0d2c095e40b2f98bd4bcf167cf8268f84d09aa172ab66b30573d9d3ad4908c10dc5bec632529b8a HEAD_REF master ) -file(COPY - ${SOURCE_PATH}/include/rigtorp/MPMCQueue.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include/rigtorp -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/MPMCQueue) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # 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/external_imported/vcpkg/ports/mpmcqueue/vcpkg.json b/external_imported/vcpkg/ports/mpmcqueue/vcpkg.json index 4a6075538..f01f42881 100644 --- a/external_imported/vcpkg/ports/mpmcqueue/vcpkg.json +++ b/external_imported/vcpkg/ports/mpmcqueue/vcpkg.json @@ -1,7 +1,17 @@ { "name": "mpmcqueue", - "version-string": "2019-07-26", - "port-version": 1, + "version-date": "2021-12-01", "description": "A bounded multi-producer multi-consumer lock-free queue written in C++11", - "homepage": "https://github.com/rigtorp/MPMCQueue" + "homepage": "https://github.com/rigtorp/MPMCQueue", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake b/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake index a41fc5c7c..1fb0d6361 100644 --- a/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/mqtt-cpp/portfile.cmake @@ -1,23 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/mqtt_cpp - REF v12.0.0 - SHA512 60f2497633373a316724b7c8f87c090eb2bb26202bf48a55c32a13888bf3ec5e9bdc8854056735f625af5b016bcd9bca179d980077fb8752e16710992a0ea0c5 + REF v13.0.0 + SHA512 +2f0c85ac813cc6c99cc5b1ca02514ee6643abc39750bce541a362d1fcd281b8b9011cc39ddeaf4394fd3772904eed15e8ecbe6b3839caad13cae2b04201e682b HEAD_REF master -) + ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMQTT_BUILD_EXAMPLES=OFF - -DMQTT_BUILD_TESTS=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -) + -DMQTT_BUILD_EXAMPLES=OFF + -DMQTT_BUILD_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mqtt_cpp_iface) +vcpkg_cmake_config_fixup(PACKAGE_NAME mqtt_cpp_iface CONFIG_PATH lib/cmake/mqtt_cpp_iface) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json b/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json index 2f20851fb..791485f17 100644 --- a/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/mqtt-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "mqtt-cpp", - "version-semver": "12.0.0", + "version-semver": "13.0.0", "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", "homepage": "https://github.com/redboltz/mqtt_cpp", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-asio", - "boost-log", "boost-multi-index", + "boost-program-options", "boost-type-erasure", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake index c59b61bbe..2066ac672 100644 --- a/external_imported/vcpkg/ports/ms-gltf/portfile.cmake +++ b/external_imported/vcpkg/ports/ms-gltf/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/glTF-SDK - REF ac3e70392feb6aef18a07314669f6af2ebc72787 # r1.9.5.4 - SHA512 389b801ddc6f0b29269bcd1215fa9e63fe46a1f1a8778125c6439e34fe0925d5534b1cdbea30824a4a8aa008015124dc7cc4558daa9522fc6d85e00e8e41e4a9 + REF eaccf166e2718c6133db426545b6d008cb7ad79f # 28-06-2022 + SHA512 112e31d2f42d2fb22060a687f7d33f22e677d8d7eca006eb8c1edef6a61b8bad637df15492665656ea88a5a0b980851eb978a180b4a01d307d1bbc92f63500f1 HEAD_REF master PATCHES fix-install.patch @@ -23,14 +23,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples. # note: The PDB file path is making Ninja fails to install. # For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA. -set(WINDOWS_USE_MSBUILD) -if(VCPKG_TARGET_IS_WINDOWS) - set(WINDOWS_USE_MSBUILD "WINDOWS_USE_MSBUILD") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - ${WINDOWS_USE_MSBUILD} + WINDOWS_USE_MSBUILD OPTIONS ${FEATURE_OPTIONS} ) diff --git a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json index 34728d11b..d5e7ac83e 100644 --- a/external_imported/vcpkg/ports/ms-gltf/vcpkg.json +++ b/external_imported/vcpkg/ports/ms-gltf/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ms-gltf", - "version-string": "r1.9.5.4", + "version-date": "2022-06-28", "port-version": 1, "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", + "license": "MIT", "supports": "!linux", "dependencies": [ "rapidjson", diff --git a/external_imported/vcpkg/ports/msdfgen/portfile.cmake b/external_imported/vcpkg/ports/msdfgen/portfile.cmake index 16bb48a7e..fd187b8e5 100644 --- a/external_imported/vcpkg/ports/msdfgen/portfile.cmake +++ b/external_imported/vcpkg/ports/msdfgen/portfile.cmake @@ -8,15 +8,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Chlumsky/msdfgen - REF v1.9.1 - SHA512 7A721B38027548F66D1C3EB862C1F27EA0A431C325119504D072BA6D7ED87539BA4D6020C663354B7B82BA48725D77CC642DB05FB596749292A2A12BE21CE528 + REF v1.9.2 + SHA512 5080a640c353fde86883946a04581a072b39d0d2111b5f3217344510d78324cea69df4e5046a380e84cf7da247d96efd4407c041991fae69e128ba435774e30f HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools MSDFGEN_BUILD_MSDFGEN_STANDALONE + tools MSDFGEN_BUILD_STANDALONE openmp MSDFGEN_USE_OPENMP ) diff --git a/external_imported/vcpkg/ports/msdfgen/vcpkg.json b/external_imported/vcpkg/ports/msdfgen/vcpkg.json index ebc4372ee..7ecbe554f 100644 --- a/external_imported/vcpkg/ports/msdfgen/vcpkg.json +++ b/external_imported/vcpkg/ports/msdfgen/vcpkg.json @@ -1,8 +1,9 @@ { "name": "msdfgen", - "version": "1.9.1", + "version": "1.9.2", "description": "Multi-channel signed distance field generator", "homepage": "https://github.com/Chlumsky/msdfgen", + "license": "MIT", "dependencies": [ "freetype", { diff --git a/external_imported/vcpkg/ports/msix/vcpkg.json b/external_imported/vcpkg/ports/msix/vcpkg.json index b3e01e092..589d03298 100644 --- a/external_imported/vcpkg/ports/msix/vcpkg.json +++ b/external_imported/vcpkg/ports/msix/vcpkg.json @@ -1,9 +1,11 @@ { "name": "msix", "version": "1.7", - "port-version": 3, + "port-version": 4, "description": "The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.", "homepage": "https://github.com/microsoft/msix-packaging", + "license": "MIT", + "supports": "!static", "dependencies": [ "catch2", { diff --git a/external_imported/vcpkg/ports/msmpi/mpi-wrapper.cmake b/external_imported/vcpkg/ports/msmpi/mpi-wrapper.cmake new file mode 100644 index 000000000..03fc46c4f --- /dev/null +++ b/external_imported/vcpkg/ports/msmpi/mpi-wrapper.cmake @@ -0,0 +1,9 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +# Suitable for FindMPI.cmake line 937 +set(ENV{MSMPI_INC} "${_IMPORT_PREFIX}/include") +unset(_IMPORT_PREFIX) + +_find_package(${ARGS}) diff --git a/external_imported/vcpkg/ports/msmpi/portfile.cmake b/external_imported/vcpkg/ports/msmpi/portfile.cmake index c94e2c304..75dd39052 100644 --- a/external_imported/vcpkg/ports/msmpi/portfile.cmake +++ b/external_imported/vcpkg/ports/msmpi/portfile.cmake @@ -1,5 +1,5 @@ set(MSMPI_VERSION "10.1.12498") -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}") vcpkg_download_distfile(SDK_ARCHIVE URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi" @@ -27,10 +27,10 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") vcpkg_execute_required_process( COMMAND ${SYSTEM_MPIEXEC_FILEPATH} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME ${MPIEXEC_VERSION_LOGNAME} ) - file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT) + file(READ "${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log" MPIEXEC_OUTPUT) if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) @@ -69,13 +69,13 @@ file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec-${TARGET_TRIPLET}.log" MS set(PARAM_MSI "/a \"${SDK_ARCHIVE}\"") set(PARAM_LOG "/log \"${MSIEXEC_LOG_PATH}\"") set(PARAM_TARGET_DIR "TARGETDIR=\"${SDK_SOURCE_DIR}\"") -set(SCRIPT_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat) +set(SCRIPT_FILE "${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat") # Write the command out to a script file and run that to avoid weird escaping behavior when spaces are present file(WRITE ${SCRIPT_FILE} "msiexec ${PARAM_MSI} /qn ${PARAM_LOG} ${PARAM_TARGET_DIR}") vcpkg_execute_required_process( COMMAND ${SCRIPT_FILE} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME extract-sdk ) @@ -92,34 +92,37 @@ file(INSTALL "${SOURCE_INCLUDE_PATH}/pmidbg.h" "${SOURCE_INCLUDE_PATH}/${TRIPLET_SYSTEM_ARCH}/mpifptr.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) # NOTE: since the binary distribution does not include any debug libraries we always install the release libraries SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) file(GLOB STATIC_LIBS - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib - ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" + "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" ) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) if(VCPKG_CRT_LINKAGE STREQUAL "static") - file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL ${STATIC_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/mpi-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + # Handle copyright -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") diff --git a/external_imported/vcpkg/ports/msmpi/vcpkg.json b/external_imported/vcpkg/ports/msmpi/vcpkg.json index d220c1d61..972571482 100644 --- a/external_imported/vcpkg/ports/msmpi/vcpkg.json +++ b/external_imported/vcpkg/ports/msmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msmpi", "version": "10.1.12498", - "port-version": 3, + "port-version": 4, "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.", "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi", "license": "MIT", diff --git a/external_imported/vcpkg/ports/mygui/Install-tools.patch b/external_imported/vcpkg/ports/mygui/Install-tools.patch new file mode 100644 index 000000000..bdfc2c90f --- /dev/null +++ b/external_imported/vcpkg/ports/mygui/Install-tools.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +index 6483339..71710de 100644 +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -170,6 +170,9 @@ 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 ++ ) + endif () + set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) + diff --git a/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch b/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch new file mode 100644 index 000000000..6a6059ee6 --- /dev/null +++ b/external_imported/vcpkg/ports/mygui/Use-vcpkg-sdl2.patch @@ -0,0 +1,14 @@ +diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt +index 2b160ff..559e6a8 100644 +--- a/Common/CMakeLists.txt ++++ b/Common/CMakeLists.txt +@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) + + mygui_set_platform_name(${MYGUI_RENDERSYSTEM}) + add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) +-target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) ++ ++find_package(SDL2 CONFIG REQUIRED) ++target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main) + + add_dependencies(${PROJECTNAME} MyGUIEngine) diff --git a/external_imported/vcpkg/ports/mygui/portfile.cmake b/external_imported/vcpkg/ports/mygui/portfile.cmake index c728aefec..a443744f3 100644 --- a/external_imported/vcpkg/ports/mygui/portfile.cmake +++ b/external_imported/vcpkg/ports/mygui/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-generation.patch + Use-vcpkg-sdl2.patch + Install-tools.patch ) if("opengl" IN_LIST FEATURES) @@ -18,18 +20,23 @@ else() set(MYGUI_RENDERSYSTEM 1) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools MYGUI_BUILD_TOOLS +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMYGUI_STATIC=TRUE -DMYGUI_BUILD_DEMOS=FALSE -DMYGUI_BUILD_PLUGINS=TRUE - -DMYGUI_BUILD_TOOLS=FALSE -DMYGUI_BUILD_UNITTESTS=FALSE -DMYGUI_BUILD_TEST_APP=FALSE -DMYGUI_BUILD_WRAPPER=FALSE -DMYGUI_BUILD_DOCS=FALSE -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -41,5 +48,9 @@ file(REMOVE_RECURSE vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES FontEditor ImageEditor LayoutEditor SkinEditor AUTO_CLEAN) +endif() + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mygui/vcpkg.json b/external_imported/vcpkg/ports/mygui/vcpkg.json index aabd5655a..761ef55f3 100644 --- a/external_imported/vcpkg/ports/mygui/vcpkg.json +++ b/external_imported/vcpkg/ports/mygui/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mygui", "version": "3.4.1", - "port-version": 2, + "port-version": 3, "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", + "license": "MIT", "supports": "!uwp", "dependencies": [ "freetype", @@ -23,6 +24,9 @@ "dependencies": [ "opengl" ] + }, + "tools": { + "description": "Install MyGUI tools." } } } diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch b/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch new file mode 100644 index 000000000..75c854024 --- /dev/null +++ b/external_imported/vcpkg/ports/mysql-connector-cpp/export-targets.patch @@ -0,0 +1,69 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e734714..6d665dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -397,7 +397,7 @@ add_subdirectory(devapi) + # Generate the main connector library. + + merge_libraries(connector xapi devapi) +-target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include") ++target_include_directories(connector PRIVATE "${PROJECT_SOURCE_DIR}/include") + + + # +@@ -472,32 +472,23 @@ set_target_properties(connector PROPERTIES + SOVERSION "${ABI_VERSION_MAJOR}" + ) + +- +-install(TARGETS connector +- CONFIGURATIONS Release RelWithDebInfo +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev +- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +-) +- +-install(TARGETS connector +- CONFIGURATIONS Debug +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev +- RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll ++install(TARGETS connector EXPORT unofficial-mysql-connector-cpp-targets ++ ARCHIVE DESTINATION lib COMPONENT XDevAPIDev ++ RUNTIME DESTINATION bin COMPONENT XDevAPIDll ++ LIBRARY DESTINATION lib COMPONENT XDevAPIDll + ) + + if(MSVC AND NOT BUILD_STATIC) + + install(FILES $ + CONFIGURATIONS RelWithDebInfo +- DESTINATION "${INSTALL_LIB_DIR}" ++ DESTINATION bin + COMPONENT Debuginfo + ) + + install(FILES $ + CONFIGURATIONS Debug +- DESTINATION "${INSTALL_LIB_DIR}/debug" ++ DESTINATION bin + COMPONENT Debuginfo + ) + +@@ -604,3 +595,15 @@ endif() + + + show_config_options() ++ ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ "${CMAKE_SOURCE_DIR}/mysql-connector-cpp-config.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" ++ INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" ++) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") ++install(EXPORT unofficial-mysql-connector-cpp-targets ++ NAMESPACE unofficial::mysql-connector-cpp:: ++ DESTINATION share/unofficial-mysql-connector-cpp ++) +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch b/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch new file mode 100644 index 000000000..b0e60c088 --- /dev/null +++ b/external_imported/vcpkg/ports/mysql-connector-cpp/fix-static-build8.patch @@ -0,0 +1,131 @@ +diff --git a/cdk/cmake/dependency.cmake b/cdk/cmake/dependency.cmake +index a1775da..f9c3edf 100644 +--- a/cdk/cmake/dependency.cmake ++++ b/cdk/cmake/dependency.cmake +@@ -57,6 +57,7 @@ set(EXT_FWD + CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION + CMAKE_SYSTEM_PROCESSOR + CMAKE_C_COMPILER CMAKE_CXX_COMPILER ++ BUILD_SHARED_LIBS STATIC_MSVCRT BUILD_STATIC + ) + + set(EXT_DIR ${CMAKE_CURRENT_LIST_DIR}/ext CACHE INTERNAL "external project utils location") +@@ -117,7 +118,7 @@ function(add_ext NAME) + endif() + + foreach(var ${EXT_FWD}) +- if(${var}) ++ if(DEFINED ${var}) + message("-- option ${var}: ${${var}}") + list(APPEND cmake_opts -D${var}=${${var}}) + endif() +diff --git a/cdk/extra/lz4/CMakeLists.txt b/cdk/extra/lz4/CMakeLists.txt +index 4c3aab0..a1596af 100644 +--- a/cdk/extra/lz4/CMakeLists.txt ++++ b/cdk/extra/lz4/CMakeLists.txt +@@ -34,6 +34,10 @@ include(platform) + + enable_pic() + ++if (MSVC AND STATIC_MSVCRT) ++ message("lz4 using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + add_library(lz4 STATIC + lz4.c + lz4frame.c +diff --git a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt +index efe6b97..377a817 100644 +--- a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt ++++ b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt +@@ -186,9 +186,9 @@ else (protobuf_BUILD_SHARED_LIBS) + # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags + # making programmatic control difficult. Prefer the functionality in newer + # CMake versions when available. +- if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) +- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) +- else() ++ #if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) ++ # set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) ++ #else() + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. + # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx +@@ -203,7 +203,7 @@ else (protobuf_BUILD_SHARED_LIBS) + endif(${flag_var} MATCHES "/MD") + endforeach(flag_var) + endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME) +- endif() ++ #endif() + endif (protobuf_BUILD_SHARED_LIBS) + + if (MSVC) +diff --git a/cdk/extra/zlib/CMakeLists.txt b/cdk/extra/zlib/CMakeLists.txt +index 237c2c3..7746bd0 100644 +--- a/cdk/extra/zlib/CMakeLists.txt ++++ b/cdk/extra/zlib/CMakeLists.txt +@@ -162,6 +162,10 @@ endif() + + # ------------------------------------------------------------------------- + ++if (MSVC AND STATIC_MSVCRT) ++ message("zlib using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + ADD_LIBRARY(zlib STATIC + ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + +diff --git a/cdk/extra/zstd/CMakeLists.txt b/cdk/extra/zstd/CMakeLists.txt +index 2109f3e..a60034e 100644 +--- a/cdk/extra/zstd/CMakeLists.txt ++++ b/cdk/extra/zstd/CMakeLists.txt +@@ -57,6 +57,10 @@ SET(ZSTD_SRCS + lib/dictBuilder/zdict.c + ) + ++if (MSVC AND STATIC_MSVCRT) ++ message("zstd using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + ADD_LIBRARY(zstd STATIC ${ZSTD_SRCS}) + set_target_properties(zstd PROPERTIES FOLDER "Misc") + +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 05ea32e..ff26ba6 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -164,7 +164,11 @@ function(merge_libraries TARGET) + set_property(SOURCE "${LIBUTILS_SCRIPT_DIR}/empty.cc" PROPERTY LANGUAGE CXX) + + add_library(${TARGET} ${TYPE} "${LIBUTILS_SCRIPT_DIR}/empty.cc") +- target_link_libraries(${TARGET} PRIVATE ${ARGN}) ++ if(TYPE STREQUAL "SHARED") ++ target_link_libraries(${TARGET} PRIVATE ${ARGN}) ++ else() ++ add_dependencies(${TARGET} ${ARGN}) ++ endif() + + # + # Arrange for marge_archives.cmake script to be executed in a POST_BUILD +@@ -314,7 +318,7 @@ function(merge_libraries TARGET) + --target ${TARGET}-deps + --config $ + -- +- /nologo /v:q /filelogger /flp:Verbosity=q /flp:ShowCommandLine ++ /nologo /v:q /filelogger /flp:Verbosity=m /flp:ShowCommandLine + /flp:LogFile=\"${log_file}.STATIC\" + + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +diff --git a/install_layout.cmake b/install_layout.cmake +index 5730ce4..e6514ac 100644 +--- a/install_layout.cmake ++++ b/install_layout.cmake +@@ -177,7 +177,7 @@ set(LIB_NAME_BASE "mysqlcppconn${CONCPP_VERSION_MAJOR}") + set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static") + + if(WIN32 AND STATIC_MSVCRT) +- set(LIB_NAME_STATIC "${LIB_NAME}-mt") ++ set(LIB_NAME_STATIC "${LIB_NAME_STATIC}-mt") + endif() + + if(BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in b/external_imported/vcpkg/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in new file mode 100644 index 000000000..5d2e07e75 --- /dev/null +++ b/external_imported/vcpkg/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in @@ -0,0 +1,8 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(OpenSSL) + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-mysql-connector-cpp-targets.cmake") +check_required_components(mysql-connector-cpp) diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake b/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake new file mode 100644 index 000000000..6beb0253c --- /dev/null +++ b/external_imported/vcpkg/ports/mysql-connector-cpp/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mysql/mysql-connector-cpp + REF 8.0.30 + SHA512 fd6d8a03ba66ca028b3748218c60a721c9e2c79867c6cf2ea95d2649d3a252e9bd307986b149897dcc1d24a11785666c5480225a20c4baba7c87b376b7289a13 + HEAD_REF master + PATCHES + fix-static-build8.patch + export-targets.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_MSVCRT) + +# Use mysql-connector-cpp's own build process. +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD + OPTIONS + "-DWITH_SSL=${CURRENT_INSTALLED_DIR}" + -DBUILD_STATIC=${BUILD_STATIC} + -DSTATIC_MSVCRT=${STATIC_MSVCRT} + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mysql-connector-cpp) + +file(REMOVE + "${CURRENT_PACKAGES_DIR}/INFO_BIN" + "${CURRENT_PACKAGES_DIR}/INFO_SRC" + "${CURRENT_PACKAGES_DIR}/debug/INFO_BIN" + "${CURRENT_PACKAGES_DIR}/debug/INFO_SRC" +) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json b/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json new file mode 100644 index 000000000..76c7949be --- /dev/null +++ b/external_imported/vcpkg/ports/mysql-connector-cpp/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "mysql-connector-cpp", + "version": "8.0.30", + "port-version": 1, + "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", + "homepage": "https://github.com/mysql/mysql-connector-cpp", + "license": null, + "supports": "!uwp & !(windows & (arm | arm64))", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/nameof/portfile.cmake b/external_imported/vcpkg/ports/nameof/portfile.cmake index 52230b407..4b4ba12fc 100644 --- a/external_imported/vcpkg/ports/nameof/portfile.cmake +++ b/external_imported/vcpkg/ports/nameof/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.10.1 - SHA512 9b3ed7a3f5dcf1ad309341102d2aaa07fc8e9d6db7e08e42c2d9b5453c822ec16d6c6910adf7c4af8879c4084cac362f4fb4c07559cc49594b72b4917816ef5d + REF v0.10.2 + SHA512 1ec508378d12eb4a65da1bee8011302f65e78bbcab82aae716afc673665af5283a5aae5f1d0de85c7d6f59bb7268e02fc01b171f50de26bb86dc27c3b46097fa HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNAMEOF_OPT_BUILD_EXAMPLES=OFF -DNAMEOF_OPT_BUILD_TESTS=OFF -DNAMEOF_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nameof TARGET_PATH share/nameof) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # 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/external_imported/vcpkg/ports/nameof/vcpkg.json b/external_imported/vcpkg/ports/nameof/vcpkg.json index 78bce0d8e..47f997a2d 100644 --- a/external_imported/vcpkg/ports/nameof/vcpkg.json +++ b/external_imported/vcpkg/ports/nameof/vcpkg.json @@ -1,7 +1,17 @@ { "name": "nameof", - "version-string": "0.10.1", - "port-version": 1, + "version": "0.10.2", "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", - "homepage": "https://github.com/Neargye/nameof" + "homepage": "https://github.com/Neargye/nameof", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/nanobench/fix-cmakefile.patch b/external_imported/vcpkg/ports/nanobench/fix-cmakefile.patch new file mode 100644 index 000000000..9dbbf94fd --- /dev/null +++ b/external_imported/vcpkg/ports/nanobench/fix-cmakefile.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2f6089..d997097 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,9 +3,6 @@ project(nanobench LANGUAGES CXX) + + # determine whether this is a standalone project or included by other projects + set(NANOBENCH_STANDALONE_PROJECT OFF) +-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) +- set(NANOBENCH_STANDALONE_PROJECT ON) +-endif() + + if (NANOBENCH_STANDALONE_PROJECT) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # generate compile_commands.json +@@ -131,4 +128,6 @@ else() + add_library(nanobench::nanobench ALIAS nanobench) + set_property(TARGET nanobench PROPERTY CXX_STANDARD 17) + target_include_directories(nanobench PUBLIC ${PROJECT_SOURCE_DIR}/src/include) ++ install(TARGETS nanobench LIBRARY DESTINATION lib) ++ install(FILES src/include/nanobench.h DESTINATION include) + endif() diff --git a/external_imported/vcpkg/ports/nanobench/portfile.cmake b/external_imported/vcpkg/ports/nanobench/portfile.cmake index 77b60e380..e683949b2 100644 --- a/external_imported/vcpkg/ports/nanobench/portfile.cmake +++ b/external_imported/vcpkg/ports/nanobench/portfile.cmake @@ -2,15 +2,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/nanobench - REF v4.3.6 - SHA512 03e92a9fe903d273ee76c30bb6474c739858f0a65adebdcdd1e4b9ae294bd790a8e20161cb2d493fc1ea2987dbfa25a2a620cf7c3739d909595f81693f1f17d4 + REF v4.3.7 + SHA512 2f5b9573e220b507586c8586903489bd7dc2a8a09da07bd2454842a4c33c0323b0911ebeb902d5098c7dd9c96925d9bc3d4ca62fc5798f630b4b4d3e75d117a7 HEAD_REF master + PATCHES + fix-cmakefile.patch ) -file( - COPY ${SOURCE_PATH}/src/include/nanobench.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) +vcpkg_cmake_install() + +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) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/nanobench/vcpkg.json b/external_imported/vcpkg/ports/nanobench/vcpkg.json index ebcf47cdc..11967bc56 100644 --- a/external_imported/vcpkg/ports/nanobench/vcpkg.json +++ b/external_imported/vcpkg/ports/nanobench/vcpkg.json @@ -1,7 +1,19 @@ { "name": "nanobench", - "version": "4.3.6", + "version": "4.3.7", "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", "homepage": "https://nanobench.ankerl.com", - "license": "MIT" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/nanoflann/portfile.cmake b/external_imported/vcpkg/ports/nanoflann/portfile.cmake index cd295d76d..81a9fd112 100644 --- a/external_imported/vcpkg/ports/nanoflann/portfile.cmake +++ b/external_imported/vcpkg/ports/nanoflann/portfile.cmake @@ -1,19 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF v1.3.2 - SHA512 937D3787DF389EFE530060CD2723130251E2CA7937B10F8D770C7B0D21FFD972E6DA21B2B9E655C5740D57B4AF8F76F0CC6D9AE39527C440BE8863BE0DEAA7ED + REF v1.4.2 + SHA512 2a400725940868473d376635f67aac4402046d771ecceec547442dd653f0a00e38e340e4ac0a98620ddf3927845df18b6cfd644982f073d26c7864bed2de96ca HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNANOFLANN_BUILD_EXAMPLES=OFF + -DNANOFLANN_BUILD_TESTS=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/nanoflann/vcpkg.json b/external_imported/vcpkg/ports/nanoflann/vcpkg.json index cdf0b0cf0..c24954f21 100644 --- a/external_imported/vcpkg/ports/nanoflann/vcpkg.json +++ b/external_imported/vcpkg/ports/nanoflann/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nanoflann", - "version": "1.3.2", - "port-version": 1, + "version": "1.4.2", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/nanogui/fix-glad-dependence.patch b/external_imported/vcpkg/ports/nanogui/fix-glad-dependence.patch new file mode 100644 index 000000000..03a3475cc --- /dev/null +++ b/external_imported/vcpkg/ports/nanogui/fix-glad-dependence.patch @@ -0,0 +1,101 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fe6f5d..22dc16f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + + # Shared library mode: add dllimport/dllexport flags to all symbols + if (NANOGUI_BUILD_SHARED) +- list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_SHARED -DNVG_SHARED -DGLAD_GLAPI_EXPORT) ++ list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_SHARED -DNVG_SHARED) + endif() + + if (MSVC) +@@ -196,21 +196,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + endif() + endif() + +-if (NANOGUI_USE_GLAD) +- # Build and include GLAD on Windows +- list(APPEND LIBNANOGUI_EXTRA_SOURCE +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c" +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include/glad/glad.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include/KHR/khrplatform.h") +- if (MSVC) +- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c" +- PROPERTIES COMPILE_FLAGS "/wd4055 ") +- endif() +- include_directories(ext/glad/include) +- list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_GLAD) +- list(APPEND NANOGUI_EXTRA_INCS "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include") +-endif() +- + list(APPEND NANOGUI_EXTRA_INCS + "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/include" + "${CMAKE_CURRENT_SOURCE_DIR}/ext/nanovg/src" +@@ -299,8 +284,6 @@ if (APPLE) + add_compile_options(-fobjc-arc) + endif() + +-add_definitions(${NANOGUI_EXTRA_DEFS}) +- + # Compile main NanoGUI library + add_library(nanogui-obj OBJECT + # Merge NanoVG into the NanoGUI library +@@ -373,6 +356,14 @@ find_package(Eigen3 CONFIG REQUIRED) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(nanogui glfw nanovg::nanovg Eigen3::Eigen) + ++if (NANOGUI_USE_GLAD) ++ find_package(glad CONFIG REQUIRED) ++ target_link_libraries(nanogui glad::glad) ++ list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_GLAD) ++endif() ++ ++add_definitions(${NANOGUI_EXTRA_DEFS}) ++ + if (NANOGUI_BUILD_SHARED) + set_property(TARGET nanogui-obj PROPERTY POSITION_INDEPENDENT_CODE ON) + endif() +@@ -380,11 +371,6 @@ endif() + # Compile/link flags for NanoGUI + set_property(TARGET nanogui-obj APPEND PROPERTY COMPILE_DEFINITIONS "NANOGUI_BUILD;NVG_BUILD") + +-if (NANOGUI_USE_GLAD AND NANOGUI_BUILD_SHARED) +- set_property(TARGET nanogui-obj APPEND PROPERTY COMPILE_DEFINITIONS +- "GLAD_GLAPI_EXPORT;GLAD_GLAPI_EXPORT_BUILD") +-endif() +- + if (NANOGUI_BUILD_SHARED) + target_link_libraries(nanogui ${NANOGUI_EXTRA_LIBS}) + endif() +diff --git a/include/nanogui/opengl.h b/include/nanogui/opengl.h +index f5abcb2..1c20653 100644 +--- a/include/nanogui/opengl.h ++++ b/include/nanogui/opengl.h +@@ -17,10 +17,6 @@ + + #ifndef DOXYGEN_SHOULD_SKIP_THIS + #if defined(NANOGUI_GLAD) +- #if defined(NANOGUI_SHARED) && !defined(GLAD_GLAPI_EXPORT) +- #define GLAD_GLAPI_EXPORT +- #endif +- + #include + #else + #if defined(__APPLE__) +diff --git a/src/example3.cpp b/src/example3.cpp +index 3d2ecfa..72deaa8 100644 +--- a/src/example3.cpp ++++ b/src/example3.cpp +@@ -14,10 +14,6 @@ + // GLFW + // + #if defined(NANOGUI_GLAD) +- #if defined(NANOGUI_SHARED) && !defined(GLAD_GLAPI_EXPORT) +- #define GLAD_GLAPI_EXPORT +- #endif +- + #include + #else + #if defined(__APPLE__) diff --git a/external_imported/vcpkg/ports/nanogui/portfile.cmake b/external_imported/vcpkg/ports/nanogui/portfile.cmake index 937c2c0a0..0d331896d 100644 --- a/external_imported/vcpkg/ports/nanogui/portfile.cmake +++ b/external_imported/vcpkg/ports/nanogui/portfile.cmake @@ -1,23 +1,39 @@ +if(VCPKG_HOST_IS_WINDOWS) + set(USE_GLAD -DNANOGUI_USE_GLAD=ON) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() + set(USE_GLAD -DNANOGUI_USE_GLAD=OFF) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wjakob/nanogui - REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 #Commits on Sep 23, 2019 + REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 # Commits on Sep 23, 2019 SHA512 36c93bf977862ced2df4030211e2b83625e60a11fc9fdb6c1f2996bb234758331d3f41a7fbafd25a5bca0239ed9bac9c93446a4a7fac4c5e6d7943af2be3e14a HEAD_REF master PATCHES fix-cmakelists.patch + fix-glad-dependence.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "example" NANOGUI_BUILD_EXAMPLE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DNANOGUI_EIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 + -DNANOGUI_BUILD_SHARED=${BUILD_SHARED} + ${USE_GLAD} ) -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") -# Handle copyright -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/external_imported/vcpkg/ports/nanogui/vcpkg.json b/external_imported/vcpkg/ports/nanogui/vcpkg.json index f075b3dc6..cc8325a9a 100644 --- a/external_imported/vcpkg/ports/nanogui/vcpkg.json +++ b/external_imported/vcpkg/ports/nanogui/vcpkg.json @@ -1,13 +1,24 @@ { "name": "nanogui", "version-date": "2019-09-23", - "port-version": 3, + "port-version": 5, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "eigen3", + "glad", "glfw3", - "nanovg" - ] + "nanovg", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "example": { + "description": "Build NanoGUI example application" + } + } } diff --git a/external_imported/vcpkg/ports/nanosvg/CMakeLists.txt b/external_imported/vcpkg/ports/nanosvg/CMakeLists.txt new file mode 100644 index 000000000..6af85e675 --- /dev/null +++ b/external_imported/vcpkg/ports/nanosvg/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.11) +project(nanosvg NONE) + +set(NANOSVG_HEADERS src/nanosvg.h src/nanosvgrast.h) +add_library(nanosvg INTERFACE) + +set_target_properties(nanosvg PROPERTIES PUBLIC_HEADER "${NANOSVG_HEADERS}") + +install(TARGETS nanosvg + EXPORT nanosvgTargets + PUBLIC_HEADER DESTINATION include) + +install(EXPORT nanosvgTargets + FILE unofficial-nanosvg-config.cmake + NAMESPACE unofficial::nanosvg:: + DESTINATION share/unofficial-nanosvg) diff --git a/external_imported/vcpkg/ports/nanosvg/portfile.cmake b/external_imported/vcpkg/ports/nanosvg/portfile.cmake new file mode 100644 index 000000000..b10bcb3c9 --- /dev/null +++ b/external_imported/vcpkg/ports/nanosvg/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO memononen/nanosvg + REF 03042a6297399379198f98eb625ff8902bd84784 + SHA512 163f205e81e830e8b2512ec1faa15ebaf82138fc8bd881ccfc5f19896df75e8cf77ccd20892fccd0fd3e5d6358438e6f3075fd4e6a4c4b064107451265c9f874 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +set(VCPKG_BUILD_TYPE "release") # header-only +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nanosvg/vcpkg.json b/external_imported/vcpkg/ports/nanosvg/vcpkg.json new file mode 100644 index 000000000..42d383193 --- /dev/null +++ b/external_imported/vcpkg/ports/nanosvg/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanosvg", + "version-date": "2022-04-29", + "description": "NanoSVG is a simple stupid single-header-file SVG parse. The output of the parser is a list of cubic bezier shapes..", + "homepage": "https://github.com/memononen/nanosvg", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/ncnn/portfile.cmake b/external_imported/vcpkg/ports/ncnn/portfile.cmake new file mode 100644 index 000000000..50b7f1936 --- /dev/null +++ b/external_imported/vcpkg/ports/ncnn/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tencent/ncnn + REF 20220729 + SHA512 0df877ee42edc32faa6891c8b234fc21064b18c1dc8c612b43757daf5f912530f3d015c783e6e199c2884616a88137d10f9c899528000f25e9d0881f028a9586 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNCNN_BUILD_TOOLS=OFF + -DNCNN_BUILD_EXAMPLES=OFF + -DNCNN_BUILD_BENCHMARK=OFF + -DNCNN_SHARED_LIB=${BUILD_SHARED} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ncnn) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +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) diff --git a/external_imported/vcpkg/ports/ncnn/vcpkg.json b/external_imported/vcpkg/ports/ncnn/vcpkg.json new file mode 100644 index 000000000..362a7c90e --- /dev/null +++ b/external_imported/vcpkg/ports/ncnn/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ncnn", + "version": "20220729", + "description": "ncnn is a high-performance neural network inference computing framework.", + "homepage": "https://github.com/Tencent/ncnn", + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/ncurses/portfile.cmake b/external_imported/vcpkg/ports/ncurses/portfile.cmake index f93d4d9c3..445d4ae71 100644 --- a/external_imported/vcpkg/ports/ncurses/portfile.cmake +++ b/external_imported/vcpkg/ports/ncurses/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_download_distfile( SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE_PATH}" ) @@ -38,6 +38,9 @@ if(VCPKG_TARGET_IS_MINGW) ) endif() +file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") +file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") + set(OPTIONS_DEBUG "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" --with-debug @@ -50,7 +53,7 @@ set(OPTIONS_RELEASE ) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} diff --git a/external_imported/vcpkg/ports/ncurses/vcpkg.json b/external_imported/vcpkg/ports/ncurses/vcpkg.json index 465e15d47..37498c2a6 100644 --- a/external_imported/vcpkg/ports/ncurses/vcpkg.json +++ b/external_imported/vcpkg/ports/ncurses/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ncurses", "version": "6.3", - "port-version": 1, + "port-version": 2, "description": "free software emulation of curses in System V Release 4.0", "homepage": "https://invisible-island.net/ncurses/announce.html", "license": "MIT", diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake index d4c6318e6..284afcc32 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/portfile.cmake @@ -8,13 +8,21 @@ # known to be compatible with QuickCppLib. It has occurred in the # past that newer versions were severely broken with QuickCppLib. -include(${CURRENT_PORT_DIR}/sha_manifest.cmake) +include("${CURRENT_PORT_DIR}/sha_manifest.cmake") -if (NOT "cxx20" IN_LIST FEATURES) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + INVERTED_FEATURES + polyfill-cxx17 QUICKCPPLIB_REQUIRE_CXX17 + polyfill-cxx20 QUICKCPPLIB_REQUIRE_CXX20 +) + +if (NOT QUICKCPPLIB_REQUIRE_CXX20) message(WARNING [=[ - QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: + QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against span-lite version 0.10.3 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: "overrides": [ - { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "span-lite", "version": "0.10.3" }, { "name": "byte-lite", "version": "0.3.0" } ] Do not report issues to upstream without first pinning these previous versions. @@ -32,15 +40,13 @@ vcpkg_from_github( ) # Quickcpplib deploys subsets of the dependency headers into a private subdirectory -if (NOT "cxx17" IN_LIST FEATURES) +if (NOT QUICKCPPLIB_REQUIRE_CXX17) file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") endif() -if (NOT "cxx20" IN_LIST FEATURES) - file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl") - file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl-lite/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl-lite") +if (NOT QUICKCPPLIB_REQUIRE_CXX20) + file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/span.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/span-lite/include/nonstd") endif() vcpkg_from_github( @@ -56,22 +62,14 @@ file(COPY "${OPT_SOURCE_PATH}/." DESTINATION "${SOURCE_PATH}/include/quickcpplib # Because quickcpplib's deployed files are header-only, the debug build it not necessary set(VCPKG_BUILD_TYPE release) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - cxx17 QUICKCPPLIB_REQUIRE_CXX17 - cxx20 QUICKCPPLIB_REQUIRE_CXX20 -) - # Use QuickCppLib's own build process, skipping examples and tests. vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib + "-DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib" ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Doxygen @@ -79,6 +77,20 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +if (QUICKCPPLIB_REQUIRE_CXX17) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 1") +else () + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#include \"byte/include/nonstd/byte.hpp\"" "#include ") +endif() +if (QUICKCPPLIB_REQUIRE_CXX20) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 1") +else () + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#elif(_HAS_CXX20 || __cplusplus >= 202002) && __has_include()" "#elif 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#include \"span-lite/include/nonstd/span.hpp\"" "#include ") +endif() + vcpkg_cmake_config_fixup( PACKAGE_NAME quickcpplib CONFIG_PATH lib/cmake/quickcpplib @@ -87,4 +99,4 @@ vcpkg_cmake_config_fixup( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch index 7ad3c3b9a..de49af023 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -1,5 +1,5 @@ diff --git a/cmake/headers.cmake b/cmake/headers.cmake -index 1aad359..e5053ed 100644 +index 3924a2a..f1e32d9 100644 --- a/cmake/headers.cmake +++ b/cmake/headers.cmake @@ -15,8 +15,6 @@ set(quickcpplib_HEADERS @@ -11,19 +11,15 @@ index 1aad359..e5053ed 100644 "include/quickcpplib/config.hpp" "include/quickcpplib/console_colours.hpp" "include/quickcpplib/cpp_feature.h" -@@ -27,15 +25,8 @@ set(quickcpplib_HEADERS - "include/quickcpplib/erasure_cast.hpp" - "include/quickcpplib/execinfo_win64.h" - "include/quickcpplib/function_ptr.hpp" -- "include/quickcpplib/gsl-lite/gsl-lite.natvis" - "include/quickcpplib/gsl-lite/include/gsl-lite/gsl-lite.hpp" -- "include/quickcpplib/gsl-lite/include/gsl.h" -- "include/quickcpplib/gsl-lite/include/gsl.hpp" -- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite-vc6.hpp" -- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.h" - "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.hpp" -- "include/quickcpplib/gsl-lite/test/gsl-lite.t.hpp" -- "include/quickcpplib/gsl-lite/test/lest_cpp03.hpp" - "include/quickcpplib/import.h" - "include/quickcpplib/in_place_detach_attach.hpp" - "include/quickcpplib/mem_flush_loads_stores.hpp" +@@ -40,11 +38,7 @@ set(quickcpplib_HEADERS + "include/quickcpplib/ringbuffer_log.hpp" + "include/quickcpplib/scope.hpp" + "include/quickcpplib/signal_guard.hpp" +- "include/quickcpplib/span-lite/example/nonstd/span.tweak.hpp" + "include/quickcpplib/span-lite/include/nonstd/span.hpp" +- "include/quickcpplib/span-lite/test/lest/lest_cpp03.hpp" +- "include/quickcpplib/span-lite/test/nonstd/span.tweak.hpp" +- "include/quickcpplib/span-lite/test/span-main.t.hpp" + "include/quickcpplib/span.hpp" + "include/quickcpplib/spinlock.hpp" + "include/quickcpplib/spinlock.natvis" diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 2ac6943a6..76d249460 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF cad832c8083c8eb984c26ee995609817f27f9847) -set(QUICKCPPLIB_SHA512 4a2cd3d3e90317a201088291781d13bbc66f4beadfead61ed894f6f5fa38001fb94b68f0965ae77efd9e43c274583e74c00a0781018cd1714ec99e00c9b17824) +set(QUICKCPPLIB_REF 1dac5b6bf79b5ec8eb3a75fa75844a30f88b8559) +set(QUICKCPPLIB_SHA512 c53f0a3d651db8be60a4a1308da1cc8458f3eb1fcb9296324bdce472c968a2ff4239a666e609755007f2397b146248a82aeab03824d7816eea9963339c989dca) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json index d79bfba95..1ae3b4e2b 100644 --- a/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/external_imported/vcpkg/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,11 +1,15 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-cad832c8", + "version-date": "2022-09-08", + "port-version": 1, + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", + "license": "Apache-2.0 OR BSL-1.0", "dependencies": [ - "byte-lite", - "gsl-lite", { "name": "vcpkg-cmake", "host": true @@ -16,20 +20,24 @@ } ], "features": { - "cxx17": { - "description": "Do not polyfill C++17 entities" - }, - "cxx20": { - "description": "Do not polyfill C++20 entities", + "polyfill-cxx17": { + "description": "Polyfill std::byte with byte-lite", "dependencies": [ + "byte-lite", { "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx17" + "polyfill-cxx20" ] } ] + }, + "polyfill-cxx20": { + "description": "Polyfill std::span with span-lite", + "dependencies": [ + "span-lite" + ] } } } diff --git a/external_imported/vcpkg/ports/nethost/0001-nethost-cmakelists.patch b/external_imported/vcpkg/ports/nethost/0001-nethost-cmakelists.patch index 93d49b95e..c45f3b474 100644 --- a/external_imported/vcpkg/ports/nethost/0001-nethost-cmakelists.patch +++ b/external_imported/vcpkg/ports/nethost/0001-nethost-cmakelists.patch @@ -1,58 +1,73 @@ -diff --git a/src/installer/corehost/cli/common.cmake b/src/installer/corehost/cli/common.cmake -index 63e7306..639c90e 100644 ---- a/src/installer/corehost/cli/common.cmake -+++ b/src/installer/corehost/cli/common.cmake -@@ -5,9 +5,6 @@ - project(${DOTNET_PROJECT_NAME}) - - if(WIN32) -- add_compile_options($<$:/MT>) -- add_compile_options($<$:/MT>) -- add_compile_options($<$:/MTd>) - else() - add_compile_options(-fvisibility=hidden) - endif() -diff --git a/src/installer/corehost/cli/nethost/CMakeLists.txt b/src/installer/corehost/cli/nethost/CMakeLists.txt -index 7473958..49c664f 100644 ---- a/src/installer/corehost/cli/nethost/CMakeLists.txt -+++ b/src/installer/corehost/cli/nethost/CMakeLists.txt -@@ -2,12 +2,14 @@ +diff --git a/src/native/corehost/nethost/CMakeLists.txt b/src/native/corehost/nethost/CMakeLists.txt +index a9f44e720..0f24d4458 100644 +--- a/src/native/corehost/nethost/CMakeLists.txt ++++ b/src/native/corehost/nethost/CMakeLists.txt +@@ -1,11 +1,14 @@ + # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. - # See the LICENSE file in the project root for more information. --cmake_minimum_required (VERSION 2.6) -+cmake_minimum_required (VERSION 3.14) ++cmake_minimum_required (VERSION 3.14.5) project(nethost) set(DOTNET_PROJECT_NAME "nethost") # Include directories -+include(../../../settings.cmake) -+include(../../../functions.cmake) ++include(../../../../eng/native/configurepaths.cmake) ++include("${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake") include_directories(../fxr) # CMake does not recommend using globbing since it messes with the freshness checks -@@ -22,13 +24,18 @@ if(WIN32) +@@ -19,12 +22,23 @@ if(CLR_CMAKE_TARGET_WIN32) Exports.def) endif() +if(BUILD_SHARED_LIBS) include(../lib.cmake) ++set(targets nethost) +else() ++include(../hostmisc/hostmisc.cmake) include(../lib_static.cmake) ++add_library(nethost INTERFACE) ++target_link_libraries(nethost INTERFACE libnethost) ++set(targets libnethost nethost) ++target_include_directories(libnethost INTERFACE $) +endif() ++target_include_directories(nethost INTERFACE $) add_definitions(-DFEATURE_LIBHOST=1) add_definitions(-DNETHOST_EXPORT) ++if(NOT BUILD_SHARED_LIBS) + # Copy static lib PDB to the project output directory + if (WIN32) + set_target_properties(libnethost PROPERTIES +@@ -32,15 +46,18 @@ if (WIN32) + COMPILE_PDB_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}" + ) + endif(WIN32) ++endif() + +-install(FILES ../coreclr_delegates.h DESTINATION corehost) +-install(FILES ../hostfxr.h DESTINATION corehost) -install(FILES nethost.h DESTINATION corehost) --install(TARGETS nethost DESTINATION corehost) --install(TARGETS libnethost DESTINATION corehost) --install_symbols(nethost corehost) +-install_with_stripped_symbols(nethost TARGETS corehost) ++set(NETHOST_HEADERS nethost.h ../coreclr_delegates.h ../hostfxr.h) ++install(FILES ${NETHOST_HEADERS} DESTINATION include) ++install(TARGETS ${targets} EXPORT unofficial-nethost-config ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++) + +-# Only Windows creates a symbols file for static libs. +-if (WIN32) +- install_with_stripped_symbols(libnethost TARGETS corehost) +-else() +- install(TARGETS libnethost DESTINATION corehost) +-endif(WIN32) \ No newline at end of file -+install(FILES nethost.h ../coreclr_delegates.h ../hostfxr.h DESTINATION include) -+if(BUILD_SHARED_LIBS) -+install(TARGETS nethost) -+else() -+install(TARGETS libnethost) -+endif() ++install(EXPORT unofficial-nethost-config ++ DESTINATION share/unofficial-nethost ++ FILE unofficial-nethost-config.cmake ++ NAMESPACE unofficial::nethost:: ++) diff --git a/external_imported/vcpkg/ports/nethost/0002-settings-cmake.patch b/external_imported/vcpkg/ports/nethost/0002-settings-cmake.patch deleted file mode 100644 index 7143b942a..000000000 --- a/external_imported/vcpkg/ports/nethost/0002-settings-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/installer/settings.cmake b/src/installer/settings.cmake -index 29d57b44..6ea63902 100644 ---- a/src/installer/settings.cmake -+++ b/src/installer/settings.cmake -@@ -114,7 +114,7 @@ endfunction() - - function(install_symbols targetName destination_path) - if(WIN32) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${targetName}.pdb DESTINATION ${destination_path}) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${targetName}.pdb DESTINATION ${destination_path}) - else() - strip_symbols(${targetName} strip_destination_file) - install(FILES ${strip_destination_file} DESTINATION ${destination_path}) diff --git a/external_imported/vcpkg/ports/nethost/portfile.cmake b/external_imported/vcpkg/ports/nethost/portfile.cmake index c7d4aae3b..79c4ed49f 100644 --- a/external_imported/vcpkg/ports/nethost/portfile.cmake +++ b/external_imported/vcpkg/ports/nethost/portfile.cmake @@ -1,17 +1,16 @@ -set(COMMIT_HASH 188427d7e18102c45fc6d0e20c135e226f215992) +set(COMMIT_HASH v6.0.5) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dotnet/runtime REF ${COMMIT_HASH} - SHA512 5a93c66c87e2113f733702d938efd39456c99fb74b383097b8d877df21536fcbcba901606aa70db6c8f1a16421ea8f06822c5b0ab1d882631b6daecbed8d03cc + SHA512 ccf4865bd9ea63c525fc11b0008774052d51f9247427fc28a91e3836e8e8d157569565bdac17326fe44a446d98a3e4b74a55779d01bede596f2458f4ec86f3aa HEAD_REF master PATCHES 0001-nethost-cmakelists.patch - 0002-settings-cmake.patch ) -set(PRODUCT_VERSION "5.0.0") +set(PRODUCT_VERSION "6.0.5") if(VCPKG_TARGET_IS_WINDOWS) set(RID_PLAT "win") @@ -41,9 +40,10 @@ endif() set(BASE_RID "${RID_PLAT}-${RID_ARCH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src/installer/corehost/cli/nethost - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/native/corehost/nethost/" + # vcpkg's /utf-8 is incompatible with dotnet's own /source-charset:utf-8 + NO_CHARSET_FLAG OPTIONS "-DSKIP_VERSIONING=1" "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}" @@ -52,15 +52,26 @@ vcpkg_configure_cmake( "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}" "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" - "-DCLI_CMAKE_PLATFORM_ARCH_${ARCH_NAME}=1" - "-DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=10.0" + "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" + "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" + "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}" + MAYBE_UNUSED_VARIABLES + SKIP_VERSIONING # only used on WIN32 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nethost) -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}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0") +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}") diff --git a/external_imported/vcpkg/ports/nethost/usage b/external_imported/vcpkg/ports/nethost/usage index 6e6d860d1..26a41d92f 100644 --- a/external_imported/vcpkg/ports/nethost/usage +++ b/external_imported/vcpkg/ports/nethost/usage @@ -1,6 +1,4 @@ The package nethost can be used via CMake: - find_path(NETHOST_INCLUDE_DIRS nethost.h) - find_library(NETHOST_LIBRARY NAMES libnethost nethost) - target_include_directories(main PRIVATE ${NETHOST_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${NETHOST_LIBRARY}) + find_package(unofficial-nethost CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::nethost::nethost) diff --git a/external_imported/vcpkg/ports/nethost/vcpkg.json b/external_imported/vcpkg/ports/nethost/vcpkg.json index 0f65e50da..b5cf09989 100644 --- a/external_imported/vcpkg/ports/nethost/vcpkg.json +++ b/external_imported/vcpkg/ports/nethost/vcpkg.json @@ -1,8 +1,17 @@ { "name": "nethost", - "version-date": "2019-12-21", - "port-version": 2, + "version": "6.0.5", "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/nghttp2/portfile.cmake b/external_imported/vcpkg/ports/nghttp2/portfile.cmake index ef14b80ad..48ee86ca2 100644 --- a/external_imported/vcpkg/ports/nghttp2/portfile.cmake +++ b/external_imported/vcpkg/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF 7af0c508be9cbec407268e2f546f597d268c104e # v1.46.0 - SHA512 e25e8a43d0f9523f654d9136c2b9db30cfa5e8086da3fe3e9bcf68ff8c034383550ca17d89d31cd14e23b5886a0a948d777b4e182d0a042ccfe9a8083410de93 + REF v1.49.0 + SHA512 bdfd0547e5094acf3784ee6ec46a024e7afd7ba9727f91142be83e5f7ddc12db30935fd25ebd12d69b0f2286af1bb4ee96ab13e160ee6243168f66e4507c1f09 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/nghttp2/vcpkg.json b/external_imported/vcpkg/ports/nghttp2/vcpkg.json index 9b5ce8969..484319ebb 100644 --- a/external_imported/vcpkg/ports/nghttp2/vcpkg.json +++ b/external_imported/vcpkg/ports/nghttp2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "nghttp2", - "version": "1.46.0", + "version": "1.49.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/nghttp3/portfile.cmake b/external_imported/vcpkg/ports/nghttp3/portfile.cmake new file mode 100644 index 000000000..e106f91b7 --- /dev/null +++ b/external_imported/vcpkg/ports/nghttp3/portfile.cmake @@ -0,0 +1,45 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ngtcp2/nghttp3 + REF 635a532c8ff98cdbd6c141f85583632919102912 #v0.7.0 + GH-84 for fix UWP ARM 32 bits build + SHA512 d81a6b5c89a0c7065b76342f9ccfac6c39700ab2ff9822361b341235b96363b0582440282bdb19f8abd9231890baddf076ff955a3f535d564b87d13f319d4318 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_LIB_ONLY=ON + -DBUILD_TESTING=OFF + "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" + "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" + "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" + -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON + MAYBE_UNUSED_VARIABLES + BUILD_TESTING +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(APPEND "${CURRENT_PACKAGES_DIR}/include/nghttp3/version.h" [[ +]]) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nghttp3/vcpkg.json b/external_imported/vcpkg/ports/nghttp3/vcpkg.json new file mode 100644 index 000000000..642dc0755 --- /dev/null +++ b/external_imported/vcpkg/ports/nghttp3/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nghttp3", + "version": "0.7.0", + "port-version": 1, + "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", + "homepage": "https://github.com/ngtcp2/nghttp3", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/ngspice/portfile.cmake b/external_imported/vcpkg/ports/ngspice/portfile.cmake index ecf9cf967..105ab23f9 100644 --- a/external_imported/vcpkg/ports/ngspice/portfile.cmake +++ b/external_imported/vcpkg/ports/ngspice/portfile.cmake @@ -6,9 +6,9 @@ set(VCPKG_CRT_LINKAGE static) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO ngspice/ng-spice-rework - REF 35 - FILENAME "ngspice-35.tar.gz" - SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b + REF 37 + FILENAME "ngspice-37.tar.gz" + SHA512 d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca PATCHES use-winbison-sharedspice.patch use-winbison-vngspice.patch diff --git a/external_imported/vcpkg/ports/ngspice/vcpkg.json b/external_imported/vcpkg/ports/ngspice/vcpkg.json index 11517e0c1..62c2a4438 100644 --- a/external_imported/vcpkg/ports/ngspice/vcpkg.json +++ b/external_imported/vcpkg/ports/ngspice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ngspice", - "version": "35", - "port-version": 2, + "version": "37", "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE", "homepage": "http://ngspice.sourceforge.net/", "license": "CC-BY-SA-4.0", diff --git a/external_imported/vcpkg/ports/nifticlib/vcpkg.json b/external_imported/vcpkg/ports/nifticlib/vcpkg.json index 8a35da5a0..1a0aa8501 100644 --- a/external_imported/vcpkg/ports/nifticlib/vcpkg.json +++ b/external_imported/vcpkg/ports/nifticlib/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nifticlib", - "version-string": "2020-04-30", - "port-version": 1, + "version-date": "2020-04-30", + "port-version": 2, "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", - "homepage": "NIFTI-Imaging/nifti_clib", + "homepage": "https://github.com/NIFTI-Imaging/nifti_clib", + "license": null, "supports": "!uwp", "dependencies": [ "zlib" diff --git a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake index 19343c426..947cba357 100644 --- a/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake +++ b/external_imported/vcpkg/ports/nlohmann-json/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nlohmann/json - REF v3.10.5 - SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2 + REF v3.11.2 + SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 HEAD_REF master ) @@ -10,16 +10,21 @@ if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) set(nlohmann-json_IMPLICIT_CONVERSIONS ON) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "diagnostics" JSON_Diagnostics +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DJSON_Install=ON -DJSON_MultipleHeaders=ON -DJSON_BuildTests=OFF -DJSON_ImplicitConversions=${nlohmann-json_IMPLICIT_CONVERSIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "lib/cmake/nlohmann_json") +vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "share/cmake/nlohmann_json") vcpkg_fixup_pkgconfig() vcpkg_replace_string( @@ -27,16 +32,14 @@ vcpkg_replace_string( "{_IMPORT_PREFIX}/nlohmann_json.natvis" "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" ) -if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis) +if(EXISTS "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis") file(RENAME "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis" "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis" ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nlohmann-json/usage b/external_imported/vcpkg/ports/nlohmann-json/usage index a078bbd38..19c76d508 100644 --- a/external_imported/vcpkg/ports/nlohmann-json/usage +++ b/external_imported/vcpkg/ports/nlohmann-json/usage @@ -9,4 +9,4 @@ The package nlohmann-json can be configured to not provide implicit conversions For more information, see the docs here: - https://json.nlohmann.me/features/macros/#json_use_implicit_conversions + https://json.nlohmann.me/api/macros/json_use_implicit_conversions/ diff --git a/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json b/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json index bccb3d74b..cc65b9d20 100644 --- a/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json +++ b/external_imported/vcpkg/ports/nlohmann-json/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nlohmann-json", - "version-semver": "3.10.5", - "port-version": 2, + "version-semver": "3.11.2", "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,5 +13,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "diagnostics": { + "description": "Build json_diagnostics" + } + } } diff --git a/external_imported/vcpkg/ports/nlopt/portfile.cmake b/external_imported/vcpkg/ports/nlopt/portfile.cmake index e2204c239..7d232cbc8 100644 --- a/external_imported/vcpkg/ports/nlopt/portfile.cmake +++ b/external_imported/vcpkg/ports/nlopt/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF v2.7.0 - SHA512 3c41cab357b50adf50fe2d6225409ade8c5e8ee3576e3680ab29dded29ed7d328bc3d51d3a50054630159c319dca69e47ff08dc5df891b180b7d7e8fcbc27694 + REF v2.7.1 + SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNLOPT_FORTRAN=OFF -DNLOPT_PYTHON=OFF @@ -18,14 +17,14 @@ vcpkg_configure_cmake( -DNLOPT_SWIG=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlopt) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nlopt) -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}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/nlopt/vcpkg.json b/external_imported/vcpkg/ports/nlopt/vcpkg.json index 3e895d4a3..bcc20e45c 100644 --- a/external_imported/vcpkg/ports/nlopt/vcpkg.json +++ b/external_imported/vcpkg/ports/nlopt/vcpkg.json @@ -1,7 +1,16 @@ { "name": "nlopt", - "version-string": "2.7.0", - "port-version": 1, - "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.", - "homepage": "https://github.com/stevengj/nlopt" + "version": "2.7.1", + "description": "Library for nonlinear local and global optimization, for functions with and without gradient information.", + "homepage": "https://github.com/stevengj/nlopt", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/nng/portfile.cmake b/external_imported/vcpkg/ports/nng/portfile.cmake index 60af4ca7e..3dd2b2974 100644 --- a/external_imported/vcpkg/ports/nng/portfile.cmake +++ b/external_imported/vcpkg/ports/nng/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF 9fcf039b573d153ba9bbc2beb5f11259ddacdcff # v1.5.1 - SHA512 3db2668c3f971dc54156df2a3520645224fbb55460957da35940889c3148cb2cbc67c10cd23b9614ece70235d1f6003618310129eb9c40ced42db058c140dd58 + REF v1.5.2 + SHA512 33cda9e0422c6e8cb56e48bd812f381bf07a92a0aa2fbadddbca7cfde585c66299142186a3a76a97163e5570042452a62c1e53180ebfbf016a44eee998b16286 HEAD_REF master ) @@ -34,13 +34,13 @@ vcpkg_replace_string( if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "!defined(NNG_STATIC_LIB)" "1 /* !defined(NNG_STATIC_LIB) */" ) else() vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "!defined(NNG_STATIC_LIB)" "0 /* !defined(NNG_STATIC_LIB) */" ) diff --git a/external_imported/vcpkg/ports/nng/vcpkg.json b/external_imported/vcpkg/ports/nng/vcpkg.json index c89456dfd..cdb6da7df 100644 --- a/external_imported/vcpkg/ports/nng/vcpkg.json +++ b/external_imported/vcpkg/ports/nng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nng", - "version-semver": "1.5.1", + "version-semver": "1.5.2", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", diff --git a/external_imported/vcpkg/ports/nowide/portfile.cmake b/external_imported/vcpkg/ports/nowide/portfile.cmake index 159486f1c..e77c50855 100644 --- a/external_imported/vcpkg/ports/nowide/portfile.cmake +++ b/external_imported/vcpkg/ports/nowide/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/boostorg/nowide/releases/download/v11.1.3/nowide_standalone_v11.1.3.tar.gz" - FILENAME "nowide_standalone_v11.1.3.tar.gz" - SHA512 8e493b9ee7f3f218dcc1a0c2f040c040f8f3d10ec7c204caee92986a2cc54d4fc06f530b13e7b14cfdbbd42fd106e151916e2f8fae524a051688d6785d7c2993 + URLS "https://github.com/boostorg/nowide/releases/download/v11.2.0/nowide_standalone_v11.2.0.tar.gz" + FILENAME "nowide_standalone_v11.2.0.tar.gz" + SHA512 c3748921b85648aa0e89970f2ab24588cbc72d05edd7ddf4f61a607d9ecbddd45e9e6799d2ed83386c43045b9487693e027494a81b11a6a7bdfaa939d1251938 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/nowide/vcpkg.json b/external_imported/vcpkg/ports/nowide/vcpkg.json index 82269b056..ec60ea01c 100644 --- a/external_imported/vcpkg/ports/nowide/vcpkg.json +++ b/external_imported/vcpkg/ports/nowide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nowide", - "version": "11.1.3", + "version": "11.2.0", "description": "Boost nowide module (standalone)", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake b/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake index 22ae9c4af..0033cae69 100644 --- a/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake +++ b/external_imported/vcpkg/ports/nrf-ble-driver/portfile.cmake @@ -19,34 +19,39 @@ vcpkg_from_github( # Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. # Git should always be available as it is downloaded during the bootstrap phase. # Append instead of prepend to $PATH to honor the user's git executable as a general rule. -find_program(GIT NAMES git git.cmd) -get_filename_component(GIT_EXE_DIRPATH "${GIT}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.2 -DCONNECTIVITY_VERSION=4.1.2 +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) +vcpkg_add_to_path("${GIT_EXE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_EXAMPLES=ON + -DDISABLE_TESTS=ON + -DNRF_BLE_DRIVER_VERSION=4.1.2 + -DCONNECTIVITY_VERSION=4.1.2 + MAYBE_UNUSED_VARIABLES + DISABLE_EXAMPLES + DISABLE_TESTS ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Copy hex files into shared folder for package foreach(HEX_DIR IN ITEMS "sd_api_v2" "sd_api_v3" "sd_api_v5" "sd_api_v6") set(TARGET_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/hex/${HEX_DIR}") - file(MAKE_DIRECTORY ${TARGET_DIRECTORY}) - file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION ${TARGET_DIRECTORY}/..) + file(MAKE_DIRECTORY "${TARGET_DIRECTORY}") + file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION "${TARGET_DIRECTORY}/..") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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) diff --git a/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json b/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json index 07176c466..1e196e9be 100644 --- a/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json +++ b/external_imported/vcpkg/ports/nrf-ble-driver/vcpkg.json @@ -1,12 +1,22 @@ { "name": "nrf-ble-driver", - "version-string": "4.1.2", - "port-version": 1, + "version": "4.1.2", + "port-version": 2, "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", + "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver", + "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ "asio", - "catch2", "cli11", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/nspr/portfile.cmake b/external_imported/vcpkg/ports/nspr/portfile.cmake index c3302609f..80eaa0341 100644 --- a/external_imported/vcpkg/ports/nspr/portfile.cmake +++ b/external_imported/vcpkg/ports/nspr/portfile.cmake @@ -52,7 +52,7 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} - DISABLE_VERBOSE_FLAGS true + DISABLE_VERBOSE_FLAGS ) vcpkg_install_make() vcpkg_copy_pdbs() @@ -90,5 +90,11 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/nspr-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/nspr-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..") +endif() + # Copy license -file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nspr/vcpkg.json b/external_imported/vcpkg/ports/nspr/vcpkg.json index 096df7d4a..f1420b447 100644 --- a/external_imported/vcpkg/ports/nspr/vcpkg.json +++ b/external_imported/vcpkg/ports/nspr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nspr", "version": "4.33", + "port-version": 2, "description": "Netscape portable runtime", "homepage": "https://releases.mozilla.org/pub/nspr/", "license": "MPL-2.0", diff --git a/external_imported/vcpkg/ports/nss/portfile.cmake b/external_imported/vcpkg/ports/nss/portfile.cmake index 3e60e20dc..523a3d7ca 100644 --- a/external_imported/vcpkg/ports/nss/portfile.cmake +++ b/external_imported/vcpkg/ports/nss/portfile.cmake @@ -1,10 +1,10 @@ -set(NSS_VERSION "3.77") +set(NSS_VERSION "3.78") string(REPLACE "." "_" V_URL ${NSS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" FILENAME "nss-${NSS_VERSION}.tar.gz" - SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e + SHA512 ab54d838f41f963fdd4b87477b1e769186ae1f138f7c5d764cd6873be4791146d14dcc85697a2ca92e08f3bfcbeb61d64e26e7b5398095272c18a8196d43ac6c ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/nss/vcpkg.json b/external_imported/vcpkg/ports/nss/vcpkg.json index 83143405c..f885c9482 100644 --- a/external_imported/vcpkg/ports/nss/vcpkg.json +++ b/external_imported/vcpkg/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.77", + "version": "3.78", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch b/external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch deleted file mode 100644 index 6a69fc0b6..000000000 --- a/external_imported/vcpkg/ports/nu-book-zxing-cpp/ignore-pdb-install-symbols-in-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 7a2db60..17e0a52 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -474,7 +474,4 @@ if(MSVC) - set_target_properties(ZXing PROPERTIES - COMPILE_PDB_NAME ZXing - COMPILE_PDB_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ZXing.pdb -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- CONFIGURATIONS Debug RelWithDebInfo) - endif() diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake b/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake index 2facb6b5d..42450bf57 100644 --- a/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nu-book/zxing-cpp - REF v1.2.0 - SHA512 e61b4e44ccaf0871b5d8badf9ce0a81576f55e5d6a9458907b9b599a66227adceabb8d51a0c47b32319d8aeff93e758b4785d3bd0440375247471d95999de487 + REF v1.3.0 + SHA512 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8 HEAD_REF master - PATCHES ignore-pdb-install-symbols-in-lib.patch ) if (VCPKG_TARGET_IS_UWP) diff --git a/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json index 1dae685b1..e24e65d66 100644 --- a/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/nu-book-zxing-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nu-book-zxing-cpp", - "version": "1.2.0", + "version": "1.3.0", "description": "Barcode detection and decoding library.", "homepage": "https://github.com/nu-book/zxing-cpp", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/nuklear/CMakeLists.txt b/external_imported/vcpkg/ports/nuklear/CMakeLists.txt index 28009f466..eba91e1fd 100644 --- a/external_imported/vcpkg/ports/nuklear/CMakeLists.txt +++ b/external_imported/vcpkg/ports/nuklear/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(Nuklear LANGUAGES C CXX) +project(Nuklear LANGUAGES C) option(INSTALL_EXAMPLE "Install the example code" OFF) option(INSTALL_DEMO "Install the demo code" OFF) diff --git a/external_imported/vcpkg/ports/nuklear/portfile.cmake b/external_imported/vcpkg/ports/nuklear/portfile.cmake index e13332986..f30f54d0f 100644 --- a/external_imported/vcpkg/ports/nuklear/portfile.cmake +++ b/external_imported/vcpkg/ports/nuklear/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Immediate-Mode-UI/Nuklear - REF 6e80e2a646f35be4afc157a932f2936392ec8f74 # accessed on 2021-04-04 - SHA512 ce064dff721111749d4056717879f42d3e24bb94655dd2b04c137eb7391d2c90d0b1b95155912c100b537f74fd150aedc48e0ac85eb72963c66e35ac81048323 + REF 0a77211844458673446aa99b8a0ae1090a04e413 # 2022-05-12 + SHA512 57ad5578c534d19ce6dd5e9b8c7b725da6e7f379a5289daed6b7128a1671dc5c368175d1e780a7fcb3405fad989e3bc50a8a921d62301e64e58014e351845cae HEAD_REF master ) @@ -26,4 +26,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/src/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nuklear/vcpkg.json b/external_imported/vcpkg/ports/nuklear/vcpkg.json index 1e48043bf..25261916e 100644 --- a/external_imported/vcpkg/ports/nuklear/vcpkg.json +++ b/external_imported/vcpkg/ports/nuklear/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nuklear", - "version-date": "2021-03-18", - "port-version": 1, + "version-date": "2022-05-12", "description": "This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain", "homepage": "https://github.com/Immediate-Mode-UI/Nuklear", + "license": "Unlicense OR MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/nuspell/portfile.cmake b/external_imported/vcpkg/ports/nuspell/portfile.cmake index 3128018e3..ca5cbe1ee 100644 --- a/external_imported/vcpkg/ports/nuspell/portfile.cmake +++ b/external_imported/vcpkg/ports/nuspell/portfile.cmake @@ -1,29 +1,40 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v5.0.0 - SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5 + REF v5.1.1 + SHA512 c33a52e3603071d3281b7cdcfa42776cd7ecb998292939538e53e364cfff63227cf094cd88ee6072b8a857f5d85c984c359a16b480dd462dac9cfd602cfd6c2c HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_TESTING=OFF + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nuspell) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nuspell) vcpkg_fixup_pkgconfig( # nuspell.pc depends on icu-uc.pc which has -lm specified as private # library. Ignore this -lm, otherwise this function shows error # because it can't find this. -lm is part of glibc on Linux. SYSTEM_LIBRARIES m ) -vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) + +if (BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) +endif() + file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file( - INSTALL ${SOURCE_PATH}/COPYING.LESSER - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/nuspell/vcpkg.json b/external_imported/vcpkg/ports/nuspell/vcpkg.json index 5840ce1c5..15f37dff5 100644 --- a/external_imported/vcpkg/ports/nuspell/vcpkg.json +++ b/external_imported/vcpkg/ports/nuspell/vcpkg.json @@ -1,13 +1,30 @@ { "name": "nuspell", - "version-semver": "5.0.0", + "version-semver": "5.1.1", "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", "Nuspell is written in modern C++ and it supports Hunspell dictionaries." ], "homepage": "https://nuspell.github.io/", + "license": "LGPL-3.0-or-later", "dependencies": [ - "icu" - ] + "icu", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools", + "dependencies": [ + "getopt" + ] + } + } } diff --git a/external_imported/vcpkg/ports/nvtt/fix-release-flags.patch b/external_imported/vcpkg/ports/nvtt/fix-release-flags.patch new file mode 100644 index 000000000..04263e0c6 --- /dev/null +++ b/external_imported/vcpkg/ports/nvtt/fix-release-flags.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake +index e4d5c56..eba8624 100644 +--- a/cmake/OptimalOptions.cmake ++++ b/cmake/OptimalOptions.cmake +@@ -11,8 +11,8 @@ IF(MSVC) + # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast") + + # Optimization flags. +- SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") ++ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GL") + SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG") + SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG") diff --git a/external_imported/vcpkg/ports/nvtt/portfile.cmake b/external_imported/vcpkg/ports/nvtt/portfile.cmake index 8ede40096..34b7d0a8a 100644 --- a/external_imported/vcpkg/ports/nvtt/portfile.cmake +++ b/external_imported/vcpkg/ports/nvtt/portfile.cmake @@ -15,18 +15,29 @@ vcpkg_from_github( add-compile-options-for-osx.patch skip-building-libsquish.patch fix-intrinsic-function.patch + fix-release-flags.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CMAKE_REQUIRE_FIND_PACKAGE_CUDA + INVERTED_FEATURES + cuda CMAKE_DISABLE_FIND_PACKAGE_CUDA ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNVTT_SHARED=0 + ${FEATURE_OPTIONS} + OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=_d # required by OSG ) vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/external_imported/vcpkg/ports/nvtt/vcpkg.json b/external_imported/vcpkg/ports/nvtt/vcpkg.json index 931bca6b8..0dddd028a 100644 --- a/external_imported/vcpkg/ports/nvtt/vcpkg.json +++ b/external_imported/vcpkg/ports/nvtt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nvtt", "version": "2.1.2", - "port-version": 4, + "port-version": 5, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", "license": "MIT", @@ -12,5 +12,13 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "features": { + "cuda": { + "description": "Enable CUDA support", + "dependencies": [ + "cuda" + ] + } + } } diff --git a/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake b/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake index bb7e363e0..83e428723 100644 --- a/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-consul/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json b/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json index e606a276c..c59494d36 100644 --- a/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-consul/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-consul", "version": "1.3.0", + "port-version": 1, "description": "OAT++ Modern web framework consul module.", "homepage": "https://github.com/oatpp/oatpp-consul", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake b/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake index f80968ec8..7dff231c9 100644 --- a/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-curl/portfile.cmake @@ -15,7 +15,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json b/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json index 5980921c1..869048340 100644 --- a/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-curl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-curl", "version": "1.3.0", + "port-version": 1, "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.", "homepage": "https://github.com/oatpp/oatpp-curl", + "license": "Apache-2.0", "dependencies": [ "curl", "oatpp", diff --git a/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake b/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake index b21fb9af2..c2643ab41 100644 --- a/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-libressl/portfile.cmake @@ -16,8 +16,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json b/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json index 96d4cc938..b4d919f8a 100644 --- a/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-libressl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-libressl", "version": "1.3.0", + "port-version": 1, "description": "Oat++ libressl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-libressl", + "license": "Apache-2.0", "dependencies": [ "libressl", "oatpp", diff --git a/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake b/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake index e4cccfcd3..b3bf87613 100644 --- a/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-mongo/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json b/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json index 6441e67d1..da880a9b4 100644 --- a/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-mongo/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-mongo", "version": "1.3.0", + "port-version": 1, "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.", "homepage": "https://github.com/oatpp/oatpp-mongo", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake b/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake index 3a080846f..c798d5f8d 100644 --- a/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-postgresql/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json b/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json index ebc8584c5..01ce5d7a5 100644 --- a/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-postgresql/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-postgresql", "version": "1.3.0", + "port-version": 1, "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", "homepage": "https://github.com/oatpp/oatpp-postgresql", + "license": "Apache-2.0", "dependencies": [ "libpq", "oatpp", diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake index 68ce88266..81bd1a5e2 100644 --- a/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-sqlite/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json index cb307cc1a..c192d7b2e 100644 --- a/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-sqlite/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-sqlite", "version": "1.3.0", + "port-version": 1, "description": "Oat++ SQLite adapter for Oat++ ORM.", "homepage": "https://github.com/oatpp/oatpp-sqlite", + "license": "Apache-2.0", "dependencies": [ "oatpp", "sqlite3", diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake b/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake index 05381b317..3523504d2 100644 --- a/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-ssdp/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json b/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json index fc169d634..8a7496deb 100644 --- a/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-ssdp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-ssdp", "version": "1.3.0", + "port-version": 1, "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", "homepage": "https://github.com/oatpp/oatpp-ssdp", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake b/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake index 2e24c320a..e79301a76 100644 --- a/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-swagger/portfile.cmake @@ -20,8 +20,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json b/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json index 65dba327e..2a920d4ba 100644 --- a/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-swagger/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-swagger", "version": "1.3.0", + "port-version": 1, "description": "Oat++ OpenApi (Swagger) UI submodule.", "homepage": "https://github.com/oatpp/oatpp-swagger", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake index 3759757ef..fc141336c 100644 --- a/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp-zlib/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json index 5b0feb184..6e4049a1e 100644 --- a/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp-zlib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-zlib", "version": "1.3.0", + "port-version": 1, "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "homepage": "https://github.com/oatpp/oatpp-zlib", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/external_imported/vcpkg/ports/oatpp/portfile.cmake b/external_imported/vcpkg/ports/oatpp/portfile.cmake index cf8513449..1e4a62583 100644 --- a/external_imported/vcpkg/ports/oatpp/portfile.cmake +++ b/external_imported/vcpkg/ports/oatpp/portfile.cmake @@ -20,13 +20,12 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) 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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/oatpp/vcpkg.json b/external_imported/vcpkg/ports/oatpp/vcpkg.json index 8e7a81840..13495e4c6 100644 --- a/external_imported/vcpkg/ports/oatpp/vcpkg.json +++ b/external_imported/vcpkg/ports/oatpp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp", "version": "1.3.0", + "port-version": 1, "description": "Modern web framework.", "homepage": "https://github.com/oatpp/oatpp", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/octomap/portfile.cmake b/external_imported/vcpkg/ports/octomap/portfile.cmake index 0730461b6..be17c875b 100644 --- a/external_imported/vcpkg/ports/octomap/portfile.cmake +++ b/external_imported/vcpkg/ports/octomap/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OctoMap/octomap - REF v1.9.5 - SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581 + REF c4a4304895f6cfc31723dc95df252fe7e756a0ef # v1.9.6 + SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd HEAD_REF master PATCHES "001-fix-exported-targets.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF @@ -20,26 +19,26 @@ vcpkg_configure_cmake( -DBUILD_DYNAMICETD3D_SUBPROJECT=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_tools( TOOL_NAMES binvox2bt bt2vrml compare_octrees convert_octree edit_octree eval_octree_accuracy graph2tree log2graph AUTO_CLEAN) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap") # Handle copyright -file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/octomap/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/octomap/vcpkg.json b/external_imported/vcpkg/ports/octomap/vcpkg.json index a68ad430a..7409ae814 100644 --- a/external_imported/vcpkg/ports/octomap/vcpkg.json +++ b/external_imported/vcpkg/ports/octomap/vcpkg.json @@ -1,7 +1,17 @@ { "name": "octomap", - "version-string": "1.9.5", - "port-version": 2, + "version": "1.9.6", "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", - "homepage": "https://octomap.github.io/" + "homepage": "https://octomap.github.io/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/ogre-next/portfile.cmake b/external_imported/vcpkg/ports/ogre-next/portfile.cmake index 5766b5d9c..266c930c2 100644 --- a/external_imported/vcpkg/ports/ogre-next/portfile.cmake +++ b/external_imported/vcpkg/ports/ogre-next/portfile.cmake @@ -10,8 +10,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 - SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 + REF e4c5f0f6d36c07af594e3ef143d017bda1581442 #v2.3.1 + SHA512 263a50b64defa7345a109a068cc17c347a696f83f64abc071256bb46571ed6b2ef94ee3480d90938cdb7f745d36a4c4890d82677d357c62c9a2956eae8d4ac15 HEAD_REF master PATCHES toolchain_fixes.patch @@ -113,7 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" 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/external_imported/vcpkg/ports/ogre-next/vcpkg.json b/external_imported/vcpkg/ports/ogre-next/vcpkg.json index 7a6a81bd9..bc4fe07bb 100644 --- a/external_imported/vcpkg/ports/ogre-next/vcpkg.json +++ b/external_imported/vcpkg/ports/ogre-next/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ogre-next", - "version": "2.3.0", + "version": "2.3.1", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", diff --git a/external_imported/vcpkg/ports/ogre/fix-cmake-feature-summary.patch b/external_imported/vcpkg/ports/ogre/fix-cmake-feature-summary.patch new file mode 100644 index 000000000..56b75faa7 --- /dev/null +++ b/external_imported/vcpkg/ports/ogre/fix-cmake-feature-summary.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake +similarity index 100% +rename from CMake/FeatureSummary.cmake +rename to CMake/OgreFeatureSummary.cmake +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb86305..abbd5c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -505,4 +505,4 @@ include(Packaging) + + + # Show feature summary +-include(FeatureSummary) ++include(OgreFeatureSummary) diff --git a/external_imported/vcpkg/ports/ogre/fix-dependency.patch b/external_imported/vcpkg/ports/ogre/fix-dependency.patch index fd7076dd8..a249b7baa 100644 --- a/external_imported/vcpkg/ports/ogre/fix-dependency.patch +++ b/external_imported/vcpkg/ports/ogre/fix-dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 2ae0b66..e6c55cd 100644 +index 14c9290..ee8dab3 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -242,7 +242,7 @@ find_package(FreeImage) @@ -34,3 +34,90 @@ index 2ae0b66..e6c55cd 100644 macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) add_library(SDL2::SDL2 INTERFACE IMPORTED) +diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in +index 392c89c..a79ff8d 100644 +--- a/CMake/Templates/OGREConfig.cmake.in ++++ b/CMake/Templates/OGREConfig.cmake.in +@@ -32,6 +32,18 @@ get_filename_component(OGRE_LIBRARY_DIRS "${OGRE_PREFIX_DIR}/lib" ABSOLUTE) + get_filename_component(OGRE_INCLUDE_DIRS "${OGRE_PREFIX_DIR}/include/OGRE" ABSOLUTE) + set(OGRE_LIBRARIES) + ++include(CMakeFindDependencyMacro) ++ ++find_dependency(pugixml CONFIG) ++find_dependency(SDL2 CONFIG) ++find_dependency(ZLIB) ++find_dependency(assimp CONFIG) ++find_dependency(freetype CONFIG) ++ ++if (@OGRE_BUILD_COMPONENT_OVERLAY_IMGUI@) ++ find_dependency(imgui CONFIG) ++endif() ++ + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) + +diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt +index 5d58a8d..fe41e4a 100644 +--- a/Components/Bites/CMakeLists.txt ++++ b/Components/Bites/CMakeLists.txt +@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN) + message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") + endif() + ++if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ find_package(imgui CONFIG REQUIRED) ++ target_link_libraries(OgreBites PRIVATE imgui::imgui) ++endif() ++ + generate_export_header(OgreBites + EXPORT_MACRO_NAME _OgreBitesExport + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) +diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt +index df8f32a..42be1e8 100644 +--- a/Components/Overlay/CMakeLists.txt ++++ b/Components/Overlay/CMakeLists.txt +@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) +- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "") +- if(NOT EXISTS ${IMGUI_DIR}) +- message(STATUS "Dowloading imgui") +- file(DOWNLOAD +- https://github.com/ocornut/imgui/archive/v1.77.tar.gz +- ${PROJECT_BINARY_DIR}/imgui.tar.gz) +- execute_process(COMMAND ${CMAKE_COMMAND} +- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) +- endif() +- list(APPEND SOURCE_FILES +- ${IMGUI_DIR}/imgui.cpp +- ${IMGUI_DIR}/imgui_draw.cpp +- ${IMGUI_DIR}/imgui_widgets.cpp +- ${IMGUI_DIR}/imgui_demo.cpp +- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp) ++ find_package(imgui CONFIG REQUIRED) ++ find_path(IMGUI_INCLUDE_DIR imgui.h) + else() + list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp") + endif() +@@ -41,13 +28,17 @@ endif() + # setup target + add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) + set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) +-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) ++if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui) ++else() ++ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB) ++endif() + target_include_directories(OgreOverlay PUBLIC + "$" + $ + PRIVATE ${FREETYPE_INCLUDE_DIRS}) + +-if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++if(0) + target_include_directories(OgreOverlay PUBLIC + PUBLIC "$" + PRIVATE "$") diff --git a/external_imported/vcpkg/ports/ogre/fix-findimgui.patch b/external_imported/vcpkg/ports/ogre/fix-findimgui.patch deleted file mode 100644 index 8e812d926..000000000 --- a/external_imported/vcpkg/ports/ogre/fix-findimgui.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index df8f32af4..42be1e8f2 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES - file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - - if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "") -- if(NOT EXISTS ${IMGUI_DIR}) -- message(STATUS "Dowloading imgui") -- file(DOWNLOAD -- https://github.com/ocornut/imgui/archive/v1.77.tar.gz -- ${PROJECT_BINARY_DIR}/imgui.tar.gz) -- execute_process(COMMAND ${CMAKE_COMMAND} -- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) -- endif() -- list(APPEND SOURCE_FILES -- ${IMGUI_DIR}/imgui.cpp -- ${IMGUI_DIR}/imgui_draw.cpp -- ${IMGUI_DIR}/imgui_widgets.cpp -- ${IMGUI_DIR}/imgui_demo.cpp -- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp) -+ find_package(imgui CONFIG REQUIRED) -+ find_path(IMGUI_INCLUDE_DIR imgui.h) - else() - list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp") - endif() -@@ -41,13 +28,17 @@ endif() - # setup target - add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) -+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui) -+else() -+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB) -+endif() - target_include_directories(OgreOverlay PUBLIC - "$" - $ - PRIVATE ${FREETYPE_INCLUDE_DIRS}) - --if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+if(0) - target_include_directories(OgreOverlay PUBLIC - PUBLIC "$" - PRIVATE "$") -diff --git "a/Components/Bites/CMakeLists.txt" "b/Components/Bites/CMakeLists.txt" -index 5d58a8d74..fe41e4a28 100644 ---- "a/Components/Bites/CMakeLists.txt" -+++ "b/Components/Bites/CMakeLists.txt" -@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN) - message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") - endif() - -+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+ find_package(imgui CONFIG REQUIRED) -+ target_link_libraries(OgreBites PRIVATE imgui::imgui) -+endif() -+ - generate_export_header(OgreBites - EXPORT_MACRO_NAME _OgreBitesExport - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) - diff --git a/external_imported/vcpkg/ports/ogre/fix-pkgconfig.patch b/external_imported/vcpkg/ports/ogre/fix-pkgconfig.patch new file mode 100644 index 000000000..365663fa6 --- /dev/null +++ b/external_imported/vcpkg/ports/ogre/fix-pkgconfig.patch @@ -0,0 +1,27 @@ +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +index 73606c9..4377353 100644 +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -175,11 +175,19 @@ if (UNIX) + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread") + endif () + if (OGRE_STATIC) +- if (OGRE_CONFIG_THREADS) +- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread-mt") ++ if (OGRE_CONFIG_THREADS AND OGRE_CONFIG_THREAD_PROVIDER STREQUAL "boost") ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_DEBUG}") ++ else() ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_RELEASE}") ++ endif() + endif () + # there is no pkgconfig file for freeimage, so we need to add that lib manually +- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_DBG}") ++ else() ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_REL}") ++ endif() + configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) + else () + configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) diff --git a/external_imported/vcpkg/ports/ogre/portfile.cmake b/external_imported/vcpkg/ports/ogre/portfile.cmake index 89d49b28d..1c79e71c3 100644 --- a/external_imported/vcpkg/ports/ogre/portfile.cmake +++ b/external_imported/vcpkg/ports/ogre/portfile.cmake @@ -15,8 +15,9 @@ vcpkg_from_github( PATCHES toolchain_fixes.patch fix-dependency.patch - fix-findimgui.patch disable-dependency-qt.patch + fix-pkgconfig.patch + fix-cmake-feature-summary.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") @@ -70,49 +71,55 @@ vcpkg_cmake_configure( -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DFREETYPE_FOUND=ON -DOGRE_CMAKE_DIR=share/ogre + MAYBE_UNUSED_VARIABLES + OGRE_BUILD_RENDERSYSTEM_GLES ) vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + vcpkg_cmake_config_fixup() -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg) +file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg") if(REL_CFGS) - file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE ${REL_CFGS}) endif() -file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) +file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg") if(DBG_CFGS) - file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") file(REMOVE ${DBG_CFGS}) endif() 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() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib") else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") endif() if(NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib") else() - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") endif() endif() - file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake) + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) file(READ "${SHARE_FILE}" _contents) string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") @@ -120,13 +127,10 @@ if(VCPKG_TARGET_IS_WINDOWS) endforeach() endif() -file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg) +file(GLOB share_cfgs "${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg") foreach(file ${share_cfgs}) vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..") endforeach() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/ogre/vcpkg.json b/external_imported/vcpkg/ports/ogre/vcpkg.json index 1abf6edac..c1bbf065c 100644 --- a/external_imported/vcpkg/ports/ogre/vcpkg.json +++ b/external_imported/vcpkg/ports/ogre/vcpkg.json @@ -1,11 +1,12 @@ { "name": "ogre", "version": "1.12.9", - "port-version": 7, + "port-version": 10, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "dependencies": [ + "assimp", "pugixml", "sdl2", { @@ -26,10 +27,7 @@ ], "features": { "assimp": { - "description": "Use assimp", - "dependencies": [ - "assimp" - ] + "description": "Deprecate feature, enable by default" }, "csharp": { "description": "Build csharp bindings" diff --git a/external_imported/vcpkg/ports/onednn/portfile.cmake b/external_imported/vcpkg/ports/onednn/portfile.cmake index f254c4e37..08909454f 100644 --- a/external_imported/vcpkg/ports/onednn/portfile.cmake +++ b/external_imported/vcpkg/ports/onednn/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF v2.4.3 - SHA512 6a597be1b6b50d252e346a96d3c9b4771e9d8e8fc495a09b638ea296d53e71d51ea2e2be04cc20de1bca17215a7a7e5f22a1808628bcdf98180def2d91b2c9e3 + REF 58be3660fb57c4c4a3d306730e849237d1271572 #2.6.1 + SHA512 8fc51655d0ecdb5b137d04c6b3ee01959d9505e0d7ee74cab872447b5873f214d38db55edf4040a56d4455557ec2c0707097337c6e276dbaf1c9c6e48b95a820 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/onednn/vcpkg.json b/external_imported/vcpkg/ports/onednn/vcpkg.json index b06a95264..d53c66bbe 100644 --- a/external_imported/vcpkg/ports/onednn/vcpkg.json +++ b/external_imported/vcpkg/ports/onednn/vcpkg.json @@ -1,9 +1,9 @@ { "name": "onednn", - "version-semver": "2.4.3", - "port-version": 1, + "version-semver": "2.6.1", "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", + "license": "Apache-2.0", "supports": "x64 & !uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/openal-soft/0001-fix-mingw-x86-build.patch b/external_imported/vcpkg/ports/openal-soft/0001-fix-mingw-x86-build.patch new file mode 100644 index 000000000..a63002a4e --- /dev/null +++ b/external_imported/vcpkg/ports/openal-soft/0001-fix-mingw-x86-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1984ac9..0d1690a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -472,7 +472,7 @@ if(CMAKE_SIZEOF_VOID_P MATCHES "4" AND HAVE_SSE2) + # assumes the stack is suitably aligned. Older Linux code or other + # OSs don't guarantee this on 32-bit, so externally-callable + # functions need to ensure an aligned stack. +- set(EXPORT_DECL "${EXPORT_DECL} __attribute__((force_align_arg_pointer))") ++ set(EXPORT_DECL "${EXPORT_DECL}__attribute__((force_align_arg_pointer))") + endif() + endif() + endif() diff --git a/external_imported/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch b/external_imported/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch deleted file mode 100644 index 3ff82b0b8..000000000 --- a/external_imported/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config.h.in b/config.h.in ---- a/config.h.in -+++ b/config.h.in -@@ -1,6 +1,8 @@ - /* API declaration export attribute */ -+#ifndef AL_LIBTYPE_STATIC - #define AL_API ${EXPORT_DECL} - #define ALC_API ${EXPORT_DECL} -+#endif - - /* Define if HRTF data is embedded in the library */ - #cmakedefine ALSOFT_EMBED_HRTF_DATA - \ No newline at end of file diff --git a/external_imported/vcpkg/ports/openal-soft/portfile.cmake b/external_imported/vcpkg/ports/openal-soft/portfile.cmake index c090c7406..43218d0fd 100644 --- a/external_imported/vcpkg/ports/openal-soft/portfile.cmake +++ b/external_imported/vcpkg/ports/openal-soft/portfile.cmake @@ -1,11 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft - REF ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # openal-soft-1.21.1 - SHA512 6ba006d3dad6efe002f285ff509a59f02b499ec3f6065df12a89c52355464117b4dbabcd04ee9cbf22cc3b4125c8e456769b172f8c3e9ee215e760b2c51a0a8f + REF dc83d99c95a42c960150ddeee06c124134b52208 # openal-soft-1.22.2 + SHA512 3fbbdfbb2609ef8187d20ce74b2fb8082037288f3fd80df71d360705d8efdadfe8f62811af1cd824cb6572c8c3479b370f8ae3819b8b8bb0b20c34f7a73cc530 HEAD_REF master PATCHES - dont-export-symbols-in-static-build.patch + 0001-fix-mingw-x86-build.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pipewire ALSOFT_BACKEND_PIPEWIRE ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -17,6 +22,7 @@ endif() set(ALSOFT_REQUIRE_LINUX OFF) set(ALSOFT_REQUIRE_WINDOWS OFF) set(ALSOFT_REQUIRE_APPLE OFF) +set(ALSOFT_CPUEXT_NEON OFF) if(VCPKG_TARGET_IS_LINUX) set(ALSOFT_REQUIRE_LINUX ON) @@ -27,10 +33,13 @@ endif() if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(ALSOFT_REQUIRE_APPLE ON) endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ALSOFT_CPUEXT_NEON ON) +endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DLIBTYPE=${OPENAL_LIBTYPE} -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON @@ -43,15 +52,15 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_SOLARIS=OFF -DALSOFT_BACKEND_SNDIO=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF - -DALSOFT_BACKEND_PULSEAUDIO=OFF + -DALSOFT_BACKEND_PULSEAUDIO=${ALSOFT_REQUIRE_LINUX} -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} -DALSOFT_BACKEND_JACK=OFF - -DALSOFT_BACKEND_OPENSL=OFF + -DALSOFT_BACKEND_OPENSL=${VCPKG_TARGET_IS_ANDROID} -DALSOFT_BACKEND_WAVE=ON -DALSOFT_BACKEND_WINMM=OFF -DALSOFT_BACKEND_DSOUND=OFF -DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS} - -DALSOFT_CPUEXT_NEON=OFF + -DALSOFT_CPUEXT_NEON=${ALSOFT_CPUEXT_NEON} -DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON MAYBE_UNUSED_VARIABLES ALSOFT_AMBDEC_PRESETS @@ -61,17 +70,20 @@ vcpkg_configure_cmake( ALSOFT_BACKEND_OPENSL ALSOFT_BACKEND_OSS ALSOFT_BACKEND_PORTAUDIO + ALSOFT_BACKEND_PIPEWIRE ALSOFT_BACKEND_PULSEAUDIO ALSOFT_BACKEND_SNDIO ALSOFT_BACKEND_SOLARIS ALSOFT_CONFIG ALSOFT_CPUEXT_NEON ALSOFT_HRTF_DEFS + ALSOFT_BACKEND_WINMM + ALSOFT_BACKEND_DSOUND CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenAL") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenAL") foreach(HEADER al.h alc.h) file(READ "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" AL_H) diff --git a/external_imported/vcpkg/ports/openal-soft/vcpkg.json b/external_imported/vcpkg/ports/openal-soft/vcpkg.json index 4988f6635..43aac0e8d 100644 --- a/external_imported/vcpkg/ports/openal-soft/vcpkg.json +++ b/external_imported/vcpkg/ports/openal-soft/vcpkg.json @@ -1,8 +1,32 @@ { "name": "openal-soft", - "version-semver": "1.21.1", + "version-semver": "1.22.2", "port-version": 4, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", - "supports": "!uwp" + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pipewire": { + "description": "Native support for Pipewire", + "supports": "linux", + "dependencies": [ + "pipewire" + ] + } + } } diff --git a/external_imported/vcpkg/ports/openblas/fix-space-path.patch b/external_imported/vcpkg/ports/openblas/fix-space-path.patch index b782a994f..e0944fadd 100644 --- a/external_imported/vcpkg/ports/openblas/fix-space-path.patch +++ b/external_imported/vcpkg/ports/openblas/fix-space-path.patch @@ -1,8 +1,8 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake -index 58ca1eb..e2f2134 100644 +index 60b7637..a8b34ef 100644 --- a/cmake/prebuild.cmake +++ b/cmake/prebuild.cmake -@@ -490,14 +490,14 @@ else(NOT CMAKE_CROSSCOMPILING) +@@ -1322,14 +1322,14 @@ else(NOT CMAKE_CROSSCOMPILING) set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build") set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}") @@ -19,9 +19,9 @@ index 58ca1eb..e2f2134 100644 - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} + COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" ) - + if (NOT ${GETARCH_RESULT}) -@@ -518,14 +518,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA +@@ -1367,14 +1367,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build") set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}") diff --git a/external_imported/vcpkg/ports/openblas/portfile.cmake b/external_imported/vcpkg/ports/openblas/portfile.cmake index 45c1f86c5..24da7a012 100644 --- a/external_imported/vcpkg/ports/openblas/portfile.cmake +++ b/external_imported/vcpkg/ports/openblas/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 2480e5046e3b0120da8a7fd1442eca628df55f87 # v0.3.19 - SHA512 b85a96c8cd75bf7197732f3b923b8b0ffdc6261d7d6dc7b622d4bf24f061d02273ad99571cabe4686d92f77ff8e6f7e2de0851758cbb3c529d7c2ca96a0bc34d + REF b89fb708caa5a5a32de8f4306c4ff132e0228e9a # v0.3.21 + SHA512 495e885409f0c6178332cddd685f3c002dc92e7af251c4e4eb3da6935ef6e81565c2505d436245b9bf53ce58649764e0471dc43b7f5f30b6ed092366cbbc2d5c HEAD_REF develop PATCHES uwp.patch @@ -36,8 +36,7 @@ set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) if(VCPKG_TARGET_IS_OSX) if("dynamic-arch" IN_LIST FEATURES) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - message(STATUS "Openblas with \"dynamic-arch\" option for OSX supports only dynamic linkage. It's not a bag of openblas but bug of combination cmake+ninja+osx. See: https://gitlab.kitware.com/cmake/cmake/-/issues/16731") + set(conf_opts GENERATOR "Unix Makefiles") endif() endif() @@ -56,8 +55,13 @@ elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) ) endif() +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPENBLAS_EXTRA_OPTIONS -DCORE=GENERIC) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + ${conf_opts} OPTIONS ${FEATURE_OPTIONS} ${COMMON_OPTIONS} @@ -108,4 +112,4 @@ vcpkg_replace_string( 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(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/openblas/vcpkg.json b/external_imported/vcpkg/ports/openblas/vcpkg.json index eaafc620b..1cac7bff4 100644 --- a/external_imported/vcpkg/ports/openblas/vcpkg.json +++ b/external_imported/vcpkg/ports/openblas/vcpkg.json @@ -1,8 +1,10 @@ { "name": "openblas", - "version": "0.3.19", + "version": "0.3.21", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", + "license": "BSD-3-Clause", + "supports": "!(arm & uwp)", "dependencies": [ { "name": "openblas", diff --git a/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch b/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch new file mode 100644 index 000000000..b37b7ee4e --- /dev/null +++ b/external_imported/vcpkg/ports/opencascade/fix-depend-freetype.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fbcede5..66b127d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE) + if (USE_FREETYPE) + message (STATUS "Info: FreeType is used by OCCT") + add_definitions (-DHAVE_FREETYPE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") ++ find_package(freetype CONFIG REQUIRED) ++ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) ++ list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") + OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") diff --git a/external_imported/vcpkg/ports/opencascade/portfile.cmake b/external_imported/vcpkg/ports/opencascade/portfile.cmake index a1f7e439d..bfbea4134 100644 --- a/external_imported/vcpkg/ports/opencascade/portfile.cmake +++ b/external_imported/vcpkg/ports/opencascade/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF 80ffc5f84dae96de6ed093d3e5d2466a9e368b27 #V7.6.0 - SHA512 1dfee9c59eb6ea61735f0807d44ccf62019a2649f506a5a8197e04b1533592dc95d6d67ab7a3bb392785755ed60b6fc489bea049f658d4ae7d05dfe0d7d5bdcd + REF bb368e271e24f63078129283148ce83db6b9670a #V7.6.2 + SHA512 500c7ff804eb6b202bef48e1be904fe43a3c0137e9a402affe128b3b75a1adbb20bfe383cee82503b13efc083a95eb97425f1afb1f66bae38543d29f871a91f9 HEAD_REF master PATCHES fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch + fix-depend-freetype.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -49,27 +50,29 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade) #make occt includes relative to source_file list(APPEND ADDITIONAL_HEADERS "ExprIntrp.tab.h" - "FlexLexer.h" - "glext.h" - "igesread.h" - "NCollection_Haft.h" - "OSD_PerfMeter.h" - "Standard_values.h" + "FlexLexer.h" + "glext.h" + "igesread.h" + "NCollection_Haft.h" + "OSD_PerfMeter.h" + "Standard_values.h" ) file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx") foreach(file_name IN LISTS files) - file(READ "${file_name}" filedata) - string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") - foreach(extra_header IN LISTS ADDITIONAL_HEADERS) - string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") - endforeach() - file(WRITE "${file_name}" "${filedata}") + file(READ "${file_name}" filedata) + string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") + foreach(extra_header IN LISTS ADDITIONAL_HEADERS) + string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") + endforeach() + file(WRITE "${file_name}" "${filedata}") endforeach() # Remove libd to lib, libd just has cmake files we dont want too +if( WIN32 ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/opencascade/vcpkg.json b/external_imported/vcpkg/ports/opencascade/vcpkg.json index ea7ddba29..1b16eece7 100644 --- a/external_imported/vcpkg/ports/opencascade/vcpkg.json +++ b/external_imported/vcpkg/ports/opencascade/vcpkg.json @@ -1,10 +1,13 @@ { "name": "opencascade", - "version": "7.6.0", + "version": "7.6.2", + "port-version": 1, "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", - "supports": "!(uwp | osx | linux | arm)", + "license": "LGPL-2.1", + "supports": "!(uwp | osx | arm)", "dependencies": [ + "fontconfig", "freetype", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/opencc/fix-dependencies.patch b/external_imported/vcpkg/ports/opencc/fix-dependencies.patch new file mode 100644 index 000000000..31e33a2e3 --- /dev/null +++ b/external_imported/vcpkg/ports/opencc/fix-dependencies.patch @@ -0,0 +1,26 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 11d14e4..0fa3e1e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -137,6 +137,21 @@ set_target_properties( + 1.1 + ) + ++if(USE_SYSTEM_RAPIDJSON) ++ find_package(RapidJSON CONFIG REQUIRED) ++ target_link_libraries(libopencc PRIVATE rapidjson) ++endif() ++ ++if(USE_SYSTEM_TCLAP) ++ find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") ++ target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS}) ++endif() ++ ++if(USE_SYSTEM_DARTS) ++ find_path(DARTS_INCLUDE_DIRS "darts.h") ++ target_include_directories(libopencc PUBLIC ${DARTS_INCLUDE_DIRS}) ++endif() ++ + # Installation + + install( diff --git a/external_imported/vcpkg/ports/opencc/portfile.cmake b/external_imported/vcpkg/ports/opencc/portfile.cmake index f9d4a97fe..dc000f7ea 100644 --- a/external_imported/vcpkg/ports/opencc/portfile.cmake +++ b/external_imported/vcpkg/ports/opencc/portfile.cmake @@ -1,51 +1,52 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC - REF e8ec6d59f264a4a42e310148a9534a8cc0123928 - SHA512 e6b3f6d681223b299795c324a48e82609abd1f411d3cbd5f9d8607284ec04717fa9878953d037c25a931a0857f50a5c0e883e0d44ddbea18c50830ad49514c59 + REF ver.1.1.4 + SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 HEAD_REF master + PATCHES + fix-dependencies.patch ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DOCUMENTATION=OFF -DENABLE_GTEST=OFF + -DUSE_SYSTEM_RAPIDJSON=ON + -DUSE_SYSTEM_TCLAP=ON + -DUSE_SYSTEM_DARTS=ON ) -vcpkg_install_cmake( +vcpkg_cmake_install( DISABLE_PARALLEL ) vcpkg_copy_pdbs() -if(tools IN_LIST FEATURES) - foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) - file(COPY - ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} - ) - endforeach() +vcpkg_fixup_pkgconfig() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +set(tool_names "opencc" "opencc_dict" "opencc_phrase_extract") +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) - file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ) - endforeach() +foreach(opencc_tool IN LISTS tool_names) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + ) +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${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 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/external_imported/vcpkg/ports/opencc/vcpkg.json b/external_imported/vcpkg/ports/opencc/vcpkg.json index ef89e10e7..49833f483 100644 --- a/external_imported/vcpkg/ports/opencc/vcpkg.json +++ b/external_imported/vcpkg/ports/opencc/vcpkg.json @@ -1,10 +1,24 @@ { "name": "opencc", - "version-date": "2020-04-26", - "port-version": 10, - "description": "A project for conversion between Traditional and Simplified Chinese", + "version": "1.1.4", + "port-version": 3, + "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", + "license": "Apache-2.0", "supports": "!(arm | uwp)", + "dependencies": [ + "darts-clone", + "rapidjson", + "tclap", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build OpenCC command-line tools" diff --git a/external_imported/vcpkg/ports/opencensus-cpp/fix-install.patch b/external_imported/vcpkg/ports/opencensus-cpp/fix-install.patch index a8c76248a..bca8ea1e6 100644 --- a/external_imported/vcpkg/ports/opencensus-cpp/fix-install.patch +++ b/external_imported/vcpkg/ports/opencensus-cpp/fix-install.patch @@ -1,10 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ecec53..45d994c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,13 @@ enable_testing() + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) + +-include(OpenCensusDeps) ++find_package(absl CONFIG REQUIRED) ++find_package(prometheus-cpp CONFIG REQUIRED) ++ ++if(BUILD_TESTING) ++ find_package(GTest CONFIG REQUIRED) ++ find_package(benchmark CONFIG REQUIRED) ++endif() + + include(OpenCensusHelpers) + diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake -index 8fdfe96..53bc877 100644 +index 8fdfe96..6667085 100644 --- a/cmake/OpenCensusHelpers.cmake +++ b/cmake/OpenCensusHelpers.cmake -@@ -37,6 +37,13 @@ function(opencensus_test NAME SRC) +@@ -35,8 +35,15 @@ function(opencensus_test NAME SRC) + set(_NAME "opencensus_${NAME}") + add_executable(${_NAME} ${SRC}) prepend_opencensus(DEPS "${ARGN}") - target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) +- target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) ++ target_link_libraries(${_NAME} "${DEPS}" GTest::gmock GTest::gtest_main) add_test(NAME ${_NAME} COMMAND ${_NAME}) + + install( @@ -16,10 +38,12 @@ index 8fdfe96..53bc877 100644 endif() endfunction() -@@ -50,6 +57,13 @@ function(opencensus_benchmark NAME SRC) +@@ -49,7 +56,14 @@ function(opencensus_benchmark NAME SRC) + set(_NAME "opencensus_${NAME}") add_executable(${_NAME} ${SRC}) prepend_opencensus(DEPS "${ARGN}") - target_link_libraries(${_NAME} "${DEPS}" benchmark) +- target_link_libraries(${_NAME} "${DEPS}" benchmark) ++ target_link_libraries(${_NAME} "${DEPS}" benchmark::benchmark) + + install( + TARGETS ${_NAME} diff --git a/external_imported/vcpkg/ports/opencensus-cpp/portfile.cmake b/external_imported/vcpkg/ports/opencensus-cpp/portfile.cmake index c914bc38d..b6348136a 100644 --- a/external_imported/vcpkg/ports/opencensus-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/opencensus-cpp/portfile.cmake @@ -4,7 +4,8 @@ vcpkg_from_github( REF 62d8281899a1cfd1084793f64295329a6b5d22b3 # 2021-08-26 SHA512 35df40d7e5ce933384fe6ba4ac2d704e0801ac47765fca97ea3f8d787886abe5c588855c3aac5745f047c1c8f2047e1f69b62340dd702042a61c3dc430ca36b4 HEAD_REF master - PATCHES fix-install.patch + PATCHES + fix-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -13,7 +14,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) @@ -21,6 +22,6 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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/external_imported/vcpkg/ports/opencensus-cpp/vcpkg.json b/external_imported/vcpkg/ports/opencensus-cpp/vcpkg.json index 4481e60fd..db888711f 100644 --- a/external_imported/vcpkg/ports/opencensus-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/opencensus-cpp/vcpkg.json @@ -1,23 +1,26 @@ { "name": "opencensus-cpp", "version-date": "2021-08-26", + "port-version": 2, "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", "homepage": "https://github.com/census-instrumentation/opencensus-cpp", + "license": "Apache-2.0", "supports": "!windows", "dependencies": [ "abseil", + "prometheus-cpp", { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ], "features": { "test": { - "description": "Build test" + "description": "Build test", + "dependencies": [ + "benchmark", + "gtest" + ] } } } diff --git a/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch b/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch deleted file mode 100644 index 24b1c3fd8..000000000 --- a/external_imported/vcpkg/ports/opencolorio/fix-buildTools.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt -index b992bbc..804d3c5 100644 ---- a/src/OpenColorIO/CMakeLists.txt -+++ b/src/OpenColorIO/CMakeLists.txt -@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) - else() - # Only exports selected symbols. - target_compile_definitions(OpenColorIO -- PUBLIC -+ PRIVATE - OpenColorIO_EXPORTS - ) - endif() diff --git a/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch index 1ddda42ec..d446358fc 100644 --- a/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch +++ b/external_imported/vcpkg/ports/opencolorio/fix-dependency.patch @@ -39,7 +39,7 @@ index 8787b87..f953ceb 100644 set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE) set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) -@@ -65,13 +65,13 @@ if(OCIO_BUILD_APPS) +@@ -65,7 +65,7 @@ if(OCIO_BUILD_APPS) # lcms2 # https://github.com/mm2/Little-CMS @@ -48,21 +48,6 @@ index 8787b87..f953ceb 100644 endif() if(OCIO_BUILD_OPENFX) - # openfx - # https://github.com/ofxa/openfx -- find_package(openfx 1.4 REQUIRED) -+ find_package(openfx CONFIG REQUIRED) - endif() - - if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON) -@@ -100,6 +100,6 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS) - if(OCIO_BUILD_PYTHON) - # pybind11 - # https://github.com/pybind/pybind11 -- find_package(pybind11 2.6.1 REQUIRED) -+ find_package(pybind11 CONFIG REQUIRED) - endif() - endif() diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt index 034185d..b992bbc 100755 --- a/src/OpenColorIO/CMakeLists.txt @@ -80,38 +65,17 @@ index 034185d..b992bbc 100755 yaml-cpp ) -@@ -242,13 +242,13 @@ endif() - - if(NOT BUILD_SHARED_LIBS) - target_compile_definitions(OpenColorIO -- PRIVATE -+ PUBLIC - OpenColorIO_SKIP_IMPORTS - ) - else() - # Only exports selected symbols. - target_compile_definitions(OpenColorIO -- PRIVATE -+ PUBLIC - OpenColorIO_EXPORTS - ) - endif() diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in index eebb2c1..7147dc3 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -2,4 +2,14 @@ +@@ -2,4 +2,9 @@ include(CMakeFindDependencyMacro) -+find_dependency(expat CONFIG REQUIRED) -+find_dependency(imath CONFIG REQUIRED) -+find_dependency(pystring CONFIG REQUIRED) -+find_dependency(yaml-cpp CONFIG REQUIRED) -+ -+if(@OCIO_BUILD_APPS@) -+ find_dependency(lcms2 CONFIG REQUIRED) -+ find_dependency(GLEW) -+endif() ++find_dependency(expat CONFIG) ++find_dependency(Imath CONFIG) ++find_dependency(pystring CONFIG) ++find_dependency(yaml-cpp CONFIG) + include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) diff --git a/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch b/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch new file mode 100644 index 000000000..7337952c8 --- /dev/null +++ b/external_imported/vcpkg/ports/opencolorio/fix-pkgconfig.patch @@ -0,0 +1,10 @@ +diff --git a/src/OpenColorIO/res/OpenColorIO.pc.in b/src/OpenColorIO/res/OpenColorIO.pc.in +index f25c280..d9a450b 100644 +--- a/src/OpenColorIO/res/OpenColorIO.pc.in ++++ b/src/OpenColorIO/res/OpenColorIO.pc.in +@@ -9,3 +9,5 @@ Description: @PROJECT_DESCRIPTION@ + URL: @PROJECT_HOMEPAGE_URL@ + Libs: -L${libdir} -l@PROJECT_NAME@ + Cflags: -I${includedir} ++Libs.private: -lpystring ++Requires.private: expat Imath yaml-cpp diff --git a/external_imported/vcpkg/ports/opencolorio/portfile.cmake b/external_imported/vcpkg/ports/opencolorio/portfile.cmake index 9465e4978..a9bf1feea 100644 --- a/external_imported/vcpkg/ports/opencolorio/portfile.cmake +++ b/external_imported/vcpkg/ports/opencolorio/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF v2.1.1 - SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194 + REF v2.1.2 + SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353 HEAD_REF master PATCHES fix-dependency.patch - fix-buildTools.patch + fix-pkgconfig.patch ) file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") @@ -34,20 +34,30 @@ vcpkg_cmake_configure( -DOCIO_INSTALL_EXT_PACKAGES=NONE -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_OpenImageIO ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO") +set(dll_import 0) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(dll_import 1) +endif() +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/OpenColorIO/OpenColorABI.h" + "ifndef OpenColorIO_SKIP_IMPORTS" + "if ${dll_import}" +) + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenColorIO") vcpkg_copy_pdbs() -# Clean redundant files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake" - "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" + "${CURRENT_PACKAGES_DIR}/share/ocio" ) if(OCIO_BUILD_APPS) vcpkg_copy_tools( @@ -57,8 +67,5 @@ if(OCIO_BUILD_APPS) endif() vcpkg_fixup_pkgconfig() -if(NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ocio/setup_ocio.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../") -endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencolorio/vcpkg.json b/external_imported/vcpkg/ports/opencolorio/vcpkg.json index 751770137..b206a5688 100644 --- a/external_imported/vcpkg/ports/opencolorio/vcpkg.json +++ b/external_imported/vcpkg/ports/opencolorio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencolorio", - "version-semver": "2.1.1", - "port-version": 2, + "version-semver": "2.1.2", "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/openctm/CMakeLists.txt b/external_imported/vcpkg/ports/openctm/CMakeLists.txt new file mode 100644 index 000000000..2d1de6a45 --- /dev/null +++ b/external_imported/vcpkg/ports/openctm/CMakeLists.txt @@ -0,0 +1,60 @@ +cmake_minimum_required(VERSION 3.19...3.23) +project( + openctm + VERSION 1.0.3 + LANGUAGES C) + +set(PUBLIC_HEADERS lib/openctm.h lib/openctmpp.h) + +add_library( + openctm + lib/compressMG1.c + lib/compressMG2.c + lib/compressRAW.c + lib/openctm.c + lib/stream.c + lib/liblzma/Alloc.c + lib/liblzma/LzFind.c + lib/liblzma/LzmaDec.c + lib/liblzma/LzmaEnc.c + lib/liblzma/LzmaLib.c) + +target_include_directories( + openctm + PUBLIC $ + $ + $) +target_compile_definitions(openctm PRIVATE OPENCTM_BUILD LZMA_PREFIX_CTM) +if(NOT BUILD_SHARED_LIBS) + target_compile_definitions(openctm PUBLIC OPENCTM_STATIC) +endif() +target_compile_features(openctm PRIVATE c_std_99) +set_target_properties(openctm PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${PUBLIC_HEADERS}") + +include(GNUInstallDirs) +install( + TARGETS openctm + EXPORT unofficial-openctmConfig + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT dev) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openctmConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) +install(FILES "${VERSION_FILE_PATH}" DESTINATION share/unofficial-openctm) + +install(FILES ${PUBLIC_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT unofficial-openctmConfig + FILE unofficial-openctmConfig.cmake + NAMESPACE unofficial::openctm:: + DESTINATION share/unofficial-openctm) + +export(PACKAGE openctm) diff --git a/external_imported/vcpkg/ports/openctm/portfile.cmake b/external_imported/vcpkg/ports/openctm/portfile.cmake new file mode 100644 index 000000000..5be1b1d06 --- /dev/null +++ b/external_imported/vcpkg/ports/openctm/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO openctm + REF OpenCTM-1.0.3 + SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e + FILENAME "OpenCTM-1.0.3-src.tar.bz2" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openctm) + +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/external_imported/vcpkg/ports/openctm/vcpkg.json b/external_imported/vcpkg/ports/openctm/vcpkg.json new file mode 100644 index 000000000..fd0586f74 --- /dev/null +++ b/external_imported/vcpkg/ports/openctm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "openctm", + "version": "1.0.3", + "description": "OpenCTM — the Open Compressed Triangle Mesh file format — is a file format, a software library and a tool set for compression of 3D triangle meshes.", + "homepage": "http://openctm.sourceforge.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/opencv/portfile.cmake b/external_imported/vcpkg/ports/opencv/portfile.cmake index cc6e26fcb..8ff4daa37 100644 --- a/external_imported/vcpkg/ports/opencv/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv/portfile.cmake @@ -1 +1,9 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVConfig-version.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules-release.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if (NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_INSTALLED_DIR}/share/opencv4/OpenCVModules-debug.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() diff --git a/external_imported/vcpkg/ports/opencv/vcpkg.json b/external_imported/vcpkg/ports/opencv/vcpkg.json index 6732038cd..9c2fe4648 100644 --- a/external_imported/vcpkg/ports/opencv/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv/vcpkg.json @@ -1,8 +1,9 @@ { "name": "opencv", - "version": "4.5.5", + "version": "4.6.0", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "Apache-2.0", "dependencies": [ { "name": "opencv4", @@ -61,6 +62,18 @@ } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dc1394" + ] + } + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/external_imported/vcpkg/ports/opencv2/0002-install-options.patch b/external_imported/vcpkg/ports/opencv2/0001-install-options.patch similarity index 92% rename from external_imported/vcpkg/ports/opencv2/0002-install-options.patch rename to external_imported/vcpkg/ports/opencv2/0001-install-options.patch index 73d941a30..1fde6b446 100644 --- a/external_imported/vcpkg/ports/opencv2/0002-install-options.patch +++ b/external_imported/vcpkg/ports/opencv2/0001-install-options.patch @@ -90,22 +90,30 @@ + set(3P_LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}") + set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib") + set(OPENCV_3P_LIB_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}") -+ set(OPENCV_SAMPLES_SRC_INSTALL_PATH "share/opencv/samples") -+ set(OPENCV_INCLUDE_INSTALL_PATH "include") -+ set(OPENCV_CONFIG_INSTALL_PATH "share/opencv") ++ set(OPENCV_SAMPLES_SRC_INSTALL_PATH "share/opencv2/samples") ++ set(OPENCV_INCLUDE_INSTALL_PATH "include/opencv2.4") ++ set(OPENCV_CONFIG_INSTALL_PATH "share/opencv2") endif() set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") -@@ -356,7 +327,7 @@ endif() +@@ -354,15 +325,8 @@ if(INSTALL_TO_MANGLED_PATHS) + set(OPENCV_INCLUDE_INSTALL_PATH ${OPENCV_INCLUDE_INSTALL_PATH}/opencv-${OPENCV_VERSION}) + endif() - if(WIN32) - # Postfix of DLLs: +-if(WIN32) +- # Postfix of DLLs: - set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") -+ set(OPENCV_DLLVERSION "") ++ set(OPENCV_DLLVERSION 2) set(OPENCV_DEBUG_POSTFIX d) - else() - # Postfix of so's: -@@ -397,8 +368,6 @@ if(CMAKE_HOST_WIN32) +-else() +- # Postfix of so's: +- set(OPENCV_DLLVERSION "") +- set(OPENCV_DEBUG_POSTFIX "") +-endif() + + if(DEFINED CMAKE_DEBUG_POSTFIX) + set(OPENCV_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") +@@ -397,8 +361,6 @@ if(CMAKE_HOST_WIN32) endif() endif() @@ -114,7 +122,7 @@ if(GIT_EXECUTABLE) execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" -@@ -501,7 +470,9 @@ if(BUILD_DOCS) +@@ -501,7 +463,9 @@ if(BUILD_DOCS) endif(BUILD_DOCS) # --- Python Support --- @@ -125,7 +133,7 @@ # --- Java Support --- include(cmake/OpenCVDetectApacheAnt.cmake) -@@ -885,11 +853,7 @@ if(ANDROID) +@@ -885,11 +849,7 @@ if(ANDROID) endif() if(DEFINED WITH_FFMPEG OR HAVE_FFMPEG) @@ -137,8 +145,6 @@ status(" avcodec:" FFMPEG_libavcodec_FOUND THEN "YES (ver ${FFMPEG_libavcodec_VERSION})" ELSE NO) status(" avformat:" FFMPEG_libavformat_FOUND THEN "YES (ver ${FFMPEG_libavformat_VERSION})" ELSE NO) status(" avutil:" FFMPEG_libavutil_FOUND THEN "YES (ver ${FFMPEG_libavutil_VERSION})" ELSE NO) -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index e61059a..ec6f34f 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -269,7 +269,6 @@ if(MSVC) @@ -149,8 +155,6 @@ index e61059a..ec6f34f 100644 endif() if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:") -diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake -index 146043f..1202225 100644 --- a/cmake/OpenCVFindLibsVideo.cmake +++ b/cmake/OpenCVFindLibsVideo.cmake @@ -185,12 +185,8 @@ endif(WITH_XIMEA) @@ -197,6 +201,17 @@ index 146043f..1202225 100644 set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"") set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"") +--- a/cmake/OpenCVGenPkgconfig.cmake ++++ b/cmake/OpenCVGenPkgconfig.cmake +@@ -95,7 +95,7 @@ set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}") + if(INSTALL_TO_MANGLED_PATHS) + set(OPENCV_PC_FILE_NAME "opencv-${OPENCV_VERSION}.pc") + else() +- set(OPENCV_PC_FILE_NAME opencv.pc) ++ set(OPENCV_PC_FILE_NAME opencv2.pc) + endif() + configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv-XXX.pc.in" + "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}" --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -86,10 +86,10 @@ macro(ocv_add_dependencies full_modname) diff --git a/external_imported/vcpkg/ports/opencv2/fix-path-contains-++-error.patch b/external_imported/vcpkg/ports/opencv2/0002-fix-paths-containing-symbols.patch similarity index 94% rename from external_imported/vcpkg/ports/opencv2/fix-path-contains-++-error.patch rename to external_imported/vcpkg/ports/opencv2/0002-fix-paths-containing-symbols.patch index bb2a2a7fe..c24b5eba8 100644 --- a/external_imported/vcpkg/ports/opencv2/fix-path-contains-++-error.patch +++ b/external_imported/vcpkg/ports/opencv2/0002-fix-paths-containing-symbols.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake -index 72df4d4..7d45974 100644 --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake @@ -82,12 +82,42 @@ macro(ocv_check_environment_variables) diff --git a/external_imported/vcpkg/ports/opencv2/0003-force-package-requirements.patch b/external_imported/vcpkg/ports/opencv2/0003-force-package-requirements.patch index 8345cd7fb..335aed4a1 100644 --- a/external_imported/vcpkg/ports/opencv2/0003-force-package-requirements.patch +++ b/external_imported/vcpkg/ports/opencv2/0003-force-package-requirements.patch @@ -45,12 +45,3 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -151,7 +151,7 @@ if(WITH_OPENEXR) - if(BUILD_OPENEXR) - ocv_clear_vars(OPENEXR_FOUND) - else() -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(NOT OPENEXR_FOUND) diff --git a/external_imported/vcpkg/ports/opencv2/0006-fix-jasper.patch b/external_imported/vcpkg/ports/opencv2/0006-fix-jasper.patch new file mode 100644 index 000000000..403305fce --- /dev/null +++ b/external_imported/vcpkg/ports/opencv2/0006-fix-jasper.patch @@ -0,0 +1,20 @@ +--- a/modules/highgui/src/grfmt_jpeg2000.cpp ++++ b/modules/highgui/src/grfmt_jpeg2000.cpp +@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer, + + for( y = 0; y < yend - ystart; ) + { +- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); ++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); + uchar* dst = data + (y - yoffset) * step - xoffset; + + if( xstep == 1 ) +@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer, + + for( y = 0; y < yend - ystart; ) + { +- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); ++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); + ushort* dst = data + (y - yoffset) * step - xoffset; + + if( xstep == 1 ) diff --git a/external_imported/vcpkg/ports/opencv2/0007-fix-config.patch b/external_imported/vcpkg/ports/opencv2/0007-fix-config.patch new file mode 100644 index 000000000..e9449e56a --- /dev/null +++ b/external_imported/vcpkg/ports/opencv2/0007-fix-config.patch @@ -0,0 +1,18 @@ +--- a/cmake/templates/OpenCVConfig.cmake.in ++++ b/cmake/templates/OpenCVConfig.cmake.in +@@ -97,7 +97,6 @@ set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@) + # Extract the directory where *this* file has been installed (determined at cmake run-time) + get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE) + +-if(NOT WIN32 OR ANDROID) + if(ANDROID) + set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..") + else() +@@ -109,7 +108,6 @@ if(NOT WIN32 OR ANDROID) + else() + get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_INSTALL_PATH}" REALPATH) + endif() +-endif() + + # Presence of Android native camera wrappers + set(OpenCV_HAVE_ANDROID_CAMERA @HAVE_opencv_androidcamera@) diff --git a/external_imported/vcpkg/ports/opencv2/0019-fix-openexr.patch b/external_imported/vcpkg/ports/opencv2/0019-fix-openexr.patch new file mode 100644 index 000000000..5702bb547 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv2/0019-fix-openexr.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 9b43066..c1cc11f 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -151,7 +151,12 @@ if(WITH_OPENEXR) + if(BUILD_OPENEXR) + ocv_clear_vars(OPENEXR_FOUND) + else() +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") ++ find_package(Imath CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) ++ set(OPENEXR_LIBRARIES Imath::Imath OpenEXR::OpenEXR) ++ set(OPENEXR_INCLUDE_PATHS "") ++ set(OPENEXR_VERSION "${OpenEXR_VERSION}") ++ set(OPENEXR_FOUND 1) + endif() + + if(NOT OPENEXR_FOUND) +diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp +index 399e586..b8cd270 100644 +--- a/modules/highgui/src/grfmt_exr.cpp ++++ b/modules/highgui/src/grfmt_exr.cpp +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + #include "grfmt_exr.hpp" + diff --git a/external_imported/vcpkg/ports/opencv2/portfile.cmake b/external_imported/vcpkg/ports/opencv2/portfile.cmake index 9ef2ccc97..2c244a23c 100644 --- a/external_imported/vcpkg/ports/opencv2/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv2/portfile.cmake @@ -1,11 +1,3 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") - message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") -endif() - -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") - message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") -endif() - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) @@ -16,12 +8,17 @@ vcpkg_from_github( SHA512 de7d24ac7ed78ac14673011cbecc477cae688b74222a972e553c95a557b5cb8e5913f97db525421d6a72af30998ca300112fa0b285daed65f65832eb2cf7241a HEAD_REF master PATCHES - 0002-install-options.patch + 0001-install-options.patch + 0002-fix-paths-containing-symbols.patch 0003-force-package-requirements.patch 0004-add-ffmpeg-missing-defines.patch 0005-fix-cuda.patch - fix-path-contains-++-error.patch + 0006-fix-jasper.patch + 0007-fix-config.patch + 0019-fix-openexr.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA") @@ -39,10 +36,11 @@ FEATURES "qt" WITH_QT "tiff" WITH_TIFF "world" BUILD_opencv_world + "dc1394" WITH_1394 ) set(WITH_MSMF ON) -if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) set(WITH_MSMF OFF) endif() @@ -55,69 +53,32 @@ if("gtk" IN_LIST FEATURES) endif() endif() -if("ffmpeg" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_UWP) - set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") - set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") - endif() -endif() - set(WITH_PYTHON OFF) if("python" IN_LIST FEATURES) - set(WITH_PYTHON ON) - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) - vcpkg_add_to_path("${PYTHON2_DIR}") - vcpkg_add_to_path("${PYTHON2_DIR}/Scripts") + if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + message(STATUS "You need to manually ensure that python2 virtualenv module is installed") + message("This might require running") + message("wget https://bootstrap.pypa.io/pip/2.7/get-pip.py") + message("and then") + message("/usr/bin/python2 get-pip.py") + message("and finally") + message("pip install virtualenv") + message("On some system, these commands must be run as root, otherwise error about virtualenv module missing will persist!") + endif() + x_vcpkg_get_python_packages(PYTHON_VERSION "2" PACKAGES numpy OUT_PYTHON_VAR "PYTHON2") set(ENV{PYTHON} "${PYTHON2}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON2}" PACKAGES numpy) + set(WITH_PYTHON ON) endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT_LNK) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ###### ocv_options -DCMAKE_DEBUG_POSTFIX=d + -DBUILD_WITH_STATIC_CRT=${STATIC_CRT_LNK} + -DINSTALL_TO_MANGLED_PATHS=OFF # Do not build docs/examples -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF @@ -153,11 +114,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv2/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) find_dependency(Threads)") @@ -168,7 +129,7 @@ find_dependency(Threads)") string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") endif() if("openexr" IN_LIST FEATURES) - string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(Imath CONFIG)\nfind_dependency(OpenEXR CONFIG)") endif() if("png" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(PNG)") @@ -188,7 +149,7 @@ find_dependency(Qt5 COMPONENTS OpenGL)") string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" "set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv2/OpenCVModules.cmake" "${OPENCV_MODULES}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() @@ -200,4 +161,6 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") vcpkg_fixup_pkgconfig() +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv2/usage.in b/external_imported/vcpkg/ports/opencv2/usage.in new file mode 100644 index 000000000..1bec7f304 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv2/usage.in @@ -0,0 +1,4 @@ +The package ${PORT} is compatible with CMake if you set the OpenCV_DIR *before* the find_package call + + set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + find_package(OpenCV REQUIRED) diff --git a/external_imported/vcpkg/ports/opencv2/vcpkg.json b/external_imported/vcpkg/ports/opencv2/vcpkg.json index 77040ac4f..070c96f85 100644 --- a/external_imported/vcpkg/ports/opencv2/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv2/vcpkg.json @@ -1,11 +1,11 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 11, - "description": "computer vision library", + "port-version": 15, + "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", - "supports": "!uwp", + "supports": "!uwp & !(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,6 +15,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ @@ -27,6 +31,12 @@ "cuda" ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ @@ -92,6 +102,7 @@ "openexr": { "description": "OpenEXR support for opencv", "dependencies": [ + "imath", "openexr" ] }, diff --git a/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch b/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch index dd12caad5..d7990dfcf 100644 --- a/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch +++ b/external_imported/vcpkg/ports/opencv3/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() @@ -54,15 +54,6 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -229,7 +229,7 @@ if(WITH_OPENEXR) - ocv_clear_vars(HAVE_OPENEXR) - if(NOT BUILD_OPENEXR) - ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(OPENEXR_FOUND) @@ -247,7 +247,7 @@ endif() # --- GDAL (optional) --- diff --git a/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch b/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch index 7f01dabf3..b82b9b00e 100644 --- a/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch +++ b/external_imported/vcpkg/ports/opencv3/0012-fix-zlib.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 6dbeca9..08e2f4a 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -5,6 +5,9 @@ diff --git a/external_imported/vcpkg/ports/opencv3/0013-fix-ceres.patch b/external_imported/vcpkg/ports/opencv3/0013-fix-ceres.patch new file mode 100644 index 000000000..c8acb1610 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv3/0013-fix-ceres.patch @@ -0,0 +1,11 @@ +--- a/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc ++++ b/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc +@@ -549,7 +549,7 @@ void EuclideanBundleCommonIntrinsics( + + if (bundle_constraints & BUNDLE_NO_TRANSLATION) { + #if CERES_VERSION_MAJOR >= 3 || (CERES_VERSION_MAJOR >= 2 && CERES_VERSION_MINOR >= 1) +- problem.SetParameterization(current_camera_R_t, ++ problem.SetManifold(current_camera_R_t, + constant_translation_manifold); + #else + problem.SetParameterization(current_camera_R_t, diff --git a/external_imported/vcpkg/ports/opencv3/0016-fix-freetype-contrib.patch b/external_imported/vcpkg/ports/opencv3/0016-fix-freetype-contrib.patch new file mode 100644 index 000000000..930a1d65a --- /dev/null +++ b/external_imported/vcpkg/ports/opencv3/0016-fix-freetype-contrib.patch @@ -0,0 +1,15 @@ +--- a/modules/freetype/CMakeLists.txt ++++ b/modules/freetype/CMakeLists.txt +@@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++if(WITH_FREETYPE) ++find_package(freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) ++endif() + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/external_imported/vcpkg/ports/opencv3/0018-fix-depend-tesseract.patch b/external_imported/vcpkg/ports/opencv3/0018-fix-depend-tesseract.patch new file mode 100644 index 000000000..6a8bc7acd --- /dev/null +++ b/external_imported/vcpkg/ports/opencv3/0018-fix-depend-tesseract.patch @@ -0,0 +1,11 @@ +--- a/modules/text/cmake/init.cmake ++++ b/modules/text/cmake/init.cmake +@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO + if(NOT HAVE_TESSERACT + AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT) + ) ++ find_package(Tesseract CONFIG REQUIRED) ++ set(Tesseract_LIBRARIES Tesseract::libtesseract) + if(NOT Tesseract_FOUND) + find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR) + endif() diff --git a/external_imported/vcpkg/ports/opencv3/portfile.cmake b/external_imported/vcpkg/ports/opencv3/portfile.cmake index cae0675f6..d80e65b80 100644 --- a/external_imported/vcpkg/ports/opencv3/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv3/portfile.cmake @@ -1,11 +1,3 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") - message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") -endif() - -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") - message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") -endif() - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) @@ -15,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a + SHA512 96bbeb9525325f17ba635a0b75126aae0a7b0daef211af45057a97abd5d31a57fc50f0e889a6dab614df9b7621a145e06c0d240f0a218f33df1217d9a19c510d HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -30,6 +22,8 @@ vcpkg_from_github( 0011-remove-python2.patch 0012-fix-zlib.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(TARGET_IS_AARCH64 1) @@ -54,6 +48,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG "flann" BUILD_opencv_flann + "freetype" WITH_FREETYPE "gdcm" WITH_GDCM "gstreamer" WITH_GSTREAMER "halide" WITH_HALIDE @@ -70,9 +65,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world + "dc1394" WITH_1394 ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb" +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -101,6 +97,15 @@ if("ipp" IN_LIST FEATURES) set(WITH_IPP ON) endif() +set(WITH_OPENMP OFF) +if("openmp" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_OSX) + set(WITH_OPENMP ON) + else() + message(WARNING "The OpenMP feature is not supported on macOS") + endif() +endif() + set(BUILD_opencv_ovis OFF) if("ovis" IN_LIST FEATURES) set(BUILD_opencv_ovis ON) @@ -112,54 +117,16 @@ if("tbb" IN_LIST FEATURES) endif() set(WITH_PYTHON OFF) +set(BUILD_opencv_python3 OFF) if("python" IN_LIST FEATURES) - set(WITH_PYTHON ON) - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") - set(ENV{PYTHON} "${PYTHON3}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") + else() + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") + set(ENV{PYTHON} "${PYTHON3}") + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() endif() if("dnn" IN_LIST FEATURES) @@ -183,13 +150,16 @@ if("contrib" IN_LIST FEATURES) endif() vcpkg_from_github( - OUT_SOURCE_PATH CONTRIB_SOURCE_PATH - REPO opencv/opencv_contrib - REF ${OPENCV_VERSION} - SHA512 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35 - HEAD_REF master - PATCHES - 0007-fix-hdf5.patch + OUT_SOURCE_PATH CONTRIB_SOURCE_PATH + REPO opencv/opencv_contrib + REF ${OPENCV_VERSION} + SHA512 a051497e61ae55f86c224044487fc2247a3bba1aa27031c4997c981ddf8402edf82f1dd0d307f562c638bc021cfd8bd42a723973f00ab25131495f84d33c5383 + HEAD_REF master + PATCHES + 0007-fix-hdf5.patch + 0013-fix-ceres.patch + 0016-fix-freetype-contrib.patch + 0018-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -287,7 +257,7 @@ if(WITH_IPP) endif() set(WITH_MSMF ON) -if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MINGW) set(WITH_MSMF OFF) endif() @@ -310,6 +280,16 @@ if("ffmpeg" IN_LIST FEATURES) endif() endif() +if("halide" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS + # Halide 13 requires C++17 + "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_CXX_STANDARD_REQUIRED=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON" + "-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + ) +endif() + if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() @@ -333,19 +313,20 @@ vcpkg_cmake_configure( -DX86=${TARGET_IS_X86} -DARM=${TARGET_IS_ARM} ###### ocv_options + -DINSTALL_TO_MANGLED_PATHS=OFF -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin - -DOPENCV_INCLUDE_INSTALL_PATH=include + -DOPENCV_INCLUDE_INSTALL_PATH=include/opencv3 -DOPENCV_LIB_INSTALL_PATH=lib - -DOPENCV_3P_LIB_INSTALL_PATH=lib - -DOPENCV_CONFIG_INSTALL_PATH=share/opencv - -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_3P_LIB_INSTALL_PATH=lib/manual-link/opencv3_thirdparty + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv3 -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d - -DOPENCV_DLLVERSION= + -DOPENCV_DLLVERSION=3 -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF + -DOPENCV_GENERATE_PKGCONFIG=ON # Do not build docs/examples -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF @@ -364,6 +345,8 @@ vcpkg_cmake_configure( -DBUILD_PROTOBUF=OFF ###### OpenCV Build components -DBUILD_opencv_apps=OFF + -DBUILD_opencv_java=OFF + -DBUILD_opencv_js=OFF -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm} -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor} -DBUILD_opencv_saliency=${BUILD_opencv_saliency} @@ -394,14 +377,12 @@ vcpkg_cmake_configure( ###### customized properties ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON - -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_GTK=${WITH_GTK} -DWITH_QT=${WITH_QT} -DWITH_IPP=${WITH_IPP} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} - -DWITH_OPENMP=OFF + -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_flann} -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF @@ -411,6 +392,7 @@ vcpkg_cmake_configure( ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + -DBUILD_opencv_python3=${BUILD_opencv_python3} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} ###### Additional build flags @@ -418,11 +400,19 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() +if (NOT VCPKG_BUILD_TYPE) + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) if(${BUILD_opencv_flann}) find_dependency(Protobuf CONFIG REQUIRED) @@ -476,7 +466,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() if(BUILD_opencv_ovis) - string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") + string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(freetype)") endif() if("quirc" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(quirc)") @@ -514,7 +504,7 @@ find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" "${OPENCV_MODULES}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -524,6 +514,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv/licenses") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv") if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") @@ -532,4 +524,6 @@ endif() vcpkg_fixup_pkgconfig() +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv3/usage.in b/external_imported/vcpkg/ports/opencv3/usage.in new file mode 100644 index 000000000..1bec7f304 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv3/usage.in @@ -0,0 +1,4 @@ +The package ${PORT} is compatible with CMake if you set the OpenCV_DIR *before* the find_package call + + set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + find_package(OpenCV REQUIRED) diff --git a/external_imported/vcpkg/ports/opencv3/vcpkg.json b/external_imported/vcpkg/ports/opencv3/vcpkg.json index 06404f659..64c23afe8 100644 --- a/external_imported/vcpkg/ports/opencv3/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv3/vcpkg.json @@ -1,8 +1,8 @@ { "name": "opencv3", - "version": "3.4.16", - "port-version": 5, - "description": "computer vision library", + "version": "3.4.18", + "port-version": 2, + "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", "dependencies": [ @@ -14,6 +14,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ @@ -46,12 +50,19 @@ "cudnn", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ @@ -115,6 +126,13 @@ "protobuf" ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -186,12 +204,16 @@ "opengl" ] }, + "openmp": { + "description": "Enable openmp support for opencv" + }, "ovis": { "description": "opencv_ovis module", "dependencies": [ "ogre", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] @@ -205,7 +227,10 @@ ] }, "python": { - "description": "Python wrapper support for opencv" + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] }, "qt": { "description": "Qt GUI support for opencv", @@ -226,14 +251,21 @@ "description": "opencv_sfm module", "dependencies": [ "ceres", - "eigen3", "gflags", "glog", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] + }, + { + "name": "opencv3", + "default-features": false, + "features": [ + "eigen" + ] } ] }, @@ -252,6 +284,12 @@ "vtk": { "description": "vtk support for opencv", "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib" + ] + }, "vtk" ] }, diff --git a/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch b/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch index 15ce3756b..64bba8462 100644 --- a/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch +++ b/external_imported/vcpkg/ports/opencv4/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() @@ -63,15 +63,6 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -257,7 +257,7 @@ if(WITH_OPENEXR) - ocv_clear_vars(HAVE_OPENEXR) - if(NOT BUILD_OPENEXR) - ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(OPENEXR_FOUND) @@ -275,7 +275,7 @@ endif() # --- GDAL (optional) --- diff --git a/external_imported/vcpkg/ports/opencv4/0005-fix-eigen.patch b/external_imported/vcpkg/ports/opencv4/0004-fix-eigen.patch similarity index 100% rename from external_imported/vcpkg/ports/opencv4/0005-fix-eigen.patch rename to external_imported/vcpkg/ports/opencv4/0004-fix-eigen.patch diff --git a/external_imported/vcpkg/ports/opencv4/0004-fix-policy-CMP0057.patch b/external_imported/vcpkg/ports/opencv4/0005-fix-policy-CMP0057.patch similarity index 100% rename from external_imported/vcpkg/ports/opencv4/0004-fix-policy-CMP0057.patch rename to external_imported/vcpkg/ports/opencv4/0005-fix-policy-CMP0057.patch diff --git a/external_imported/vcpkg/ports/opencv4/0008-devendor-quirc.patch b/external_imported/vcpkg/ports/opencv4/0008-devendor-quirc.patch index 504e42bc5..4333eb0f6 100644 --- a/external_imported/vcpkg/ports/opencv4/0008-devendor-quirc.patch +++ b/external_imported/vcpkg/ports/opencv4/0008-devendor-quirc.patch @@ -11,8 +11,8 @@ --- a/modules/objdetect/CMakeLists.txt +++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js) +@@ -2,7 +2,5 @@ js + ) if(HAVE_QUIRC) - get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) diff --git a/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch b/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch index 9c38fd892..b82b9b00e 100644 --- a/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch +++ b/external_imported/vcpkg/ports/opencv4/0012-fix-zlib.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 8ea5497..7ed3f6b 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -5,6 +5,9 @@ diff --git a/external_imported/vcpkg/ports/opencv4/0013-fix-ceres.patch b/external_imported/vcpkg/ports/opencv4/0013-fix-ceres.patch new file mode 100644 index 000000000..c8acb1610 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0013-fix-ceres.patch @@ -0,0 +1,11 @@ +--- a/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc ++++ b/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc +@@ -549,7 +549,7 @@ void EuclideanBundleCommonIntrinsics( + + if (bundle_constraints & BUNDLE_NO_TRANSLATION) { + #if CERES_VERSION_MAJOR >= 3 || (CERES_VERSION_MAJOR >= 2 && CERES_VERSION_MINOR >= 1) +- problem.SetParameterization(current_camera_R_t, ++ problem.SetManifold(current_camera_R_t, + constant_translation_manifold); + #else + problem.SetParameterization(current_camera_R_t, diff --git a/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch b/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch deleted file mode 100644 index 8cd38c9bb..000000000 --- a/external_imported/vcpkg/ports/opencv4/0013-fix-opengl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/highgui/CMakeLists.txt -+++ b/modules/highgui/CMakeLists.txt -@@ -271,7 +271,7 @@ if(APPLE) - add_apple_compiler_options(${the_module}) - endif() - --if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES) -+if(HAVE_OPENGL AND OPENGL_LIBRARIES) - ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}") - endif() - diff --git a/external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch b/external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch deleted file mode 100644 index d75c5ec2e..000000000 --- a/external_imported/vcpkg/ports/opencv4/0014-fix-gstreamer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/modules/videoio/cmake/detect_gstreamer.cmake -+++ b/modules/videoio/cmake/detect_gstreamer.cmake -@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) - NAMES gstvideo gstvideo-1.0 - PATHS ${env_paths} - PATH_SUFFIXES "lib") -+ find_library(GSTREAMER_audio_LIBRARY -+ NAMES gstvideo gstaudio-1.0 -+ PATHS ${env_paths} -+ PATH_SUFFIXES "lib") - - find_library(GSTREAMER_glib_LIBRARY - NAMES glib-2.0 -@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) - AND GSTREAMER_pbutils_LIBRARY - AND GSTREAMER_riff_LIBRARY - AND GSTREAMER_video_LIBRARY -+ AND GSTREAMER_audio_LIBRARY - AND GSTREAMER_glib_LIBRARY - AND GSTREAMER_gobject_LIBRARY) - file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") -@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) - ${GSTREAMER_app_LIBRARY} - ${GSTREAMER_riff_LIBRARY} - ${GSTREAMER_video_LIBRARY} -+ ${GSTREAMER_audio_LIBRARY} - ${GSTREAMER_pbutils_LIBRARY} - ${GSTREAMER_glib_LIBRARY} - ${GSTREAMER_gobject_LIBRARY}) diff --git a/external_imported/vcpkg/ports/opencv4/0014-fix-ogre.patch b/external_imported/vcpkg/ports/opencv4/0014-fix-ogre.patch new file mode 100644 index 000000000..8f2da1508 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0014-fix-ogre.patch @@ -0,0 +1,12 @@ +--- a/modules/ovis/src/ovis.cpp ++++ b/modules/ovis/src/ovis.cpp +@@ -453,7 +453,8 @@ class WindowSceneImpl : public WindowScene + if(tus->getTextureName() != name) + { + RTShader::ShaderGenerator::getSingleton().invalidateMaterial( +- RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, *bgplane->getMaterial()); ++ RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, bgplane->getMaterial()->getName(), ++ RESOURCEGROUP_NAME); + + tus->setTextureName(name); + tus->setTextureAddressingMode(TAM_CLAMP); diff --git a/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch b/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch index 62c41f2f4..93bcfafcf 100644 --- a/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch +++ b/external_imported/vcpkg/ports/opencv4/0015-fix-freetype.patch @@ -1,5 +1,3 @@ -diff --git a/modules/gapi/cmake/init.cmake b/modules/gapi/cmake/init.cmake -index 1c46432..43fb8ad 100644 --- a/modules/gapi/cmake/init.cmake +++ b/modules/gapi/cmake/init.cmake @@ -20,10 +20,8 @@ if(NOT TARGET ade) diff --git a/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch b/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch index 4d0637fd1..930a1d65a 100644 --- a/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch +++ b/external_imported/vcpkg/ports/opencv4/0016-fix-freetype-contrib.patch @@ -1,5 +1,3 @@ -diff --git a/modules/freetype/CMakeLists.txt b/modules/freetype/CMakeLists.txt -index 6dd4aaf..e734e97 100644 --- a/modules/freetype/CMakeLists.txt +++ b/modules/freetype/CMakeLists.txt @@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) diff --git a/external_imported/vcpkg/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch b/external_imported/vcpkg/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch new file mode 100644 index 000000000..6e56fee24 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch @@ -0,0 +1,15 @@ +--- a/modules/videoio/src/cap_dshow.cpp ++++ b/modules/videoio/src/cap_dshow.cpp +@@ -90,8 +90,11 @@ Thanks to: + + #if defined(__clang__) // clang or MSVC clang + #pragma clang diagnostic ignored "-Wnon-virtual-dtor" +-#elif defined(__GNUC__) // MinGW ++#elif defined(__GNUC__) // gcc + #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" ++#endif ++ ++#ifdef __MINGW32__ + #define STRSAFE_NO_DEPRECATE + #endif + diff --git a/external_imported/vcpkg/ports/opencv4/0018-fix-depend-tesseract.patch b/external_imported/vcpkg/ports/opencv4/0018-fix-depend-tesseract.patch new file mode 100644 index 000000000..6a8bc7acd --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/0018-fix-depend-tesseract.patch @@ -0,0 +1,11 @@ +--- a/modules/text/cmake/init.cmake ++++ b/modules/text/cmake/init.cmake +@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO + if(NOT HAVE_TESSERACT + AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT) + ) ++ find_package(Tesseract CONFIG REQUIRED) ++ set(Tesseract_LIBRARIES Tesseract::libtesseract) + if(NOT Tesseract_FOUND) + find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR) + endif() diff --git a/external_imported/vcpkg/ports/opencv4/portfile.cmake b/external_imported/vcpkg/ports/opencv4/portfile.cmake index 6681d6676..10df28005 100644 --- a/external_imported/vcpkg/ports/opencv4/portfile.cmake +++ b/external_imported/vcpkg/ports/opencv4/portfile.cmake @@ -1,11 +1,3 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") - message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") -endif() - -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") - message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") -endif() - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) @@ -15,24 +7,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 + SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 + FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch - 0004-fix-policy-CMP0057.patch - 0005-fix-eigen.patch + 0004-fix-eigen.patch + 0005-fix-policy-CMP0057.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch 0012-fix-zlib.patch - 0013-fix-opengl.patch - 0014-fix-gstreamer.patch 0015-fix-freetype.patch + 0017-mingw-strsafe-no-deprecate.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(TARGET_IS_AARCH64 1) @@ -76,9 +70,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "vtk" WITH_VTK "webp" WITH_WEBP "world" BUILD_opencv_world + "dc1394" WITH_1394 ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt, "tbb" +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -138,52 +133,8 @@ if("python" IN_LIST FEATURES) if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") else() - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") set(ENV{PYTHON} "${PYTHON3}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) set(BUILD_opencv_python3 ON) set(WITH_PYTHON ON) endif() @@ -221,11 +172,14 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 + SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0013-fix-ceres.patch + 0014-fix-ogre.patch 0016-fix-freetype-contrib.patch + 0018-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -364,7 +318,7 @@ if(WITH_IPP) endif() set(WITH_MSMF ON) -if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MINGW) set(WITH_MSMF OFF) endif() @@ -401,6 +355,12 @@ if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() +if("contrib" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + list(APPEND ADDITIONAL_BUILD_FLAGS "-DWITH_TESSERACT=OFF") + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -411,17 +371,17 @@ vcpkg_cmake_configure( -DX86=${TARGET_IS_X86} -DARM=${TARGET_IS_ARM} ###### ocv_options + -DINSTALL_TO_MANGLED_PATHS=OFF -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin -DOPENCV_INCLUDE_INSTALL_PATH=include -DOPENCV_LIB_INSTALL_PATH=lib - -DOPENCV_3P_LIB_INSTALL_PATH=lib - -DOPENCV_CONFIG_INSTALL_PATH=share/opencv - -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_3P_LIB_INSTALL_PATH=lib/manual-link/opencv4_thirdparty + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv4 -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d - -DOPENCV_DLLVERSION= + -DOPENCV_DLLVERSION=4 -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF # Do not build docs/examples @@ -477,9 +437,9 @@ vcpkg_cmake_configure( -DWITH_IPP=${WITH_IPP} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} - -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_dnn} + -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF @@ -498,11 +458,19 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() +if (NOT VCPKG_BUILD_TYPE) + # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules-debug.cmake" + "\${_IMPORT_PREFIX}/sdk" + "\${_IMPORT_PREFIX}/debug/sdk" + ) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) if(${BUILD_opencv_dnn}) find_dependency(Protobuf CONFIG REQUIRED) @@ -594,7 +562,7 @@ find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" "${OPENCV_MODULES}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -604,6 +572,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv4/licenses") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv") if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") @@ -612,4 +582,6 @@ endif() vcpkg_fixup_pkgconfig() +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opencv4/usage.in b/external_imported/vcpkg/ports/opencv4/usage.in new file mode 100644 index 000000000..cb9c47dc7 --- /dev/null +++ b/external_imported/vcpkg/ports/opencv4/usage.in @@ -0,0 +1,5 @@ +If you do not install the meta-port *opencv*, the package ${PORT} is compatible with CMake +if you set the OpenCV_DIR *before* the find_package call + + set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + find_package(OpenCV REQUIRED) diff --git a/external_imported/vcpkg/ports/opencv4/vcpkg.json b/external_imported/vcpkg/ports/opencv4/vcpkg.json index bf3293b27..2ad60dcac 100644 --- a/external_imported/vcpkg/ports/opencv4/vcpkg.json +++ b/external_imported/vcpkg/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", - "version": "4.5.5", - "port-version": 1, + "version": "4.6.0", + "port-version": 5, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -14,6 +14,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ @@ -31,7 +35,7 @@ "dependencies": [ { "name": "hdf5", - "platform": "!uwp & !(windows & (arm | arm64))" + "platform": "!uwp & !(windows & (arm | arm64)) & !ios" }, { "name": "tesseract", @@ -65,6 +69,12 @@ } ] }, + "dc1394": { + "description": "Dc1394 support for opencv", + "dependencies": [ + "libdc1394" + ] + }, "default-features": { "description": "Platform-dependent default features", "dependencies": [ diff --git a/external_imported/vcpkg/ports/openexr/0001-remove_find_package_macro.patch b/external_imported/vcpkg/ports/openexr/0001-remove_find_package_macro.patch deleted file mode 100644 index 967e89a83..000000000 --- a/external_imported/vcpkg/ports/openexr/0001-remove_find_package_macro.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 111a603..109394f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,22 +25,12 @@ endif() - project(OpenEXRMetaProject) - - --# An "official" way to make this a super-project --# basically overrides the find_package to not find anything --# for stuff we're including locally --set(as_subproject IlmBase OpenEXR) --macro(find_package) -- if(NOT "${ARGV0}" IN_LIST as_subproject) -- _find_package(${ARGV}) -- endif() --endmacro() -- - - # If you want to use ctest to configure, build and - # upload the results, cmake has builtin support for - # submitting to CDash, or any server who speaks the - # same protocol --# -+# - # These settings will need to be set for your environment, - # and then a script such as the example in - # -@@ -51,7 +41,7 @@ endmacro() - # cmake -S cmake/SampleCTestScript.cmake - # - # [or whatever you name the file you edit] --# -+# - #set(CTEST_PROJECT_NAME "OpenEXR") - #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC") - #set(CTEST_DROP_METHOD "http") # there are others... -diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt -index 390b27f..87b2d01 100644 ---- a/OpenEXR/CMakeLists.txt -+++ b/OpenEXR/CMakeLists.txt -@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake) - - # Everyone depends on IlmBase, and we currently rely on - # the version matched with our release --find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG) - - # generates config headers, package config files - add_subdirectory(config) -diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake -index 5116726..34c7c87 100644 ---- a/OpenEXR/config/OpenEXRSetup.cmake -+++ b/OpenEXR/config/OpenEXRSetup.cmake -@@ -33,7 +33,7 @@ endif() - # Whether to build & install the various command line utility programs - option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON) - --# This is a variable here for use in controlling where include files are -+# This is a variable here for use in controlling where include files are - # installed. Care must be taken when changing this, as many things - # probably assume this is OpenEXR - set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install") -diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt -index 5efa353..5246fa7 100644 ---- a/OpenEXR_Viewers/CMakeLists.txt -+++ b/OpenEXR_Viewers/CMakeLists.txt -@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION}) - ####################################### - include(config/OpenEXRViewersSetup.cmake) - --find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) --find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) - - # This is for newer cmake versions who know about vendor versions - set(OpenGL_GL_PREFERENCE GLVND) -diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt -index 291b96e..7d5074f 100644 ---- a/PyIlmBase/CMakeLists.txt -+++ b/PyIlmBase/CMakeLists.txt -@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX) - include(config/PyIlmBaseSetup.cmake) - - # we have a strong dependence on IlmBase being an exact match --find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG) - - # we are building a python extension, so of course we depend on - # python as well. Except we don't know which version... diff --git a/external_imported/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch b/external_imported/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch deleted file mode 100644 index e39bd3792..000000000 --- a/external_imported/vcpkg/ports/openexr/0002-fixup_cmake_exports_path.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index d9c5ae4..45ee6cc 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -105,7 +105,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(IlmBaseConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/ilmbase - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${ILMBASE_VERSION} -@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index b52ad0d..3dc6d22 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -19,7 +19,7 @@ int main() - sysconf(_SC_NPROCESSORS_ONLN); - } - " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN --) -+) - - check_cxx_source_compiles( - " -@@ -100,7 +100,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(OpenEXRConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/openexr - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${OPENEXR_VERSION} -@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt -index 1872c89..bc61f43 100644 ---- a/PyIlmBase/config/CMakeLists.txt -+++ b/PyIlmBase/config/CMakeLists.txt -@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - COMPATIBILITY SameMajorVersion - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - FILE ${PROJECT_NAME}Config.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES diff --git a/external_imported/vcpkg/ports/openexr/0003-remove_symlinks.patch b/external_imported/vcpkg/ports/openexr/0003-remove_symlinks.patch deleted file mode 100644 index 89b9c53f3..000000000 --- a/external_imported/vcpkg/ports/openexr/0003-remove_symlinks.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake -index 44254a7..1f5d2a6 100644 ---- a/IlmBase/config/LibraryDefine.cmake -+++ b/IlmBase/config/LibraryDefine.cmake -@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(ILMBASE_BUILD_BOTH_STATIC_SHARED) -diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake -index a9561dc..42853af 100644 ---- a/OpenEXR/config/LibraryDefine.cmake -+++ b/OpenEXR/config/LibraryDefine.cmake -@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(OPENEXR_BUILD_BOTH_STATIC_SHARED) diff --git a/external_imported/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch b/external_imported/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch deleted file mode 100644 index 83ab73a21..000000000 --- a/external_imported/vcpkg/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001 -From: "Matthias C. M. Troffaes" -Date: Tue, 1 Jun 2021 08:06:45 +0100 -Subject: [PATCH] Use CMAKE__POSTFIX for .pc file lib suffix. - -Signed-off-by: Matthias C. M. Troffaes ---- - IlmBase/config/CMakeLists.txt | 3 ++- - OpenEXR/config/CMakeLists.txt | 3 ++- - PyIlmBase/config/CMakeLists.txt | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index d9c5ae449..dfebb43bd 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -- set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions - # which don't seem to evaluate -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index 8386e3a0e..039190cd9 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions - # which don't seem to evaluate -diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt -index 1872c89e7..a4139bcfd 100644 ---- a/PyIlmBase/config/CMakeLists.txt -+++ b/PyIlmBase/config/CMakeLists.txt -@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) - set(libdir ${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - string(REPLACE ".in" "" pcout ${pcinfile}) - configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY) - install( diff --git a/external_imported/vcpkg/ports/openexr/portfile.cmake b/external_imported/vcpkg/ports/openexr/portfile.cmake index aac8fea55..d9c5585d3 100644 --- a/external_imported/vcpkg/ports/openexr/portfile.cmake +++ b/external_imported/vcpkg/ports/openexr/portfile.cmake @@ -1,61 +1,44 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP build not supported") -endif() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO openexr/openexr - REF ed64d5467dee9763f28baf300f7699e6288b9f5f - SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2 - HEAD_REF master - PATCHES - 0001-remove_find_package_macro.patch - 0002-fixup_cmake_exports_path.patch - 0003-remove_symlinks.patch - 0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1032 + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/openexr + REF v3.1.5 + SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c + HEAD_REF master ) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_DEBUG_POSTFIX=_d - -DPYILMBASE_ENABLE=FALSE +vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS + FEATURES + tools OPENEXR_BUILD_TOOLS + tools OPENEXR_INSTALL_TOOLS ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DBUILD_TESTING=OFF + -DOPENEXR_INSTALL_EXAMPLES=OFF + -DDOCS=OFF + OPTIONS_DEBUG + -DOPENEXR_BUILD_TOOLS=OFF + -DOPENEXR_INSTALL_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenEXR) vcpkg_fixup_pkgconfig() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) - -vcpkg_copy_pdbs() - -if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if(OPENEXR_INSTALL_TOOLS) + vcpkg_copy_tools( + TOOL_NAMES exrenvmap exrheader exrinfo exrmakepreview exrmaketiled exrmultipart exrmultiview exrstdattr exr2aces + 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}/debug/include" + "${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.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/openexr/usage b/external_imported/vcpkg/ports/openexr/usage new file mode 100644 index 000000000..6b09d9db5 --- /dev/null +++ b/external_imported/vcpkg/ports/openexr/usage @@ -0,0 +1,4 @@ +openexr provides CMake targets: + + find_package(OpenEXR CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenEXR::OpenEXR) diff --git a/external_imported/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 479cd3027..000000000 --- a/external_imported/vcpkg/ports/openexr/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,38 +0,0 @@ -_find_package(${ARGS}) - -if(TARGET OpenEXR::IlmImf AND NOT OPENEXR_LIBRARIES AND NOT OPENEXR_FOUND) - set(OPENEXR_FOUND TRUE CACHE BOOL "") - set(OpenEXR_FOUND TRUE CACHE BOOL "") - set(OPENEXR_VERSION "2.5.0" CACHE STRING "") - set(OpenEXR_VERSION "2.5.0" CACHE STRING "") - get_target_property(OpenEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_PATHS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS} CACHE STRING "") - set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} CACHE STRING "") - set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} CACHE STRING "") - set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} CACHE STRING "") - set(OPENEXR_ILMIMF_LIBRARY "OpenEXR::IlmImf" CACHE STRING "") - set(OPENEXR_ILMIMFUTIL_LIBRARY "OpenEXR::IlmImfUtil" CACHE STRING "") - set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMFUTIL_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "") -endif() - -if(TARGET IlmBase::Half AND NOT ILMBASE_LIBRARIES AND NOT ILMBASE_FOUND) - set(ILMBASE_FOUND TRUE CACHE BOOL "") - set(IlmBASE_FOUND TRUE CACHE BOOL "") - set(ILMBASE_VERSION "2.5.0" CACHE STRING "") - set(IlmBASE_VERSION "2.5.0" CACHE STRING "") - get_target_property(ILMBASE_INCLUDE_DIR IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_INCLUDE_DIRS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_INCLUDE_PATHS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIR} CACHE STRING "") - set(ILMBASE_INCLUDE_DIRS ${ILMBASE_INCLUDE_DIRS} CACHE STRING "") - set(ILMBASE_INCLUDE_PATHS ${ILMBASE_INCLUDE_PATHS} CACHE STRING "") - set(OPENEXR_HALF_LIBRARY "IlmBase::Half" CACHE STRING "") - set(OPENEXR_IEX_LIBRARY "IlmBase::Iex" CACHE STRING "") - set(OPENEXR_IEXMATH_LIBRARY "IlmBase::IexMath" CACHE STRING "") - set(OPENEXR_ILMTHREAD_LIBRARY "IlmBase::IlmThread" CACHE STRING "") - set(OPENEXR_IMATH_LIBRARY "IlmBase::Imath" CACHE STRING "") - set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "") -endif() diff --git a/external_imported/vcpkg/ports/openexr/vcpkg.json b/external_imported/vcpkg/ports/openexr/vcpkg.json index b293e7047..a34d07342 100644 --- a/external_imported/vcpkg/ports/openexr/vcpkg.json +++ b/external_imported/vcpkg/ports/openexr/vcpkg.json @@ -1,11 +1,25 @@ { "name": "openexr", - "version-string": "2.5.0", - "port-version": 3, + "version": "3.1.5", "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", "supports": "!uwp", "dependencies": [ + "imath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" - ] + ], + "features": { + "tools": { + "description": "Build tools" + } + } } diff --git a/external_imported/vcpkg/ports/openfbx/CMakeLists.txt b/external_imported/vcpkg/ports/openfbx/CMakeLists.txt new file mode 100644 index 000000000..820b4442c --- /dev/null +++ b/external_imported/vcpkg/ports/openfbx/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.11) + +project(OpenFBX LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 11) + +include(GNUInstallDirs) + +find_package(miniz REQUIRED) + +add_library(openfbx src/ofbx.cpp) +target_link_libraries(openfbx PRIVATE miniz::miniz) + +target_include_directories(openfbx + PUBLIC + $ + $) + +target_compile_definitions(openfbx PRIVATE _LARGEFILE64_SOURCE) + +install(TARGETS openfbx EXPORT unofficial-openfbxTargets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include + INCLUDES DESTINATION include) + +include(CMakePackageConfigHelpers) +configure_package_config_file( + unofficial-openfbxConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openfbxConfig.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-openfbx" +) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openfbxConfig.cmake" + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-openfbx" +) + +install(FILES ${CMAKE_SOURCE_DIR}/src/ofbx.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +install( + EXPORT unofficial-openfbxTargets + NAMESPACE unoffical::openfbx:: + DESTINATION ${CMAKE_INSTALL_DATADIR}/unofficial-openfbx +) diff --git a/external_imported/vcpkg/ports/openfbx/portfile.cmake b/external_imported/vcpkg/ports/openfbx/portfile.cmake new file mode 100644 index 000000000..4e1e77b30 --- /dev/null +++ b/external_imported/vcpkg/ports/openfbx/portfile.cmake @@ -0,0 +1,25 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nem0/OpenFBX + REF 6a788af3b19dd6921a64eb7e133a3fa131dfbbd5 + SHA512 c441e15ef0916e412af464c9f318a471cdbdc55225fe4282ff640243cd11dfcac6ff233ae8e60db63d1eaed1511d33ffa8d7ed37743c4580f8bde0724d7b6c47 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxConfig.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openfbx) + +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) diff --git a/external_imported/vcpkg/ports/openfbx/unofficial-openfbxConfig.cmake.in b/external_imported/vcpkg/ports/openfbx/unofficial-openfbxConfig.cmake.in new file mode 100644 index 000000000..421787837 --- /dev/null +++ b/external_imported/vcpkg/ports/openfbx/unofficial-openfbxConfig.cmake.in @@ -0,0 +1,8 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(miniz) + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxTargets.cmake") + +check_required_components(miniz) diff --git a/external_imported/vcpkg/ports/openfbx/vcpkg.json b/external_imported/vcpkg/ports/openfbx/vcpkg.json new file mode 100644 index 000000000..6c59df518 --- /dev/null +++ b/external_imported/vcpkg/ports/openfbx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "openfbx", + "version-date": "2022-07-18", + "description": "Lightweight open source FBX importer", + "homepage": "https://github.com/nem0/OpenFBX", + "license": "MIT", + "dependencies": [ + "miniz", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/opengl/portfile.cmake b/external_imported/vcpkg/ports/opengl/portfile.cmake index 5a20f8ea0..cd209dbb2 100644 --- a/external_imported/vcpkg/ports/opengl/portfile.cmake +++ b/external_imported/vcpkg/ports/opengl/portfile.cmake @@ -2,78 +2,63 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH) + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um") elseif(WINDOWS_SDK MATCHES "8.") - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH) + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include/um") else() message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") endif() if (NOT EXISTS "${LIBGLFILEPATH}") - message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLFILEPATH}") + file(TO_NATIVE_PATH "${LIBGLFILEPATH}" DISPLAY) + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}") endif() if (NOT EXISTS "${LIBGLUFILEPATH}") - message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}") + file(TO_NATIVE_PATH "${LIBGLUFILEPATH}" DISPLAY) + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}") endif() - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl" INCLUDEGLPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib" RELEASELIBPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib" DEBUGLIBPATH) - file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h" GLGLHPATH) - file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h" GLGLUHPATH) + set(INCLUDEGLPATH "${CURRENT_PACKAGES_DIR}/include/gl") + set(SHAREOPENGLPATH "${CURRENT_PACKAGES_DIR}/share/opengl") + set(RELEASELIBPATH "${CURRENT_PACKAGES_DIR}/lib") + set(DEBUGLIBPATH "${CURRENT_PACKAGES_DIR}/debug/lib") + set(GLGLHPATH "${HEADERSPATH}/gl/GL.h") + set(GLGLUHPATH "${HEADERSPATH}/gl/GLU.h") - file(MAKE_DIRECTORY - "${INCLUDEGLPATH}" - "${SHAREOPENGLPATH}" - ) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY - "${RELEASELIBPATH}" - ) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY - "${DEBUGLIBPATH}" - ) + file(MAKE_DIRECTORY "${INCLUDEGLPATH}" "${SHAREOPENGLPATH}" "${RELEASELIBPATH}") + if (NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${DEBUGLIBPATH}") endif() - file(COPY - "${GLGLHPATH}" - "${GLGLUHPATH}" - DESTINATION "${INCLUDEGLPATH}" - ) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${LIBGLFILEPATH} DESTINATION "${RELEASELIBPATH}") - file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${LIBGLFILEPATH} DESTINATION "${DEBUGLIBPATH}") - file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}") + file(COPY "${GLGLHPATH}" "${GLGLUHPATH}" DESTINATION "${INCLUDEGLPATH}") + + if (NOT VCPKG_BUILD_TYPE) + file(COPY "${LIBGLFILEPATH}" DESTINATION "${DEBUGLIBPATH}") + file(COPY "${LIBGLUFILEPATH}" DESTINATION "${DEBUGLIBPATH}") endif() + file(COPY "${LIBGLFILEPATH}" DESTINATION "${RELEASELIBPATH}") + file(COPY "${LIBGLUFILEPATH}" DESTINATION "${RELEASELIBPATH}") if (WINDOWS_SDK MATCHES "10.") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") elseif(WINDOWS_SDK MATCHES "8.") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") endif() - + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) - configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) + if (NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY) configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY) endif() - vcpkg_fixup_pkgconfig() + vcpkg_fixup_pkgconfig() else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) endif() diff --git a/external_imported/vcpkg/ports/opengl/vcpkg.json b/external_imported/vcpkg/ports/opengl/vcpkg.json index e921d648f..ea5e3d1c8 100644 --- a/external_imported/vcpkg/ports/opengl/vcpkg.json +++ b/external_imported/vcpkg/ports/opengl/vcpkg.json @@ -1,5 +1,7 @@ { "name": "opengl", "version-date": "2022-03-14", - "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." + "port-version": 1, + "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", + "license": null } diff --git a/external_imported/vcpkg/ports/openimageio/fix-config-cmake.patch b/external_imported/vcpkg/ports/openimageio/fix-config-cmake.patch deleted file mode 100644 index b1ad70650..000000000 --- a/external_imported/vcpkg/ports/openimageio/fix-config-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index b498ece..fb45388 100644 ---- a/src/cmake/Config.cmake.in -+++ b/src/cmake/Config.cmake.in -@@ -30,7 +30,7 @@ endif () - #...logic to determine installedPrefix from the own location... - #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") - --include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") - - check_required_components ("@PROJECT_NAME@") - diff --git a/external_imported/vcpkg/ports/openimageio/fix-dependencies.patch b/external_imported/vcpkg/ports/openimageio/fix-dependencies.patch index fb630ad9a..d72b4c60e 100644 --- a/external_imported/vcpkg/ports/openimageio/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/openimageio/fix-dependencies.patch @@ -2,68 +2,105 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in index b690864..fb45388 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF - HINTS @IlmBase_DIR@ @OpenEXR_DIR@) - find_dependency(OpenEXR @OpenEXR_VERSION@ - HINTS @OpenEXR_DIR@) -+ find_dependency(libpng CONFIG REQUIRED) -+ find_dependency(libheif CONFIG REQUIRED) -+ find_dependency(unofficial-libsquish CONFIG REQUIRED) - find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it - find_dependency(Threads) # Because OpenEXR doesn't do it - endif () +@@ -1,6 +1,21 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) ++find_dependency(libheif CONFIG) ++find_dependency(PNG) ++find_dependency(unofficial-libsquish CONFIG) ++if(@USE_OPENCV@) ++ find_dependency(OpenCV CONFIG) ++endif() ++if(@USE_OPENCOLORIO@) ++ find_dependency(OpenColorIO CONFIG) ++endif() ++if(@USE_OPENJPEG@) ++ find_dependency(OpenJPEG CONFIG) ++endif() ++if(@USE_WEBP@) ++ find_dependency(WebP CONFIG) ++endif() + + # add here all the find_dependency() whenever switching to config based dependencies + if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0) diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 631035a..9f4d096 100644 +index 631035a..d416d78 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake -@@ -148,7 +148,7 @@ find_python() - # Dependencies for optional formats and features. If these are not found, - # we will continue building, but the related functionality will be disabled. +@@ -158,14 +158,19 @@ endif () + checked_find_package (Freetype + DEFINITIONS -DUSE_FREETYPE=1 ) --checked_find_package (PNG) -+checked_find_package (png PREFER_CONFIG) +-checked_find_package (OpenColorIO ++set(OPENCOLORIO_INCLUDES "") ++set(OPENCOLORIO_LIBRARIES OpenColorIO::OpenColorIO) ++checked_find_package (OpenColorIO CONFIG + DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1 + # PREFER_CONFIG + ) ++set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}") + if (NOT OPENCOLORIO_FOUND) + set (OPENCOLORIO_FOUND 0) + endif () +-checked_find_package (OpenCV 3.0 ++set(OPENCV_INCLUDES "") ++set(OPENCV_LIBRARIES opencv_core) ++checked_find_package (OpenCV CONFIG + DEFINITIONS -DUSE_OPENCV=1) + + # Intel TBB +@@ -175,7 +177,9 @@ checked_find_package (TBB 2017 + PREFER_CONFIG) - checked_find_package (BZip2) # Used by ffmpeg and freetype - if (NOT BZIP2_FOUND) -@@ -200,7 +200,8 @@ if (ENABLE_FIELD3D) + checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images +-checked_find_package (FFmpeg VERSION_MIN 3.0) ++checked_find_package (FFMPEG) ++set(FFmpeg_FOUND "${FFMPEG_FOUND}") ++set(FFMPEG_INCLUDES "${FFMPEG_INCLUDE_DIRS}") + checked_find_package (GIF + VERSION_MIN 4 + RECOMMEND_MIN 5.0 +@@ -200,7 +200,9 @@ if (ENABLE_FIELD3D) endif () # For HEIF/HEIC/AVIF formats -checked_find_package (Libheif VERSION_MIN 1.3 -+checked_find_package (libheif VERSION_MIN 1.3 -+ PREFER_CONFIG ++set(LIBHEIF_INCLUDES "") ++set(LIBHEIF_LIBRARIES heif) ++checked_find_package (Libheif CONFIG RECOMMEND_MIN 1.7 RECOMMEND_MIN_REASON "for AVIF support") if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) -@@ -307,7 +308,8 @@ endmacro() +@@ -221,9 +222,8 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER + # set (LIBRAW_FOUND 0) + endif () + +-checked_find_package (OpenJPEG VERSION_MIN 2.0 +- RECOMMEND_MIN 2.2 +- RECOMMEND_MIN_REASON "for multithreading support") ++set(CMAKE_REQUIRE_FIND_PACKAGE_OpenJPEG ${USE_OPENJPEG}) ++checked_find_package (OpenJPEG CONFIG) + # Note: Recent OpenJPEG versions have exported cmake configs, but we don't + # find them reliable at all, so we stick to our FindOpenJPEG.cmake module. + +@@ -240,6 +243,8 @@ if (NOT Ptex_FOUND OR NOT Ptex_VERSION) + checked_find_package (Ptex) + endif () + ++set(WEBP_INCLUDES "") ++set(WEBP_LIBRARIES WebP::webp WebP::webpdemux) + checked_find_package (WebP) + + option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF) +@@ -307,7 +309,9 @@ endmacro() option (USE_EMBEDDED_LIBSQUISH "Force use of embedded Libsquish, even if external is found" OFF) if (NOT USE_EMBEDDED_LIBSQUISH) - checked_find_package (Libsquish) -+ checked_find_package (unofficial-libsquish PREFER_CONFIG) -+ set(libsquish_FOUND 1) ++ set(LIBSQUISH_INCLUDES "") ++ set(LIBSQUISH_LIBRARIES unofficial::libsquish::squish) ++ checked_find_package (Libsquish NAMES unofficial-libsquish) endif () -diff --git a/src/ico.imageio/CMakeLists.txt b/src/ico.imageio/CMakeLists.txt -index d290625..cff954c 100644 ---- a/src/ico.imageio/CMakeLists.txt -+++ b/src/ico.imageio/CMakeLists.txt -@@ -2,9 +2,15 @@ - # SPDX-License-Identifier: BSD-3-Clause - # https://github.com/OpenImageIO/oiio - --if (TARGET PNG::PNG) -+if (libpng_FOUND) -+ if (TARGET png_static) -+ set(PNG_TARGET png_static) -+ elseif (TARGET png) -+ set(PNG_TARGET png) -+ endif() -+ - add_oiio_plugin (icoinput.cpp icooutput.cpp -- LINK_LIBRARIES PNG::PNG ZLIB::ZLIB) -+ LINK_LIBRARIES ${PNG_TARGET} ZLIB::ZLIB) - else () - message (WARNING "libpng not found, so ICO support will not work") - set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) diff --git a/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch b/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch new file mode 100644 index 000000000..37a9df45d --- /dev/null +++ b/external_imported/vcpkg/ports/openimageio/fix-openexr-dll.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index b50a923..c3250b9 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -108,7 +108,7 @@ if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3) + # clang C++ >= 11 doesn't like 'register' keyword in old exr headers + add_compile_options (-Wno-deprecated-register) + endif () +-if (MSVC AND NOT LINKSTATIC) ++if (WIN32 AND BUILD_SHARED_LIBS) + add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? + endif () + diff --git a/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch b/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch deleted file mode 100644 index 7d3a24c2f..000000000 --- a/external_imported/vcpkg/ports/openimageio/fix-openjpeg-linkage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 1fc2059..62c4efb 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER - # set (LIBRAW_FOUND 0) - endif () - --checked_find_package (OpenJPEG VERSION_MIN 2.0) -+checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0) - - checked_find_package (OpenVDB - VERSION_MIN 5.0 diff --git a/external_imported/vcpkg/ports/openimageio/fix-static-ffmpeg.patch b/external_imported/vcpkg/ports/openimageio/fix-static-ffmpeg.patch new file mode 100644 index 000000000..16096dd09 --- /dev/null +++ b/external_imported/vcpkg/ports/openimageio/fix-static-ffmpeg.patch @@ -0,0 +1,18 @@ +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index dc260a7..433ffbb 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -6,6 +6,13 @@ + checked_find_package (pybind11 REQUIRED + VERSION_MIN 2.4.2) + ++if(USE_FFMPEG AND UNIX AND NOT BUILD_SHARED_LIBS AND VCPKG_CRT_LINKAGE STREQUAL "dynamic") ++ include(CheckLinkerFlag) ++ check_linker_flag(C "LINKER:-Bsymbolic" supports_bsymbolic) ++ if(supports_bsymbolic) ++ add_link_options("LINKER:-Bsymbolic") ++ endif() ++endif() + + file (GLOB python_srcs *.cpp) + setup_python_module (TARGET PyOpenImageIO diff --git a/external_imported/vcpkg/ports/openimageio/imath-version-guard.patch b/external_imported/vcpkg/ports/openimageio/imath-version-guard.patch new file mode 100644 index 000000000..598d8229a --- /dev/null +++ b/external_imported/vcpkg/ports/openimageio/imath-version-guard.patch @@ -0,0 +1,16 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index b50a923..cec6e43 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -168,6 +168,11 @@ set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}") + if (NOT OPENCOLORIO_FOUND) + set (OPENCOLORIO_FOUND 0) + endif () ++if(USE_OPENCOLORIO AND TARGET Imath::Imath AND OIIO_USING_IMATH STREQUAL "2") ++ message(FATAL_ERROR ++ "OpenColorIO and OpenEXR use incompatible versions of Imath. " ++ "You cannot use openimageio[opencolorio] for this configuration.") ++endif() + set(OPENCV_INCLUDES "") + set(OPENCV_LIBRARIES opencv_core) + checked_find_package (OpenCV CONFIG diff --git a/external_imported/vcpkg/ports/openimageio/portfile.cmake b/external_imported/vcpkg/ports/openimageio/portfile.cmake index 4f93c86cf..20fdac139 100644 --- a/external_imported/vcpkg/ports/openimageio/portfile.cmake +++ b/external_imported/vcpkg/ports/openimageio/portfile.cmake @@ -1,24 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF ff71703961f7758409fb7e6e689258e2997f7c18 # 2.3.10.1 - SHA512 f56cb58329a496ca1fe3537fe87d469038ac0e74a555990a4510d2c019d2ad14b556240c0d5087a9a25ac01d9b371b5c77ce5a719e71a85fcd56e9cd099bc31e + REF v2.3.17.0 + SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700 HEAD_REF master PATCHES fix-dependencies.patch - fix-config-cmake.patch - fix-openjpeg-linkage.patch + fix-static-ffmpeg.patch + fix-openexr-dll.patch + imath-version-guard.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") -file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") - -file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LINKSTATIC) +file(REMOVE + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibheif.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindOpenJPEG.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindWebP.cmake" +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -32,34 +35,38 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP pybind11 USE_PYTHON tools OIIO_BUILD_TOOLS + tools USE_OPENGL + tools USE_QT + tools USE_QT5 ) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DOIIO_BUILD_TESTS=OFF + -DBUILD_TESTING=OFF -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_QT=OFF + -DUSE_OpenVDB=OFF -DUSE_PTEX=OFF - -DLINKSTATIC=${LINKSTATIC} + -DUSE_TBB=OFF + -DLINKSTATIC=OFF # LINKSTATIC breaks library lookup -DBUILD_MISSING_FMT=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_DEPS=OFF -DSTOP_ON_WARNING=OFF -DVERBOSE=ON + -DBUILD_DOCS=OFF + -DINSTALL_DOCS=OFF + "-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap" ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME OpenImageIO CONFIG_PATH lib/cmake/OpenImageIO) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO) if("tools" IN_LIST FEATURES) vcpkg_copy_tools( @@ -69,11 +76,19 @@ if("tools" IN_LIST FEATURES) endif() # Clean -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" - "${CURRENT_PACKAGES_DIR}/debug/doc" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(READ "${SOURCE_PATH}/THIRD-PARTY.md" third_party) +string(REGEX REPLACE + "^.*The remainder of this file" + "\n-------------------------------------------------------------------------\n\nThe remainder of this file" + third_party + "${third_party}" +) +file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${third_party}") diff --git a/external_imported/vcpkg/ports/openimageio/usage b/external_imported/vcpkg/ports/openimageio/usage new file mode 100644 index 000000000..b76a4cdd7 --- /dev/null +++ b/external_imported/vcpkg/ports/openimageio/usage @@ -0,0 +1,4 @@ +The package openimageio provides CMake targets: + + find_package(OpenImageIO CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenImageIO::OpenImageIO) diff --git a/external_imported/vcpkg/ports/openimageio/vcpkg.json b/external_imported/vcpkg/ports/openimageio/vcpkg.json index e361f9955..44ff6fcbd 100644 --- a/external_imported/vcpkg/ports/openimageio/vcpkg.json +++ b/external_imported/vcpkg/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", - "version": "2.3.10.1", - "port-version": 3, + "version": "2.3.17.0", + "port-version": 4, "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", @@ -43,6 +43,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "avresample" ] @@ -68,7 +69,10 @@ ] }, "opencolorio": { - "description": "Enable opencolorio support for openimageio", + "description": [ + "Enable opencolorio support for openimageio.", + "This feature can only be used when openexr and opencolorio use the same version of Imath." + ], "dependencies": [ "opencolorio" ] @@ -76,7 +80,10 @@ "opencv": { "description": "Enable opencv support for openimageio", "dependencies": [ - "opencv" + { + "name": "opencv", + "default-features": false + } ] }, "openjpeg": { @@ -95,7 +102,10 @@ "description": "Build openimageio tools", "dependencies": [ "opengl", - "qt5-base" + { + "name": "qt5-base", + "default-features": false + } ] }, "webp": { diff --git a/external_imported/vcpkg/ports/openjpeg/Enable-tools-of-each-features.patch b/external_imported/vcpkg/ports/openjpeg/Enable-tools-of-each-features.patch deleted file mode 100644 index cce376596..000000000 --- a/external_imported/vcpkg/ports/openjpeg/Enable-tools-of-each-features.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a41078..747c61c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -277,7 +277,7 @@ mark_as_advanced(BUILD_VIEWER) - mark_as_advanced(BUILD_JAVA) - mark_as_advanced(BUILD_JP3D) - --if(BUILD_CODEC OR BUILD_MJ2) -+if(BUILD_CODEC OR BUILD_JPWL OR BUILD_MJ2 OR BUILD_JPIP OR BUILD_JP3D) - # OFF: It will only build 3rd party libs if they are not found on the system - # ON: 3rd party libs will ALWAYS be build, and used - option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) diff --git a/external_imported/vcpkg/ports/openjpeg/arm.patch b/external_imported/vcpkg/ports/openjpeg/arm.patch new file mode 100644 index 000000000..357d33e0f --- /dev/null +++ b/external_imported/vcpkg/ports/openjpeg/arm.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/openjp2/ht_dec.c b/src/lib/openjp2/ht_dec.c +index 1eb4d525f..e2f3afd6a 100644 +--- a/src/lib/openjp2/ht_dec.c ++++ b/src/lib/openjp2/ht_dec.c +@@ -69,7 +69,7 @@ static OPJ_BOOL only_cleanup_pass_is_decoded = OPJ_FALSE; + static INLINE + OPJ_UINT32 population_count(OPJ_UINT32 val) + { +-#ifdef OPJ_COMPILER_MSVC ++#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64)) + return (OPJ_UINT32)__popcnt(val); + #elif (defined OPJ_COMPILER_GNUC) + return (OPJ_UINT32)__builtin_popcount(val); diff --git a/external_imported/vcpkg/ports/openjpeg/dll.location.patch b/external_imported/vcpkg/ports/openjpeg/dll.location.patch deleted file mode 100644 index bdc77a542..000000000 --- a/external_imported/vcpkg/ports/openjpeg/dll.location.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt -index b0469af1f..75048ef13 100644 ---- a/src/lib/openjp3d/CMakeLists.txt -+++ b/src/lib/openjp3d/CMakeLists.txt -@@ -34,8 +34,9 @@ endif() - # Install library - install(TARGETS ${OPENJP3D_LIBRARY_NAME} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -- COMPONENT Libraries -+ RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries - ) - - # Install includes files -diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt -index 25294b20e..e3acfe8e7 100644 ---- a/src/lib/openmj2/CMakeLists.txt -+++ b/src/lib/openmj2/CMakeLists.txt -@@ -53,8 +53,9 @@ endif() - # Install library - install(TARGETS ${OPENMJ2_LIBRARY_NAME} - EXPORT OpenMJ2Targets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -- COMPONENT Libraries -+ RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries - ) - - # Install includes files diff --git a/external_imported/vcpkg/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch b/external_imported/vcpkg/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch deleted file mode 100644 index 1d79d6332..000000000 --- a/external_imported/vcpkg/ports/openjpeg/fix-lrintf-to-opj_lrintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h -index 340e8a9..11bb0e4 100644 ---- a/src/lib/openmj2/opj_includes.h -+++ b/src/lib/openmj2/opj_includes.h -@@ -93,7 +93,7 @@ Most compilers implement their own version of this keyword ... - - /* MSVC and Borland C do not have lrintf */ - #if defined(_MSC_VER) || defined(__BORLANDC__) --static INLINE long lrintf(float f) -+static INLINE long opj_lrintf(float f) - { - #ifdef _M_X64 - return (long)((f > 0.0f) ? (f + 0.5f) : (f - 0.5f)); diff --git a/external_imported/vcpkg/ports/openjpeg/fix-static.patch b/external_imported/vcpkg/ports/openjpeg/fix-static.patch new file mode 100644 index 000000000..1101e2d95 --- /dev/null +++ b/external_imported/vcpkg/ports/openjpeg/fix-static.patch @@ -0,0 +1,59 @@ +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt +index 4d4bd952f..e14b5a692 100644 +--- a/src/bin/jp2/CMakeLists.txt ++++ b/src/bin/jp2/CMakeLists.txt +@@ -33,14 +33,6 @@ include_directories( + ${TIFF_INCLUDE_DIRNAME} + ) + +-if(WIN32) +- if(BUILD_SHARED_LIBS) +- add_definitions(-DOPJ_EXPORTS) +- else() +- add_definitions(-DOPJ_STATIC) +- endif() +-endif() +- + # Loop over all executables: + foreach(exe opj_decompress opj_compress opj_dump) + add_executable(${exe} ${exe}.c ${common_SRCS}) +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt +index ea4131a3e..dc63f49dd 100644 +--- a/src/lib/openjp2/CMakeLists.txt ++++ b/src/lib/openjp2/CMakeLists.txt +@@ -84,12 +84,12 @@ endif() + + # Build the library + if(WIN32) ++ add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(${OPENJPEG_LIBRARY_NAME} PUBLIC OPJ_STATIC) + endif() +- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) + set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) + else() + if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) +diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt +index b3cb8ce88..fc6a9dde3 100644 +--- a/src/lib/openjpip/CMakeLists.txt ++++ b/src/lib/openjpip/CMakeLists.txt +@@ -52,14 +52,14 @@ set(LOCAL_SRCS + ) + + # Build the library ++add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + if(WIN32) + if(BUILD_SHARED_LIBS) + add_definitions(-DOPJ_EXPORTS) + else() +- add_definitions(-DOPJ_STATIC) ++ target_compile_definitions(openjpip PUBLIC OPJ_STATIC) + endif() + endif() +-add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) + set_target_properties(openjpip + PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) + if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") diff --git a/external_imported/vcpkg/ports/openjpeg/no-wx.patch b/external_imported/vcpkg/ports/openjpeg/no-wx.patch new file mode 100644 index 000000000..d01844492 --- /dev/null +++ b/external_imported/vcpkg/ports/openjpeg/no-wx.patch @@ -0,0 +1,10 @@ +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index 292fe5a71..bcbe94160 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -9,4 +9,4 @@ if(BUILD_JPIP) + endif() + + # wx apps: +-add_subdirectory(wx) ++# add_subdirectory(wx) diff --git a/external_imported/vcpkg/ports/openjpeg/portfile.cmake b/external_imported/vcpkg/ports/openjpeg/portfile.cmake index 195ff13a7..a23bd58bb 100644 --- a/external_imported/vcpkg/ports/openjpeg/portfile.cmake +++ b/external_imported/vcpkg/ports/openjpeg/portfile.cmake @@ -1,23 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uclouvain/openjpeg - REF 37ac30ceff6640bbab502388c5e0fa0bff23f505 #v2.4.0 - SHA512 7554d64701f1b51501a977bc165e61e4696d97f1f40e4c784c729824878a716c13ac378c6b2dd0d23a11d9e3fa316ff6fc817ca5a614ef4d6530db06a8f83971 + REF a5891555eb49ed7cc26b2901ea680acda136d811 #v2.5.0 + SHA512 f388d5770445152cd5ed18c61d2a56a6d2b88c2b56db0d460d09be36f3e6e40cf5be505aa63ac5975e07688be3dfe752080f4939bd792d42c61f4f8ddcaa1f0d HEAD_REF master - PATCHES - dll.location.patch - fix-lrintf-to-opj_lrintf.patch - Enable-tools-of-each-features.patch + PATCHES + arm.patch + no-wx.patch + fix-static.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(feature_tools "tools" BUILD_JPIP_SERVER) # Requires pthread + if("tools" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DFCGI_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/fastcgi") + endif() +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "jpwl" BUILD_JPWL - "mj2" BUILD_MJ2 "jpip" BUILD_JPIP - "jp3d" BUILD_JP3D + ${feature_tools} + "tools" BUILD_VIEWER + "tools" BUILD_CODEC + "tools" BUILD_LUTS_GENERATOR ) vcpkg_cmake_configure( @@ -53,18 +61,9 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") set(TOOL_NAMES) -if("jpwl" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_jpwl_compress opj_jpwl_decompress) -endif() -if("mj2" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_mj2_compress opj_mj2_decompress opj_mj2_extract opj_mj2_wrap) -endif() -if("jpip" IN_LIST FEATURES) +if("tools" IN_LIST FEATURES) list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_dec_server opj_jpip_addxml opj_jpip_test opj_jpip_transcode) endif() -if("jp3d" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_jp3d_compress opj_jp3d_decompress) -endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() diff --git a/external_imported/vcpkg/ports/openjpeg/vcpkg.json b/external_imported/vcpkg/ports/openjpeg/vcpkg.json index 031f12a44..be472aca9 100644 --- a/external_imported/vcpkg/ports/openjpeg/vcpkg.json +++ b/external_imported/vcpkg/ports/openjpeg/vcpkg.json @@ -1,8 +1,9 @@ { "name": "openjpeg", - "version-semver": "2.4.0", + "version": "2.5.0", "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", "homepage": "https://github.com/uclouvain/openjpeg", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", @@ -15,16 +16,32 @@ ], "features": { "jp3d": { - "description": "Build optional component jp3d" + "description": "(deprecated)" }, "jpip": { "description": "Build optional component jpip" }, "jpwl": { - "description": "Build optional component jpwl" + "description": "(deprecated)" }, "mj2": { - "description": "Build optional component mj2" + "description": "(deprecated)" + }, + "tools": { + "description": "(deprecated)", + "dependencies": [ + { + "name": "curl", + "platform": "!windows" + }, + { + "name": "fastcgi", + "platform": "!windows" + }, + "lcms", + "tiff", + "zlib" + ] } } } diff --git a/external_imported/vcpkg/ports/openldap/m4.patch b/external_imported/vcpkg/ports/openldap/m4.patch new file mode 100644 index 000000000..4df7e91a6 --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/m4.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 71dd7a6..6741ec6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,6 +38,7 @@ m4_ifndef([PKG_PREREQ], + + AC_CONFIG_AUX_DIR(build)dnl + AC_CONFIG_MACRO_DIRS([build]) ++AC_CONFIG_MACRO_DIR([m4]) + + eval `$ac_aux_dir/version.sh` + if test -z "$OL_STRING"; then diff --git a/external_imported/vcpkg/ports/openldap/openssl.patch b/external_imported/vcpkg/ports/openldap/openssl.patch new file mode 100644 index 000000000..d04dfe8e8 --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/openssl.patch @@ -0,0 +1,35 @@ +diff --git a/configure.ac b/configure.ac +index 626d024..e97f548 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1223,6 +1223,9 @@ fi + + ol_link_tls=no + if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then ++ PKG_CHECK_MODULES(OPENSSL, openssl >= 1.1.1, [have_openssl=yes], [AC_MSG_FAILURE([OpenSSL is required])]) ++ CFLAGS="${OPENSSL_CFLAGS} ${CFLAGS}" ++ ac_cv_lib_ssl_SSL_export_keying_material_early=yes + AC_CHECK_HEADERS(openssl/ssl.h) + + if test $ac_cv_header_openssl_ssl_h = yes ; then +@@ -1245,7 +1248,8 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then + AC_DEFINE(HAVE_OPENSSL, 1, + [define if you have OpenSSL]) + +- TLS_LIBS="-lssl -lcrypto" ++ TLS_LIBS="${OPENSSL_LIBS}" ++ AC_SUBST(TLS_MODULE, openssl, [TLS pkg-config module]) + fi + fi + fi +diff --git a/libraries/libldap/ldap.pc.in b/libraries/libldap/ldap.pc.in +index 3f7dd46..43b2e52 100644 +--- a/libraries/libldap/ldap.pc.in ++++ b/libraries/libldap/ldap.pc.in +@@ -10,4 +10,5 @@ Version: @VERSION@ + Requires: lber + Cflags: -I${includedir} + Libs: -L${libdir} -lldap +-Libs.private: @LIBS@ @SASL_LIBS@ @TLS_LIBS@ @AUTH_LIBS@ ++Libs.private: @LIBS@ @SASL_LIBS@ @AUTH_LIBS@ ++Requires.private: @TLS_MODULE@ diff --git a/external_imported/vcpkg/ports/openldap/portfile.cmake b/external_imported/vcpkg/ports/openldap/portfile.cmake new file mode 100644 index 000000000..dd617ce45 --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/portfile.cmake @@ -0,0 +1,66 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.13.tgz" + FILENAME "openldap-2.5.13.tgz" + SHA512 30fdc884b513c53169910eec377c2ad05013b9f06bab3123d50d028108b24548791f7f47f18bcb3a2b4868edeab02c10d81ffa320c02d7b562f2e8f2fa25d6c9 +) + +vcpkg_list(SET EXTRA_PATCHES) + +# Check autoconf version < 2.70 +execute_process(COMMAND autoconf --version OUTPUT_VARIABLE AUTOCONF_VERSION_STR) +if(NOT "${AUTOCONF_VERSION_STR}" STREQUAL "" AND "${AUTOCONF_VERSION_STR}" MATCHES ".*2\\.[0-6].*") + vcpkg_list(APPEND EXTRA_PATCHES m4.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + openssl.patch + subdirs.patch + ${EXTRA_PATCHES} +) + +vcpkg_list(SET FEATURE_OPTIONS) +if("tools" IN_LIST FEATURES) + vcpkg_list(APPEND FEATURE_OPTIONS --enable-tools) +endif() + +if("cyrus-sasl" IN_LIST FEATURES) + vcpkg_list(APPEND FEATURE_OPTIONS --with-cyrus-sasl) +else() + vcpkg_list(APPEND FEATURE_OPTIONS --without-cyrus-sasl) +endif() + +# Disable build environment details in binaries +set(ENV{SOURCE_DATE_EPOCH} "1659614616") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_VERBOSE_FLAGS + AUTOCONFIG + OPTIONS + ${FEATURE_OPTIONS} + --disable-cleartext + --disable-mdb + --disable-relay + --disable-slapd + --disable-syncprov + --with-tls=openssl + --without-systemd + --without-fetch + --without-argon2 + ac_cv_lib_iodbc_SQLDriverConnect=no + ac_cv_lib_odbc_SQLDriverConnect=no + ac_cv_lib_odbc32_SQLDriverConnect=no +) + +vcpkg_build_make(BUILD_TARGET depend LOGFILE_ROOT depend) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +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) diff --git a/external_imported/vcpkg/ports/openldap/subdirs.patch b/external_imported/vcpkg/ports/openldap/subdirs.patch new file mode 100644 index 000000000..633a2542c --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/subdirs.patch @@ -0,0 +1,34 @@ +diff --git a/Makefile.in b/Makefile.in +index 5c6bec0..c654210 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -13,7 +13,11 @@ + ## top-level directory of the distribution or, alternatively, at + ## . + +-SUBDIRS= include libraries clients servers tests doc ++ifeq ($(patsubst %/debug,DEBUG,$(prefix)),DEBUG) ++SUBDIRS= include libraries ++else ++SUBDIRS= include libraries @TOOLS_SUBDIRS@ ++endif + CLEANDIRS= + INSTALLDIRS= + +diff --git a/configure.ac b/configure.ac +index e97f548..71dd7a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -235,6 +235,12 @@ dnl OL_ARG_ENABLE(referrals,[AS_HELP_STRING([--enable-referrals], [enable LDAPv2 + ol_enable_referrals=${ol_enable_referrals-no} + OL_ARG_ENABLE(ipv6, [AS_HELP_STRING([--enable-ipv6], [enable IPv6 support])], auto)dnl + OL_ARG_ENABLE(local, [AS_HELP_STRING([--enable-local], [enable AF_LOCAL (AF_UNIX) socket support])], auto)dnl ++OL_ARG_ENABLE(tools, [AS_HELP_STRING([--enable-tools], [Build client tools])],no,[no yes]) ++TOOLS_SUBDIRS="" ++if test "$ol_enable_tools" = "yes" ; then ++ TOOLS_SUBDIRS="clients" ++fi ++AC_SUBST(TOOLS_SUBDIRS) + + dnl ---------------------------------------------------------------- + dnl General "with" options diff --git a/external_imported/vcpkg/ports/openldap/usage b/external_imported/vcpkg/ports/openldap/usage new file mode 100644 index 000000000..6777fcdda --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/usage @@ -0,0 +1,6 @@ +The package openldapp can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(OPENLDAP REQUIRED IMPORTED_TARGET ldap) + + target_link_libraries(main PRIVATE PkgConfig::OPENLDAP) diff --git a/external_imported/vcpkg/ports/openldap/vcpkg.json b/external_imported/vcpkg/ports/openldap/vcpkg.json new file mode 100644 index 000000000..ef5173747 --- /dev/null +++ b/external_imported/vcpkg/ports/openldap/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "openldap", + "version": "2.5.13", + "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.", + "homepage": "https://www.openldap.org/software/", + "license": "OLDAP-2.8", + "supports": "!windows, (mingw & !x86)", + "dependencies": [ + "openssl" + ], + "features": { + "cyrus-sasl": { + "description": "with Cyrus SASL support" + }, + "tools": { + "description": "Enable client tools" + } + } +} diff --git a/external_imported/vcpkg/ports/openmpi/portfile.cmake b/external_imported/vcpkg/ports/openmpi/portfile.cmake index 82b139a2a..844642f59 100644 --- a/external_imported/vcpkg/ports/openmpi/portfile.cmake +++ b/external_imported/vcpkg/ports/openmpi/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(OpenMPI_FULL_VERSION "4.1.0") +set(OpenMPI_FULL_VERSION "4.1.3") set(OpenMPI_SHORT_VERSION "4.1") vcpkg_download_distfile(ARCHIVE URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz" FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz" - SHA512 1f8117b11c5279d34194b4f5652b0223cf1258a4ac0efd40bab78f31f203068e027235a92a87e546b1b35c5b369bc90788b109c05a7068c75533a03649410e99 + SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/openmpi/vcpkg.json b/external_imported/vcpkg/ports/openmpi/vcpkg.json index d880ce0f1..51c5f27a7 100644 --- a/external_imported/vcpkg/ports/openmpi/vcpkg.json +++ b/external_imported/vcpkg/ports/openmpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openmpi", - "version": "4.1.0", - "port-version": 4, + "version": "4.1.3", "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/external_imported/vcpkg/ports/openmvg/build_fixes.patch b/external_imported/vcpkg/ports/openmvg/build_fixes.patch index 8f61668be..c343368b1 100644 --- a/external_imported/vcpkg/ports/openmvg/build_fixes.patch +++ b/external_imported/vcpkg/ports/openmvg/build_fixes.patch @@ -617,45 +617,6 @@ index 6db7e83..51e06f5 100644 ${OpenCV_LIBS}) target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS}) -diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in -index 42b41cc..7fda0cd 100644 ---- a/src/software/SfM/SfM_GlobalPipeline.py.in -+++ b/src/software/SfM/SfM_GlobalPipeline.py.in -@@ -21,7 +21,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess -diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in -index 423c85c..0ff2e77 100644 ---- a/src/software/SfM/SfM_SequentialPipeline.py.in -+++ b/src/software/SfM/SfM_SequentialPipeline.py.in -@@ -21,7 +21,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess -diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in -index c7361f3..1c56aab 100644 ---- a/src/software/SfM/tutorial_demo.py.in -+++ b/src/software/SfM/tutorial_demo.py.in -@@ -12,7 +12,7 @@ - OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" - - # Indicate the openMVG camera sensor width directory --CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" -+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@" - - import os - import subprocess diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp index aa7dffe..2c4d237 100644 --- a/src/software/VO/Tracker_opencv_klt.hpp diff --git a/external_imported/vcpkg/ports/openmvg/no-absolute-paths.patch b/external_imported/vcpkg/ports/openmvg/no-absolute-paths.patch new file mode 100644 index 000000000..45d00aec4 --- /dev/null +++ b/external_imported/vcpkg/ports/openmvg/no-absolute-paths.patch @@ -0,0 +1,66 @@ +diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in +index 7fda0cd..c6f0bdb 100644 +--- a/src/software/SfM/SfM_GlobalPipeline.py.in ++++ b/src/software/SfM/SfM_GlobalPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in +index 0ff2e77..98d3eb2 100644 +--- a/src/software/SfM/SfM_SequentialPipeline.py.in ++++ b/src/software/SfM/SfM_SequentialPipeline.py.in +@@ -16,14 +16,13 @@ + # + # if output_dir is not present script will create it + # +- ++import os + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + +diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in +index 1c56aab..3fb31c4 100644 +--- a/src/software/SfM/tutorial_demo.py.in ++++ b/src/software/SfM/tutorial_demo.py.in +@@ -8,13 +8,14 @@ + # usage : python tutorial_demo.py + # + ++import os ++ + # Indicate the openMVG binary directory +-OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@" ++OPENMVG_SFM_BIN = os.path.dirname(__file__) + + # Indicate the openMVG camera sensor width directory +-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database" ++CAMERA_SENSOR_WIDTH_DIRECTORY = os.path.dirname(__file__) + +-import os + import subprocess + import sys + diff --git a/external_imported/vcpkg/ports/openmvg/portfile.cmake b/external_imported/vcpkg/ports/openmvg/portfile.cmake index a5de94bff..32c8c9196 100644 --- a/external_imported/vcpkg/ports/openmvg/portfile.cmake +++ b/external_imported/vcpkg/ports/openmvg/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( build_fixes.patch 0001-eigen_3.4.0.patch 0002-eigen-3.4.patch + no-absolute-paths.patch ) set(OpenMVG_USE_OPENMP OFF) diff --git a/external_imported/vcpkg/ports/openmvg/vcpkg.json b/external_imported/vcpkg/ports/openmvg/vcpkg.json index 80a83a7d3..ea5574286 100644 --- a/external_imported/vcpkg/ports/openmvg/vcpkg.json +++ b/external_imported/vcpkg/ports/openmvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvg", "version": "2.0", - "port-version": 3, + "port-version": 4, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "license": "MPL-2.0-no-copyleft-exception", "dependencies": [ diff --git a/external_imported/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch b/external_imported/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch deleted file mode 100644 index 69924d219..000000000 --- a/external_imported/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch +++ /dev/null @@ -1,19 +0,0 @@ - libs/Common/Common.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libs/Common/Common.cpp b/libs/Common/Common.cpp -index 052951d..8dc404e 100644 ---- a/libs/Common/Common.cpp -+++ b/libs/Common/Common.cpp -@@ -31,6 +31,11 @@ namespace boost { - ASSERT("boost exception thrown" == NULL); - exit(EXIT_FAILURE); - } -+ void throw_exception(std::exception const & e, boost::source_location const &) { -+ VERBOSE("exception thrown: %s", e.what()); -+ ASSERT("boost exception thrown" == NULL); -+ exit(EXIT_FAILURE); -+ } - } // namespace boost - #endif - #endif diff --git a/external_imported/vcpkg/ports/openmvs/fix-build.patch b/external_imported/vcpkg/ports/openmvs/fix-build.patch index 48f62ae0a..50884fd73 100644 --- a/external_imported/vcpkg/ports/openmvs/fix-build.patch +++ b/external_imported/vcpkg/ports/openmvs/fix-build.patch @@ -1,187 +1,24 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7966ed5..f34b5b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,9 +63,10 @@ INCLUDE_DIRECTORIES("${OpenMVS_SOURCE_DIR}") - SET(OpenMVS_EXTRA_LIBS "") - if(OpenMVS_USE_OPENMP) - SET(OpenMP_LIBS "") -- FIND_PACKAGE(OpenMP) -- if(OPENMP_FOUND) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -+ FIND_PACKAGE(OpenMP REQUIRED) -+ if(OpenMP_FOUND) -+ link_libraries(OpenMP::OpenMP_CXX) -+ link_libraries(OpenMP::OpenMP_C) - ADD_DEFINITIONS(-D_USE_OPENMP) - SET(_USE_OPENMP TRUE) - #cmake only check for separate OpenMP library on AppleClang 7+ -@@ -83,7 +84,7 @@ if(OpenMVS_USE_OPENGL) - if(POLICY CMP0072) - cmake_policy(SET CMP0072 NEW) - endif() -- FIND_PACKAGE(OpenGL) -+ FIND_PACKAGE(OpenGL REQUIRED) - if(OPENGL_FOUND) - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - ADD_DEFINITIONS(${OpenGL_DEFINITIONS} -D_USE_OPENGL) -@@ -94,7 +95,7 @@ if(OpenMVS_USE_OPENGL) - endif() +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index 2365de65f..4d871850d 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -1,6 +1,7 @@ + # Add applications + ADD_SUBDIRECTORY(InterfaceCOLMAP) + ADD_SUBDIRECTORY(InterfaceMetashape) ++ADD_SUBDIRECTORY(InterfaceVisualSFM) + ADD_SUBDIRECTORY(DensifyPointCloud) + ADD_SUBDIRECTORY(ReconstructMesh) + ADD_SUBDIRECTORY(RefineMesh) + +diff --git a/build/Templates/OpenMVSConfig.cmake.in b/build/Templates/OpenMVSConfig.cmake.in +index 9747b3e1..5e2469d3 100644 +--- a/build/Templates/OpenMVSConfig.cmake.in ++++ b/build/Templates/OpenMVSConfig.cmake.in +@@ -15,9 +15,67 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@") + + set(OpenMVS_DEFINITIONS "@OpenMVS_DEFINITIONS@") - if(OpenMVS_USE_CUDA) -- FIND_PACKAGE(CUDA) -+ FIND_PACKAGE(CUDA REQUIRED) - if(CUDA_FOUND) - INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) - ADD_DEFINITIONS(-D_USE_CUDA) -@@ -108,7 +109,7 @@ else() - endif() - - if(OpenMVS_USE_BREAKPAD) -- FIND_PACKAGE(BREAKPAD) -+ FIND_PACKAGE(BREAKPAD REQUIRED) - if(BREAKPAD_FOUND) - INCLUDE_DIRECTORIES(${BREAKPAD_INCLUDE_DIRS}) - ADD_DEFINITIONS(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD) -@@ -119,7 +120,7 @@ if(OpenMVS_USE_BREAKPAD) - endif() - endif() - --FIND_PACKAGE(Boost ${SYSTEM_PACKAGE_REQUIRED} COMPONENTS iostreams program_options system serialization) -+FIND_PACKAGE(Boost COMPONENTS iostreams program_options system serialization REQUIRED) - if(Boost_FOUND) - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) - ADD_DEFINITIONS(${Boost_DEFINITIONS} -D_USE_BOOST) -@@ -127,14 +128,14 @@ if(Boost_FOUND) - SET(_USE_BOOST TRUE) - endif() - --FIND_PACKAGE(Eigen ${SYSTEM_PACKAGE_REQUIRED}) --if(EIGEN_FOUND) -- INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS}) -- ADD_DEFINITIONS(${EIGEN_DEFINITIONS} -D_USE_EIGEN) -+FIND_PACKAGE(Eigen3 REQUIRED) -+if(EIGEN3_FOUND) -+ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS}) -+ ADD_DEFINITIONS(${EIGEN3_DEFINITIONS} -D_USE_EIGEN) - SET(_USE_EIGEN TRUE) - endif() - --FIND_PACKAGE(OpenCV ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(OpenCV REQUIRED) - if(OpenCV_FOUND) - INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS}) - ADD_DEFINITIONS(${OpenCV_DEFINITIONS}) -@@ -170,7 +171,9 @@ ADD_DEFINITIONS(${OpenMVS_DEFINITIONS}) - - # Add modules - ADD_SUBDIRECTORY(libs) -+if(OpenMVS_BUILD_TOOLS) - ADD_SUBDIRECTORY(apps) -+endif() - ADD_SUBDIRECTORY(docs) - - if(OpenMVS_USE_CERES) -@@ -188,7 +191,7 @@ export(TARGETS Common IO Math MVS FILE "${PROJECT_BINARY_DIR}/OpenMVSTargets.cma - # Export the package for use from the build-tree - # (this registers the build-tree with a global CMake-registry) - export(PACKAGE OpenMVS) -- -+ - # Create the OpenMVSConfig.cmake and OpenMVSConfigVersion files - file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") - # ... for the build tree -@@ -199,7 +202,7 @@ set(CONF_INCLUDE_DIRS "${INSTALL_CMAKE_DIR}/${REL_INCLUDE_DIR}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfig.cmake.in" "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake" @ONLY) - # ... for both - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfigVersion.cmake.in" "${PROJECT_BINARY_DIR}/OpenMVSConfigVersion.cmake" @ONLY) -- -+ - # Install the OpenMVSConfig.cmake and OpenMVSConfigVersion.cmake - install(FILES - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake" -diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in -similarity index 97% -rename from MvgMvsPipeline.py -rename to MvgMvsPipeline.py.in -index f4914bf..23d03e6 100644 ---- a/MvgMvsPipeline.py -+++ b/MvgMvsPipeline.py.in -@@ -91,12 +91,12 @@ def find(afile): - - - # Try to find openMVG and openMVS binaries in PATH --OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") --OPENMVS_BIN = whereis("ReconstructMesh") -+OPENMVG_BIN = "@OPENMVG_TOOLS_PATH@" -+OPENMVS_BIN = "@OPENMVS_TOOLS_PATH@" - - # Try to find openMVG camera sensor database --CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt" --CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE) -+CAMERA_SENSOR_DB_FILE = "@SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH@" -+CAMERA_SENSOR_DB_DIRECTORY = "@OPENMVG_TOOLS_PATH@" - - # Ask user for openMVG and openMVS directories if not found - if not OPENMVG_BIN: -@@ -175,10 +175,10 @@ class StepsStore: - ["-i", "%input_dir%", "-o", "%matches_dir%", "-d", "%camera_file_params%"]], - ["Compute features", # 1 - os.path.join(OPENMVG_BIN, "openMVG_main_ComputeFeatures"), -- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT", "-n", "4"]], -+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT"]], - ["Compute matches", # 2 - os.path.join(OPENMVG_BIN, "openMVG_main_ComputeMatches"), -- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "HNSWL2", "-r", ".8"]], -+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "AUTO", "-r", ".8"]], - ["Incremental reconstruction", # 3 - os.path.join(OPENMVG_BIN, "openMVG_main_IncrementalSfM"), - ["-i", "%matches_dir%/sfm_data.json", "-m", "%matches_dir%", "-o", "%reconstruction_dir%"]], -diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt -index c519040..934cd50 100644 ---- a/apps/Viewer/CMakeLists.txt -+++ b/apps/Viewer/CMakeLists.txt -@@ -16,18 +16,6 @@ else() - MESSAGE("-- Can't find GLEW. Continuing without it.") - RETURN() - endif() --if(CMAKE_COMPILER_IS_GNUCXX) -- FIND_PACKAGE(PkgConfig QUIET) -- pkg_search_module(GLFW QUIET glfw3) -- if(GLFW_FOUND) -- INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS}) -- ADD_DEFINITIONS(${GLFW_DEFINITIONS}) -- MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})") -- else() -- MESSAGE("-- Can't find GLFW3. Continuing without it.") -- RETURN() -- endif() --else() - FIND_PACKAGE(glfw3 QUIET) - if(glfw3_FOUND) - INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS}) -@@ -37,7 +25,6 @@ else() - MESSAGE("-- Can't find GLFW3. Continuing without it.") - RETURN() - endif() --endif() - - # List sources files - FILE(GLOB PCH_C "Common.cpp") -diff --git a/build/OpenMVSConfig.cmake.in b/build/OpenMVSConfig.cmake.in -index 96b8fe2..fa6d4a6 100644 ---- a/build/OpenMVSConfig.cmake.in -+++ b/build/OpenMVSConfig.cmake.in -@@ -3,16 +3,71 @@ - # OpenMVS_INCLUDE_DIRS - include directories for OpenMVS - # OpenMVS_LIBRARIES - libraries to link against - # OpenMVS_BINARIES - the binaries -- -+ - # Compute paths - get_filename_component(OpenMVS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - set(OpenMVS_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") -- +list(APPEND CMAKE_MODULE_PATH "${OpenMVS_CMAKE_DIR}") + +if (MSVC) @@ -238,36 +75,33 @@ index 96b8fe2..fa6d4a6 100644 + +add_definitions(@OpenMVS_DEFINITIONS@) + - # Our library dependencies (contains definitions for IMPORTED targets) - if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR) - include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake") - endif() -- ++# Our library dependencies (contains definitions for IMPORTED targets) ++if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR) ++ include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake") ++endif() + # These are IMPORTED targets created by OpenMVSTargets.cmake set(OpenMVS_LIBRARIES MVS) - set(OpenMVS_BINARIES InterfaceVisualSFM DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) +-set(OpenMVS_BINARIES InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) +- +-include("${CMAKE_CURRENT_LIST_DIR}/OpenMVSTargets.cmake") +-check_required_components("OpenMVS") ++set(OpenMVS_BINARIES InterfaceVisualSFM InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) + diff --git a/build/Utils.cmake b/build/Utils.cmake -index f41c9d8..31cd292 100644 +index 106d43167..33390d192 100644 --- a/build/Utils.cmake +++ b/build/Utils.cmake -@@ -160,7 +160,7 @@ macro(GetOperatingSystemArchitectureBitness) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686.*|i386.*|x86.*) - set(X86 1) - endif() -- -+ - if(NOT ${MY_VAR_PREFIX}_PACKAGE_REQUIRED) - set(${MY_VAR_PREFIX}_PACKAGE_REQUIRED "REQUIRED") - endif() -@@ -173,30 +173,6 @@ macro(ComposePackageLibSuffix) +@@ -173,32 +173,6 @@ macro(ComposePackageLibSuffix) set(PACKAGE_LIB_SUFFIX "") set(PACKAGE_LIB_SUFFIX_DBG "") set(PACKAGE_LIB_SUFFIX_REL "") - if(MSVC) -- if("${MSVC_VERSION}" STREQUAL "1921") +- if("${MSVC_VERSION}" STRGREATER "1929") +- set(PACKAGE_LIB_SUFFIX "/vc17") +- elseif("${MSVC_VERSION}" STRGREATER "1916") - set(PACKAGE_LIB_SUFFIX "/vc16") -- elseif("${MSVC_VERSION}" STREQUAL "1916") +- elseif("${MSVC_VERSION}" STRGREATER "1900") - set(PACKAGE_LIB_SUFFIX "/vc15") - elseif("${MSVC_VERSION}" STREQUAL "1900") - set(PACKAGE_LIB_SUFFIX "/vc14") @@ -291,58 +125,31 @@ index f41c9d8..31cd292 100644 endmacro() -@@ -511,7 +487,7 @@ macro(optimize_default_compiler_settings) - endif() - add_extra_compiler_option(-fdiagnostics-show-option) - add_extra_compiler_option(-ftemplate-backtrace-limit=0) -- -+ - # The -Wno-long-long is required in 64bit systems when including sytem headers. - if(X86_64) - add_extra_compiler_option(-Wno-long-long) -@@ -817,7 +793,7 @@ macro(ConfigCompilerAndLinker) - else() - set(cxx_rtti_support "${cxx_no_rtti_flags}") - endif() -- -+ - SET(cxx_default "${cxx_exception_support} ${cxx_rtti_support}" CACHE PATH "Common compile CXX flags") - SET(c_default "${CMAKE_C_FLAGS} ${cxx_base_flags}" CACHE PATH "Common compile C flags") - endmacro() -@@ -825,16 +801,12 @@ endmacro() - # Initialize variables needed for a library type project. - macro(ConfigLibrary) +@@ -806,12 +780,8 @@ macro(ConfigLibrary) # Offer the user the choice of overriding the installation directories -- set(INSTALL_LIB_DIR "lib/${PROJECT_NAME}" CACHE PATH "Installation directory for libraries") -- set(INSTALL_BIN_DIR "bin/${PROJECT_NAME}" CACHE PATH "Installation directory for executables") -- set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Installation directory for header files") + set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries") + set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables") +- set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation directory for header files") - if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR "CMake") - else() -- set(DEF_INSTALL_CMAKE_DIR "lib/CMake/${PROJECT_NAME}") +- set(DEF_INSTALL_CMAKE_DIR "lib/cmake") - endif() -+ set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries") -+ set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables") + set(INSTALL_INCLUDE_DIR "include/openmvs" CACHE PATH "Installation directory for header files") + set(DEF_INSTALL_CMAKE_DIR "share/openmvs") set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") -- -+ # Make relative paths absolute (needed later on) foreach(p LIB BIN INCLUDE CMAKE) - set(var INSTALL_${p}_DIR) -diff --git a/libs/Common/CMakeLists.txt b/libs/Common/CMakeLists.txt -index 2e6c1a4..6e1fa95 100644 ---- a/libs/Common/CMakeLists.txt -+++ b/libs/Common/CMakeLists.txt -@@ -18,6 +18,7 @@ set_target_pch(Common Common.h) - - # Link its dependencies - TARGET_LINK_LIBRARIES(Common ${Boost_LIBRARIES} ${OpenCV_LIBS}) -+TARGET_INCLUDE_DIRECTORIES(Common PUBLIC $ $) +@@ -822,7 +792,7 @@ macro(ConfigLibrary) + else() + set(${varp} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +- set(${var} "${${varp}}/${PROJECT_NAME}") ++ set(${var} "${${varp}}") + endforeach() + endmacro() - # Install - SET_TARGET_PROPERTIES(Common PROPERTIES + diff --git a/libs/Common/Strings.h b/libs/Common/MVSStrings.h similarity index 100% rename from libs/Common/Strings.h @@ -351,7 +158,7 @@ diff --git a/libs/Common/Types.h b/libs/Common/Types.h index bcac65c..9abeefb 100644 --- a/libs/Common/Types.h +++ b/libs/Common/Types.h -@@ -378,7 +378,7 @@ typedef TAliasCast CastD2I; +@@ -380,7 +380,7 @@ typedef TAliasCast CastD2I; // I N C L U D E S ///////////////////////////////////////////////// @@ -360,90 +167,17 @@ index bcac65c..9abeefb 100644 #include "AutoPtr.h" #include "List.h" #include "Thread.h" -@@ -2558,7 +2558,7 @@ public: - - /// creates an SO3 as a rotation that takes Vector a into the direction of Vector b - /// with the rotation axis along a ^ b. If |a ^ b| == 0, it creates the identity rotation. -- /// An assertion will fail if Vector a and Vector b are in exactly opposite directions. -+ /// An assertion will fail if Vector a and Vector b are in exactly opposite directions. - /// @param a source Vector - /// @param b target Vector - SO3(const Vec3& a, const Vec3& b) { -@@ -2604,7 +2604,7 @@ public: - mat.row(2) -= mat.row(1) * d12; - mat.row(2).normalize(); - // check for positive determinant <=> right handed coordinate system of row vectors -- ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0); -+ ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0); - } - - /// Exponentiate a vector in the Lie algebra to generate a new SO3. -diff --git a/libs/IO/CMakeLists.txt b/libs/IO/CMakeLists.txt -index a354376..4fd478c 100644 ---- a/libs/IO/CMakeLists.txt -+++ b/libs/IO/CMakeLists.txt -@@ -43,7 +43,8 @@ cxx_library_with_type_no_pch(IO "Libs" "STATIC" "${cxx_default}" - set_target_pch(IO Common.h) - - # Link its dependencies --TARGET_LINK_LIBRARIES(IO Common ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${EXIV2_LIBS}) -+TARGET_LINK_LIBRARIES(IO Common ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${EXIV2_LIBS}) -+TARGET_INCLUDE_DIRECTORIES(IO PUBLIC $ $) - - # Install - SET_TARGET_PROPERTIES(IO PROPERTIES -diff --git a/libs/MVS/CMakeLists.txt b/libs/MVS/CMakeLists.txt -index 14be620..867cfd5 100644 ---- a/libs/MVS/CMakeLists.txt -+++ b/libs/MVS/CMakeLists.txt -@@ -1,12 +1,12 @@ - # Find required packages --FIND_PACKAGE(CGAL ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(CGAL REQUIRED) - if(CGAL_FOUND) - include_directories(${CGAL_INCLUDE_DIRS}) - add_definitions(${CGAL_DEFINITIONS}) - link_directories(${CGAL_LIBRARY_DIRS}) - endif() - --FIND_PACKAGE(VCG ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(VCG REQUIRED) - if(VCG_FOUND) - include_directories(${VCG_INCLUDE_DIRS}) - add_definitions(${VCG_DEFINITIONS}) -@@ -14,12 +14,10 @@ endif() - - set(CERES_LIBS "") - if(OpenMVS_USE_CERES) -- FIND_PACKAGE(CERES) -+ FIND_PACKAGE(Ceres REQUIRED) - if(CERES_FOUND) - include_directories(${CERES_INCLUDE_DIRS}) - add_definitions(${CERES_DEFINITIONS}) -- else() -- set(OpenMVS_USE_CERES OFF) - endif() - endif() - -@@ -42,7 +40,8 @@ cxx_library_with_type_no_pch(MVS "Libs" "" "${cxx_default}" - set_target_pch(MVS Common.h) - - # Link its dependencies --TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} ${CGAL_LIBS} ${CUDA_CUDA_LIBRARY}) -+TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} CGAL::CGAL ${CUDA_CUDA_LIBRARY}) -+TARGET_INCLUDE_DIRECTORIES(MVS PUBLIC $ $) - - # Install - SET_TARGET_PROPERTIES(MVS PROPERTIES -diff --git a/libs/Math/CMakeLists.txt b/libs/Math/CMakeLists.txt -index d592bd0..f1fe4c6 100644 ---- a/libs/Math/CMakeLists.txt -+++ b/libs/Math/CMakeLists.txt -@@ -35,6 +35,7 @@ set_target_pch(Math Common.h) - - # Link its dependencies - TARGET_LINK_LIBRARIES(Math Common) -+TARGET_INCLUDE_DIRECTORIES(Math PUBLIC $ $) - - # Install - INSTALL(FILES ${LIBRARY_FILES_H} DESTINATION "${INSTALL_INCLUDE_DIR}/Math" COMPONENT dev) + +diff --git a/apps/InterfaceMetashape/InterfaceMetashape.cpp b/apps/InterfaceMetashape/InterfaceMetashape.cpp +index 1157bf29..73563b3c 100644 +--- a/apps/InterfaceMetashape/InterfaceMetashape.cpp ++++ b/apps/InterfaceMetashape/InterfaceMetashape.cpp +@@ -246,7 +246,7 @@ bool ParseImageListXML(Scene& scene, PlatformDistCoeffs& pltDistCoeffs, size_t& + tinyxml2::XMLElement* elem; + const size_t nLen(pStream->getSize()); + String strCameras; strCameras.resize(nLen); +- pStream->read(&strCameras[0], nLen); ++ pStream->read(strCameras.data(), nLen); + tinyxml2::XMLDocument doc; + doc.Parse(strCameras.c_str(), nLen); + if (doc.ErrorID() != tinyxml2::XML_SUCCESS) diff --git a/external_imported/vcpkg/ports/openmvs/no-absolute-paths.patch b/external_imported/vcpkg/ports/openmvs/no-absolute-paths.patch new file mode 100644 index 000000000..9ba0a9753 --- /dev/null +++ b/external_imported/vcpkg/ports/openmvs/no-absolute-paths.patch @@ -0,0 +1,42 @@ +diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in +index 53a4a5cc..97735396 100644 +--- a/MvgMvsPipeline.py ++++ b/MvgMvsPipeline.py.in +@@ -109,14 +109,14 @@ def find(afile): + return d + return None + +- ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Try to find openMVG camera sensor database +-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt" +-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE) ++CAMERA_SENSOR_DB_FILE = os.path.join(OPENMVG_BIN, 'sensor_width_camera_database.txt') ++CAMERA_SENSOR_DB_DIRECTORY = OPENMVS_BIN + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: + +diff --git a/MvgOptimizeSfM.py b/MvgOptimizeSfM.py.in +index 930d6805..6eb672c1 100644 +--- a/MvgOptimizeSfM.py ++++ b/MvgOptimizeSfM.py.in +@@ -56,9 +56,10 @@ def launch(cmdline): + sys.exit('\r\nProcess canceled by user, all files remains') + + ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: diff --git a/external_imported/vcpkg/ports/openmvs/portfile.cmake b/external_imported/vcpkg/ports/openmvs/portfile.cmake index f7232ee1b..1bbcee898 100644 --- a/external_imported/vcpkg/ports/openmvs/portfile.cmake +++ b/external_imported/vcpkg/ports/openmvs/portfile.cmake @@ -3,18 +3,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS - REF v1.1.1 - SHA512 eeb15d0756f12136a1e7938a0eed97024d564eef3355f3bb6abf6c681e38919011e1a133d89ca360f463e7fed5feb8e0138a0fe9be4c25b6a13ba4b042aef3eb + REF v2.0.1 + SHA512 f1c1708d6e5c9424b95fb71c88ca510c70a4b11711079f12f173ecf190b009a977f7aa11f49a0b2e634a307f2732e4c33d9cd37d727ba60da99051876adb7d1e HEAD_REF master PATCHES fix-build.patch - fix-build-boost-1_77_0.patch + no-absolute-paths.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cuda OpenMVS_USE_CUDA openmp OpenMVS_USE_OPENMP + nonfree OpenMVS_USE_NONFREE + ceres OpenMVS_USE_CERES ) file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake") @@ -24,8 +26,6 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} - -DOpenMVS_USE_NONFREE=ON - -DOpenMVS_USE_CERES=OFF -DOpenMVS_USE_FAST_FLOAT2INT=ON -DOpenMVS_USE_FAST_INVSQRT=OFF -DOpenMVS_USE_FAST_CBRT=ON @@ -42,20 +42,22 @@ vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() -file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE) -string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/DensifyPointCloud" "tools/openmvs/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/ReconstructMesh" "tools/openmvs/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/RefineMesh" "tools/openmvs/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/TextureMesh" "tools/openmvs/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/Viewer" "tools/openmvs/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}") +vcpkg_cmake_config_fixup() +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake TARGETS_CMAKE) +string(REPLACE "bin/InterfaceCOLMAP" "tools/${PORT}/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceMetashape" "tools/${PORT}/InterfaceMetashape" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceVisualSFM" "tools/${PORT}/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/DensifyPointCloud" "tools/${PORT}/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/ReconstructMesh" "tools/${PORT}/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/RefineMesh" "tools/${PORT}/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/TextureMesh" "tools/${PORT}/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/Viewer" "tools/${PORT}/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}") vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES DensifyPointCloud InterfaceCOLMAP + InterfaceMetashape InterfaceVisualSFM ReconstructMesh RefineMesh @@ -67,6 +69,7 @@ set(OPENMVG_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/openmvg") set(OPENMVS_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/${PORT}") set(SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH "${OPENMVG_TOOLS_PATH}/sensor_width_camera_database.txt") configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgMvsPipeline.py" @ONLY) -file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file("${SOURCE_PATH}/MvgOptimizeSfM.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgOptimizeSfM.py" @ONLY) +file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/openmvs/vcpkg.json b/external_imported/vcpkg/ports/openmvs/vcpkg.json index 14a8c3e63..1d3ab2a3e 100644 --- a/external_imported/vcpkg/ports/openmvs/vcpkg.json +++ b/external_imported/vcpkg/ports/openmvs/vcpkg.json @@ -1,9 +1,9 @@ { "name": "openmvs", - "version": "1.1.1", - "port-version": 2, + "version": "2.0.1", "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", + "license": "AGPL-3.0-only", "dependencies": [ "boost-iostreams", "boost-program-options", @@ -32,15 +32,31 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], + "default-features": [ + "nonfree" + ], "features": { + "ceres": { + "description": "CERES support for openmvs", + "dependencies": [ + "ceres" + ] + }, "cuda": { "description": "CUDA support for openmvs", "dependencies": [ "cuda" ] }, + "nonfree": { + "description": "nonfree support for openmvs" + }, "openmp": { "description": "OpenMP support for openmvs" } diff --git a/external_imported/vcpkg/ports/openni2/portfile.cmake b/external_imported/vcpkg/ports/openni2/portfile.cmake index 0864fda61..e06d555e8 100644 --- a/external_imported/vcpkg/ports/openni2/portfile.cmake +++ b/external_imported/vcpkg/ports/openni2/portfile.cmake @@ -1,7 +1,3 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Error: UWP builds are currently not supported.") -endif() - find_path(COR_H_PATH cor.h) if(COR_H_PATH MATCHES "NOTFOUND") message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") @@ -21,10 +17,6 @@ vcpkg_from_github( replace_environment_variable.patch ) -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR) configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY) @@ -44,14 +36,14 @@ endif() set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") -set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config) +set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config") set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") file( INSTALL "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm + "${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm" ) file( @@ -59,35 +51,35 @@ file( "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h" "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Driver + "${CURRENT_PACKAGES_DIR}/include/openni2/Driver" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm + "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86 + "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX + "${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Win32 + "${CURRENT_PACKAGES_DIR}/include/openni2/Win32" ) file( @@ -105,22 +97,24 @@ file( "${SOURCE_INCLUDE_PATH}/PS1080.h" "${SOURCE_INCLUDE_PATH}/PSLink.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2 + "${CURRENT_PACKAGES_DIR}/include/openni2" ) file( INSTALL "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +endif() file( INSTALL @@ -131,23 +125,24 @@ file( "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers" ) file( INSTALL "${SOURCE_CONFIG_PATH}/OpenNI.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin/OpenNI2 + "${CURRENT_PACKAGES_DIR}/bin/OpenNI2" ) file( INSTALL "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/bin" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll" @@ -157,22 +152,25 @@ file( "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers" ) +endif() file( INSTALL "${SOURCE_CONFIG_PATH}/OpenNI.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2 + "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/debug/bin" ) +endif() file( INSTALL @@ -183,7 +181,7 @@ file( "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers" ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -201,13 +199,14 @@ file( "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe" "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe" DESTINATION - ${CURRENT_PACKAGES_DIR}/tools/openni2 + "${CURRENT_PACKAGES_DIR}/tools/openni2" ) # Deploy Script -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/OpenNI2) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/OpenNI2") +if(NOT VCPKG_BUILD_TYPE) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2") +endif() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/openni2/vcpkg.json b/external_imported/vcpkg/ports/openni2/vcpkg.json index 5110fbc07..c0aa59876 100644 --- a/external_imported/vcpkg/ports/openni2/vcpkg.json +++ b/external_imported/vcpkg/ports/openni2/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openni2", - "version-string": "2.2.0.33", - "port-version": 13, + "version": "2.2.0.33", + "port-version": 14, "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", "homepage": "https://github.com/OpenNI/OpenNI2", - "supports": "!uwp", + "license": "Apache-2.0", + "supports": "!uwp & !staticcrt", "dependencies": [ "kinectsdk1" ] diff --git a/external_imported/vcpkg/ports/openscap/fix-build.patch b/external_imported/vcpkg/ports/openscap/fix-build.patch index 57d22946b..e40932ecb 100644 --- a/external_imported/vcpkg/ports/openscap/fix-build.patch +++ b/external_imported/vcpkg/ports/openscap/fix-build.patch @@ -27,7 +27,7 @@ index 4de5b57..5f483a3 100644 + check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) + check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) +else() -+ set(THREADS_USE_PTHREADS_WIN32 -pthread) ++ find_package(Threads REQUIRED) +endif() + +# OpenSSL diff --git a/external_imported/vcpkg/ports/openscap/portfile.cmake b/external_imported/vcpkg/ports/openscap/portfile.cmake index 70f55be56..243e30d41 100644 --- a/external_imported/vcpkg/ports/openscap/portfile.cmake +++ b/external_imported/vcpkg/ports/openscap/portfile.cmake @@ -7,21 +7,22 @@ vcpkg_from_github( PATCHES fix-build.patch ) +file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake") if ("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - docs ENABLE_DOCS - tests ENABLE_TESTS - util ENABLE_OSCAP_UTIL - python ENABLE_PYTHON3 + FEATURES + docs ENABLE_DOCS + tests ENABLE_TESTS + util ENABLE_OSCAP_UTIL + python ENABLE_PYTHON3 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPYTHON_EXECUTABLE=${PYTHON3} -DENABLE_PERL=OFF @@ -33,13 +34,15 @@ vcpkg_configure_cmake( -DENABLE_OSCAP_UTIL_VM=OFF -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -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_copy_pdbs() +vcpkg_fixup_pkgconfig() #Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/openscap/vcpkg.json b/external_imported/vcpkg/ports/openscap/vcpkg.json index 3bab620ed..d6ef5c4bf 100644 --- a/external_imported/vcpkg/ports/openscap/vcpkg.json +++ b/external_imported/vcpkg/ports/openscap/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openscap", - "version-string": "1.3.1", - "port-version": 1, + "version": "1.3.1", + "port-version": 3, "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", + "license": "LGPL-2.1-or-later", "dependencies": [ "curl", "glib", @@ -14,6 +15,10 @@ "openssl", "pcre2", "pthread", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ], "features": { diff --git a/external_imported/vcpkg/ports/openssl/portfile.cmake b/external_imported/vcpkg/ports/openssl/portfile.cmake index 4a51777ab..f4adebca3 100644 --- a/external_imported/vcpkg/ports/openssl/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/portfile.cmake @@ -11,13 +11,18 @@ It can be installed on alpine systems via apk add linux-headers.]] ) endif() -set(OPENSSL_VERSION 3.0.2) +set(OPENSSL_VERSION 3.0.5) -vcpkg_download_distfile( - ARCHIVE - URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" - FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03 +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) + set(OPENSSL_PATCHES "${CMAKE_CURRENT_LIST_DIR}/windows/flags.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openssl/openssl + REF openssl-${OPENSSL_VERSION} + SHA512 e426f2d48dcd87ad938b246cea69988710198c3ed2f5bb9065aa9e74492161b056336f5b1f29be64e70dfd86a77808fe727ebb46eae10331c76f1ff08e341133 + PATCHES ${OPENSSL_PATCHES} ) vcpkg_find_acquire_program(PERL) diff --git a/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt b/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt index c375f0f35..75c21805a 100644 --- a/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt +++ b/external_imported/vcpkg/ports/openssl/unix/CMakeLists.txt @@ -23,7 +23,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() # disable that makes linkage error (e.g. require stderr usage) - list(APPEND DISABLES no-stdio no-ui no-asm) + list(APPEND DISABLES no-ui no-asm) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") set(PLATFORM darwin64-arm64-cc) @@ -84,11 +84,6 @@ endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") -if(CMAKE_HOST_WIN32) - file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}") -else() - file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}") -endif() set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr") if(NOT IOS) @@ -127,7 +122,7 @@ if(BUILD_SHARED_LIBS) list(APPEND BIN_EXTS ${BIN_EXT}) list(APPEND LIB_EXTS ${LIB_EXT}) else() - set(SHARED no-shared) + set(SHARED no-shared no-module) set(LIB_EXTS a) endif() set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc") @@ -227,6 +222,7 @@ else() ${DISABLES} ${PLATFORM} "--prefix=${CMAKE_INSTALL_PREFIX}" + "--libdir=${CMAKE_INSTALL_PREFIX}/lib" "--openssldir=/etc/ssl" ${CFLAGS} VERBATIM @@ -263,7 +259,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" - "${BUILDDIR}/libcrypto.1.1.dylib" + "${BUILDDIR}/libcrypto.${SHLIB_VERSION}.dylib" COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib" "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib" "${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib" diff --git a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake index c1c2b0ecb..319b7e390 100644 --- a/external_imported/vcpkg/ports/openssl/unix/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/unix/portfile.cmake @@ -1,9 +1,3 @@ -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF ${OPENSSL_VERSION} -) - if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") @@ -18,7 +12,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" OPTIONS - -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} + -DSOURCE_PATH=${SOURCE_PATH} -DPERL=${PERL} -DMAKE=${MAKE} -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY} @@ -35,4 +29,4 @@ foreach(HEADER ${HEADERS}) endforeach() file(INSTALL ${RESOLVED_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/openssl") -file(INSTALL "${MASTER_COPY_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/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake b/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake index 628380631..bb8379dce 100644 --- a/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/uwp/portfile.cmake @@ -7,11 +7,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENSSL_SHARED shared) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") diff --git a/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in index ee16a896b..123364f9a 100644 --- a/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -5,7 +5,7 @@ cmake_policy(SET CMP0057 NEW) set(OPENSSL_VERSION_MAJOR 3) set(OPENSSL_VERSION_MINOR 0) -set(OPENSSL_VERSION_FIX 2) +set(OPENSSL_VERSION_FIX 5) if(OPENSSL_USE_STATIC_LIBS) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") diff --git a/external_imported/vcpkg/ports/openssl/vcpkg.json b/external_imported/vcpkg/ports/openssl/vcpkg.json index dfde151f1..b40155bde 100644 --- a/external_imported/vcpkg/ports/openssl/vcpkg.json +++ b/external_imported/vcpkg/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", - "version": "3.0.2", - "port-version": 2, + "version": "3.0.5", + "port-version": 4, "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", @@ -13,6 +13,11 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "windows & !mingw & !uwp" } ] } diff --git a/external_imported/vcpkg/ports/openssl/windows/flags.patch b/external_imported/vcpkg/ports/openssl/windows/flags.patch new file mode 100644 index 000000000..69b203c0d --- /dev/null +++ b/external_imported/vcpkg/ports/openssl/windows/flags.patch @@ -0,0 +1,35 @@ +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 66bc81d..2364633 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -1302,7 +1302,7 @@ my %targets = ( + inherit_from => [ "BASE_Windows" ], + template => 1, + CC => "cl", +- CPP => '"$(CC)" /EP /C', ++ CPP => '$(CC) /EP /C', + CFLAGS => "/W3 /wd4090 /nologo", + coutflag => "/Fo", + LD => "link", +diff --git a/Configure b/Configure +index 8b234f6..e031768 100644 +--- a/Configure ++++ b/Configure +@@ -680,7 +680,7 @@ my $list_separator_re = + # (we supported those before the change to "make variable" support. + my %user = ( + AR => env('AR'), +- ARFLAGS => [], ++ ARFLAGS => [ env('ARFLAGS') || () ], + AS => undef, + ASFLAGS => [], + CC => env('CC'), +@@ -693,7 +693,7 @@ my %user = ( + CPPINCLUDES => [], # Alternative for -I + CROSS_COMPILE => env('CROSS_COMPILE'), + HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), +- LD => undef, ++ LD => env('LD'), + LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, + LDLIBS => [ env('LDLIBS') || () ], # -l + MT => undef, diff --git a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake index 5cd487300..8d3b668ed 100644 --- a/external_imported/vcpkg/ports/openssl/windows/portfile.cmake +++ b/external_imported/vcpkg/ports/openssl/windows/portfile.cmake @@ -1,25 +1,28 @@ -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") vcpkg_find_acquire_program(JOM) -set(OPENSSL_SHARED no-shared) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENSSL_SHARED shared) +else() + set(OPENSSL_SHARED no-shared no-module) endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") +set(ENV{CXX} "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") +set(ENV{AR} "${VCPKG_DETECTED_CMAKE_AR}") +set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}") + set(CONFIGURE_OPTIONS enable-static-engine enable-capieng no-ssl2 no-tests - -utf-8 ${OPENSSL_SHARED} ) @@ -50,23 +53,40 @@ set(OPENSSL_MAKEFILE "makefile") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") +# Clang always uses /Z7; Patching /Zi /Fd out of openssl requires more work. +if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(OPENSSL_BUILD_MAKES_PDBS OFF) +else() + set(OPENSSL_BUILD_MAKES_PDBS ON) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # Copy openssl sources. message(STATUS "Copying openssl release source files...") - file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) - foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - endforeach() + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + message(STATUS "Copying openssl release source files... done") set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) + set(OPENSSLDIR_RELEASE "${CURRENT_PACKAGES_DIR}") + + # Remove install rules for pdbs if they don't exist + if(NOT OPENSSL_BUILD_MAKES_PDBS) + file(READ "${SOURCE_PATH_RELEASE}/Configurations/windows-makefile.tmpl" contents) + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" \$\(INSTALL_(ENGINE|MODULE|SHLIB|PROGRAM)PDBS\)]] "echo " contents "${contents}") + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" ossl_static.pdb]] "echo " contents "${contents}") + file(WRITE "${SOURCE_PATH_RELEASE}/Configurations/windows-makefile.tmpl" "${contents}") + endif() + + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}") message(STATUS "Configure ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" LOGNAME configure-perl-${TARGET_TRIPLET}-rel ) message(STATUS "Configure ${TARGET_TRIPLET}-rel done") @@ -74,16 +94,16 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Build ${TARGET_TRIPLET}-rel") # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. - make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) + make_directory("${SOURCE_PATH_RELEASE}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log" ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" LOGNAME build-${TARGET_TRIPLET}-rel-1) message(STATUS "Build ${TARGET_TRIPLET}-rel done") @@ -93,19 +113,30 @@ endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") # Copy openssl sources. message(STATUS "Copying openssl debug source files...") - file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) - foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - endforeach() + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + message(STATUS "Copying openssl debug source files... done") set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) + # Remove install rules for pdbs if they don't exist + if(NOT OPENSSL_BUILD_MAKES_PDBS) + file(READ "${SOURCE_PATH_DEBUG}/Configurations/windows-makefile.tmpl" contents) + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" \$\(INSTALL_(ENGINE|MODULE|SHLIB|PROGRAM)PDBS\)]] "echo " contents "${contents}") + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" ossl_static.pdb]] "echo " contents "${contents}") + file(WRITE "${SOURCE_PATH_DEBUG}/Configurations/windows-makefile.tmpl" "${contents}") + endif() + + set(OPENSSLDIR_DEBUG "${CURRENT_PACKAGES_DIR}/debug") + + set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{ARFLAGS} "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}") message(STATUS "Configure ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" LOGNAME configure-perl-${TARGET_TRIPLET}-dbg ) message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") @@ -114,19 +145,21 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log" ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" LOGNAME build-${TARGET_TRIPLET}-dbg-1) message(STATUS "Build ${TARGET_TRIPLET}-dbg done") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") + endif() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") @@ -139,10 +172,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") + endif() + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules") diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake index aead2761e..1f1614051 100644 --- a/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/opentelemetry-cpp/portfile.cmake @@ -2,17 +2,11 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if ("etw" IN_LIST FEATURES) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX") - message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'") - endif() -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.2.0 - SHA512 5491fc21074f86d3b4ad5e8f7b16168b736491952942b7821984c4564fcb26f73630d83fe74ee7878848240a1b511f893e079154f42013bfe3bf1fd03c114c6d + REF v1.5.0 + SHA512 a506973223c49531d4b0c3febf5734dfe2e44c22f8854ed96935cda0783a14d0819cc3dbb2d3f8373f960f27acf78aafc777ee76aeb14828df9c4b4434e4fe6f HEAD_REF main ) @@ -29,16 +23,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. if(WITH_OTLP) - set(OTEL_PROTO_VERSION "0.11.0") + set(OTEL_PROTO_VERSION "0.17.0") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92 + SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9 ) - vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) - file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto) - file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto) + vcpkg_extract_source_archive("${ARCHIVE}" "${SOURCE_PATH}/third_party") + file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") + file(RENAME "${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION}" "${SOURCE_PATH}/third_party/opentelemetry-proto") endif() vcpkg_cmake_configure( @@ -46,11 +40,13 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DWITH_EXAMPLES=OFF + -DWITH_METRICS_PREVIEW=ON + -DWITH_LOGS_PREVIEW=ON ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opentelemetry-cpp) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json index 1eb422a22..f34c950a1 100644 --- a/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/opentelemetry-cpp/vcpkg.json @@ -1,14 +1,14 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.2.0", + "version-semver": "1.5.0", + "port-version": 1, "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." ], "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", "license": "Apache-2.0", - "supports": "!(windows & !static)", "dependencies": [ "curl", "nlohmann-json", @@ -26,7 +26,8 @@ "description": "Whether to include the Elasticsearch Client in the SDK" }, "etw": { - "description": "Whether to include the ETW Exporter in the SDK" + "description": "Whether to include the ETW Exporter in the SDK", + "supports": "windows" }, "jaeger": { "description": "Whether to include the Jaeger exporter", diff --git a/external_imported/vcpkg/ports/opentracing/portfile.cmake b/external_imported/vcpkg/ports/opentracing/portfile.cmake index 9a6312e8f..537b348ee 100644 --- a/external_imported/vcpkg/ports/opentracing/portfile.cmake +++ b/external_imported/vcpkg/ports/opentracing/portfile.cmake @@ -16,16 +16,16 @@ vcpkg_from_github( repair_mojibake.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DENABLE_LINTING=OFF + -DBUILD_TESTING=OFF ${LOCAL_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenTracing) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenTracing) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/opentracing/vcpkg.json b/external_imported/vcpkg/ports/opentracing/vcpkg.json index 8061bc3d9..e14d49d0b 100644 --- a/external_imported/vcpkg/ports/opentracing/vcpkg.json +++ b/external_imported/vcpkg/ports/opentracing/vcpkg.json @@ -1,8 +1,19 @@ { "name": "opentracing", "version": "1.6.0", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the OpenTracing API", "homepage": "https://opentracing.io", - "supports": "!uwp" + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/openvdb/portfile.cmake b/external_imported/vcpkg/ports/openvdb/portfile.cmake index 6016632fa..25ede8993 100644 --- a/external_imported/vcpkg/ports/openvdb/portfile.cmake +++ b/external_imported/vcpkg/ports/openvdb/portfile.cmake @@ -39,7 +39,9 @@ vcpkg_cmake_configure( -DOPENVDB_BUILD_UNITTESTS=OFF -DOPENVDB_BUILD_PYTHON_MODULE=OFF -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF + -DUSE_EXR=ON -DUSE_GLFW3=ON + -DUSE_IMATH_HALF=ON -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED} -DOPENVDB_BUILD_VDB_PRINT=${OPENVDB_BUILD_TOOLS} diff --git a/external_imported/vcpkg/ports/openvdb/vcpkg.json b/external_imported/vcpkg/ports/openvdb/vcpkg.json index 7acb002f7..2b571ace7 100644 --- a/external_imported/vcpkg/ports/openvdb/vcpkg.json +++ b/external_imported/vcpkg/ports/openvdb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openvdb", "version": "9.0.0", + "port-version": 1, "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", @@ -14,7 +15,7 @@ "boost-system", "boost-thread", "boost-uuid", - "ilmbase", + "imath", "openexr", "tbb", { diff --git a/external_imported/vcpkg/ports/openvpn3/CMakeLists.txt b/external_imported/vcpkg/ports/openvpn3/CMakeLists.txt index 58514cbb0..b4943038c 100644 --- a/external_imported/vcpkg/ports/openvpn3/CMakeLists.txt +++ b/external_imported/vcpkg/ports/openvpn3/CMakeLists.txt @@ -20,13 +20,21 @@ endif() add_library(ovpncli client/ovpncli.cpp) target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB}) +target_include_directories(ovpncli PUBLIC $ $) + install( TARGETS ovpncli + EXPORT unofficial-openvpnConfig RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +INSTALL(EXPORT unofficial-openvpnConfig + NAMESPACE unofficial::openvpn3:: + DESTINATION share/unofficial-openvpn +) + if(BUILD_TOOL) add_executable(cli test/ovpncli/cli.cpp) target_compile_definitions(cli PRIVATE -DTAP_WIN_COMPONENT_ID=tap0901) diff --git a/external_imported/vcpkg/ports/openvpn3/portfile.cmake b/external_imported/vcpkg/ports/openvpn3/portfile.cmake index e638f1a42..69fd68ee5 100644 --- a/external_imported/vcpkg/ports/openvpn3/portfile.cmake +++ b/external_imported/vcpkg/ports/openvpn3/portfile.cmake @@ -3,24 +3,23 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenVPN/openvpn3 - REF release/3.4.1 - SHA512 2d0a7d2d48047c969ba1cb49b34d51c85dd82ae97296d7c096ead13a8e7cc69fa3908262228e29d93f60b7273814d8ef5a402a5d401cd7f91370868d5d308678 + REF release/3.7 + SHA512 de95bd2b1a01179aa81e1612be175540c2486b856f66880372d09966655bbbadd71d874ed49b032566dde2896207bc76298c5cfcf73e86272c04d5aaa977d660 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(COPY ${SOURCE_PATH}/openvpn DESTINATION ${CURRENT_PACKAGES_DIR}/include/) -file(COPY ${SOURCE_PATH}/client/ovpncli.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/openvpn/) +file(COPY "${SOURCE_PATH}/openvpn" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/client/ovpncli.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/openvpn") -file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/openvpn/*) +file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/openvpn/*") foreach(HEADER IN LISTS HEADERS) file(READ "${HEADER}" _contents) string(REPLACE "defined(USE_ASIO)" "1" _contents "${_contents}") @@ -30,6 +29,9 @@ foreach(HEADER IN LISTS HEADERS) file(WRITE "${HEADER}" "${_contents}") endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openvpn CONFIG_PATH share/unofficial-openvpn) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL - ${SOURCE_PATH}/COPYRIGHT.AGPLV3 - DESTINATION ${CURRENT_PACKAGES_DIR}/share/openvpn3 RENAME copyright) + "${SOURCE_PATH}/COPYRIGHT.AGPLV3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/openvpn3/vcpkg.json b/external_imported/vcpkg/ports/openvpn3/vcpkg.json index ea718ed62..cac878896 100644 --- a/external_imported/vcpkg/ports/openvpn3/vcpkg.json +++ b/external_imported/vcpkg/ports/openvpn3/vcpkg.json @@ -1,14 +1,24 @@ { "name": "openvpn3", - "version-string": "3.4.1", - "port-version": 2, + "version": "3.7.0", + "port-version": 1, "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", + "homepage": "https://openvpn.net", + "license": "AGPL-3.0", "dependencies": [ "asio", "mbedtls", { "name": "tap-windows6", "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch b/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch new file mode 100644 index 000000000..e513b6199 --- /dev/null +++ b/external_imported/vcpkg/ports/opus/fix-pkgconfig-version.patch @@ -0,0 +1,13 @@ +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() + + function(get_package_version PACKAGE_VERSION) ++ set(PACKAGE_VERSION "0" CACHE STRING "opus package version") ++ return() + find_package(Git) + if(Git_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") + execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v*" diff --git a/external_imported/vcpkg/ports/opus/portfile.cmake b/external_imported/vcpkg/ports/opus/portfile.cmake index b2e1e3807..02f784ed3 100644 --- a/external_imported/vcpkg/ports/opus/portfile.cmake +++ b/external_imported/vcpkg/ports/opus/portfile.cmake @@ -1,43 +1,46 @@ vcpkg_from_github( - OUT_SOURCE_PATH - SOURCE_PATH - REPO - xiph/opus - REF - 5c94ec3205c30171ffd01056f5b4622b7c0ab54c - SHA512 - 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea - HEAD_REF - master) + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/opus + REF 5c94ec3205c30171ffd01056f5b4622b7c0ab54c + SHA512 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea + HEAD_REF master + PATCHES fix-pkgconfig-version.patch +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - avx AVX_SUPPORTED + FEATURES + avx AVX_SUPPORTED ) if(VCPKG_TARGET_IS_MINGW) - set(STACK_PROTECTOR OFF) - string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") - string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") + set(STACK_PROTECTOR OFF) + string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") + string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") +elseif(VCPKG_TARGET_IS_EMSCRIPTEN) + set(STACK_PROTECTOR OFF) else() - set(STACK_PROTECTOR ON) + set(STACK_PROTECTOR ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} - PREFER_NINJA) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus) + -DPACKAGE_VERSION=1.3.1 + -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} + -DOPUS_INSTALL_PKG_CONFIG_MODULE=ON + -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=ON + -DOPUS_BUILD_PROGRAMS=OFF + -DOPUS_BUILD_TESTING=OFF +) +vcpkg_cmake_install() vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Opus) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) -file(INSTALL - ${SOURCE_PATH}/COPYING - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/opus - RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/opus/vcpkg.json b/external_imported/vcpkg/ports/opus/vcpkg.json index f1ea43d69..8f4eee903 100644 --- a/external_imported/vcpkg/ports/opus/vcpkg.json +++ b/external_imported/vcpkg/ports/opus/vcpkg.json @@ -1,9 +1,20 @@ { "name": "opus", - "version-string": "1.3.1", - "port-version": 6, + "version": "1.3.1", + "port-version": 8, "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "avx": { "description": "Builds the library with avx instruction set" diff --git a/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch b/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch index fb7c59144..fdabe356d 100644 --- a/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch +++ b/external_imported/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch @@ -1,16 +1,16 @@ diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 3d4a162..6926bc3 100644 +index d4cd035..0701a7d 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -230,12 +230,13 @@ endif(BUILD_LIBHDFSPP) +@@ -239,12 +239,13 @@ endif(BUILD_LIBHDFSPP) add_library (orc STATIC ${SOURCE_FILES}) target_link_libraries (orc -- protobuf -- zlib -- snappy -- lz4 -- zstd +- orc::protobuf +- orc::zlib +- orc::snappy +- orc::lz4 +- orc::zstd - ${LIBHDFSPP_LIBRARIES} + PRIVATE + protobuf::libprotobuf @@ -23,10 +23,10 @@ index 3d4a162..6926bc3 100644 install(TARGETS orc DESTINATION lib) diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..56ffd74 100644 +index 6919847..ad52cf2 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -59,8 +59,8 @@ endif () +@@ -66,8 +66,8 @@ endif () # ---------------------------------------------------------------------- # Snappy @@ -37,18 +37,23 @@ index 3a35325..56ffd74 100644 set(SNAPPY_VENDORED FALSE) else () set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") -@@ -78,10 +78,6 @@ else () +@@ -90,15 +90,6 @@ else () set(SNAPPY_VENDORED TRUE) endif () --include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) --add_library (snappy STATIC IMPORTED) --set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) +-add_library (orc_snappy INTERFACE) +-add_library (orc::snappy ALIAS orc_snappy) +-if (ORC_PREFER_STATIC_SNAPPY AND ${SNAPPY_STATIC_LIB}) +- target_link_libraries(orc_snappy INTERFACE ${SNAPPY_STATIC_LIB}) +-else () +- target_link_libraries(orc_snappy INTERFACE ${SNAPPY_LIBRARY}) +-endif () +-target_include_directories (orc_snappy SYSTEM INTERFACE ${SNAPPY_INCLUDE_DIR}) - if (SNAPPY_VENDORED) - add_dependencies (snappy snappy_ep) + add_dependencies (orc_snappy snappy_ep) if (INSTALL_VENDORED_LIBS) -@@ -93,7 +89,7 @@ endif () +@@ -110,7 +101,7 @@ endif () # ---------------------------------------------------------------------- # ZLIB @@ -57,62 +62,86 @@ index 3a35325..56ffd74 100644 find_package (ZLIB REQUIRED) set(ZLIB_VENDORED FALSE) else () -@@ -120,10 +116,6 @@ else () +@@ -142,15 +133,6 @@ else () set(ZLIB_VENDORED TRUE) endif () --include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) --add_library (zlib STATIC IMPORTED) --set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) +-add_library (orc_zlib INTERFACE) +-add_library (orc::zlib ALIAS orc_zlib) +-if (ORC_PREFER_STATIC_ZLIB AND ${ZLIB_STATIC_LIB}) +- target_link_libraries (orc_zlib INTERFACE ${ZLIB_STATIC_LIB}) +-else () +- target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARY}) +-endif () +-target_include_directories (orc_zlib SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR}) - if (ZLIB_VENDORED) - add_dependencies (zlib zlib_ep) + add_dependencies (orc_zlib zlib_ep) if (INSTALL_VENDORED_LIBS) -@@ -135,8 +127,8 @@ endif () +@@ -162,8 +144,8 @@ endif () # ---------------------------------------------------------------------- # Zstd -if (NOT "${ZSTD_HOME}" STREQUAL "") - find_package (ZSTD REQUIRED) +if (1) -+ find_package (zstd CONFIG REQUIRED) ++ find_package (ZSTD CONFIG REQUIRED) set(ZSTD_VENDORED FALSE) else () set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") -@@ -169,10 +161,6 @@ else () +@@ -201,15 +183,6 @@ else () set(ZSTD_VENDORED TRUE) endif () --include_directories (SYSTEM ${ZSTD_INCLUDE_DIR}) --add_library (zstd STATIC IMPORTED) --set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB}) +-add_library (orc_zstd INTERFACE) +-add_library (orc::zstd ALIAS orc_zstd) +-if (ORC_PREFER_STATIC_ZSTD AND ${ZSTD_STATIC_LIB}) +- target_link_libraries (orc_zstd INTERFACE ${ZSTD_STATIC_LIB}) +-else () +- target_link_libraries (orc_zstd INTERFACE ${ZSTD_LIBRARY}) +-endif () +-target_include_directories (orc_zstd SYSTEM INTERFACE ${ZSTD_INCLUDE_DIR}) - if (ZSTD_VENDORED) - add_dependencies (zstd zstd_ep) + add_dependencies (orc_zstd zstd_ep) if (INSTALL_VENDORED_LIBS) -@@ -184,8 +172,8 @@ endif () +@@ -221,8 +194,8 @@ endif () # ---------------------------------------------------------------------- # LZ4 -if (NOT "${LZ4_HOME}" STREQUAL "") - find_package (LZ4 REQUIRED) +if (1) -+ find_package (lz4 CONFIG REQUIRED) ++ find_package (LZ4 CONFIG REQUIRED) set(LZ4_VENDORED FALSE) else () set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") -@@ -211,10 +199,6 @@ else () +@@ -253,15 +226,6 @@ else () set(LZ4_VENDORED TRUE) endif () --include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) --add_library (lz4 STATIC IMPORTED) --set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) +-add_library (orc_lz4 INTERFACE) +-add_library (orc::lz4 ALIAS orc_lz4) +-if (ORC_PREFER_STATIC_LZ4 AND ${LZ4_STATIC_LIB}) +- target_link_libraries (orc_lz4 INTERFACE ${LZ4_STATIC_LIB}) +-else () +- target_link_libraries (orc_lz4 INTERFACE ${LZ4_LIBRARY}) +-endif () +-target_include_directories (orc_lz4 SYSTEM INTERFACE ${LZ4_INCLUDE_DIR}) - if (LZ4_VENDORED) - add_dependencies (lz4 lz4_ep) + add_dependencies (orc_lz4 lz4_ep) if (INSTALL_VENDORED_LIBS) -@@ -288,8 +272,8 @@ endif () +@@ -273,7 +237,7 @@ endif () + # ---------------------------------------------------------------------- + # IANA - Time Zone Database + +-if (WIN32) ++if (WIN32 AND TEST_VALGRIND_MEMCHECK) + SET(CURRENT_TZDATA_FILE "") + SET(CURRENT_TZDATA_SHA512 "") + File(DOWNLOAD "https://ftp.osuosl.org/pub/cygwin/noarch/release/tzdata/sha512.sum" ${CMAKE_CURRENT_BINARY_DIR}/sha512.sum) +@@ -372,8 +336,8 @@ endif () # ---------------------------------------------------------------------- # Protobuf @@ -123,40 +152,41 @@ index 3a35325..56ffd74 100644 set(PROTOBUF_VENDORED FALSE) else () set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") -@@ -327,12 +311,6 @@ endif () - - include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) - --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) -- --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +@@ -421,19 +385,7 @@ add_library (orc::protobuf ALIAS orc_protobuf) + add_library (orc_protoc INTERFACE) + add_library (orc::protoc ALIAS orc_protoc) + +-if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB}) +- target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB}) +-else () +- target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY}) +-endif() +-target_include_directories (orc_protobuf SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) - +-if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB}) +- target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB}) +-else () +- target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY}) +-endif() +-target_include_directories (orc_protoc SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) ++include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + if (PROTOBUF_VENDORED) - add_dependencies (protoc protobuf_ep) - add_dependencies (protobuf protobuf_ep) + add_dependencies (orc_protoc protobuf_ep) diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index f5a53ca..ec22e7a 100644 +index d55581b..701fd7c 100644 --- a/tools/src/CMakeLists.txt +++ b/tools/src/CMakeLists.txt -@@ -51,7 +51,6 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf - ${CMAKE_THREAD_LIBS_INIT} - ) - -@@ -92,7 +91,7 @@ target_link_libraries (csv-import +@@ -95,11 +95,7 @@ target_link_libraries (csv-import ) install(TARGETS - orc-contents - orc-metadata - orc-statistics + orc-scan + orc-memory +- timezone-dump + csv-import - DESTINATION bin) -+ orc-scan -+ orc-memory -+ csv-import + DESTINATION tools/orc) diff --git a/external_imported/vcpkg/ports/orc/0005-disable-tzdata.patch b/external_imported/vcpkg/ports/orc/0005-disable-tzdata.patch deleted file mode 100644 index 829bd18b1..000000000 --- a/external_imported/vcpkg/ports/orc/0005-disable-tzdata.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index ea39023..599d79a 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -67,6 +67,7 @@ target_link_libraries (create-test-files - protobuf - ) - -+if (ENABLE_TEST) - if (TEST_VALGRIND_MEMCHECK) - add_test (orc-test - valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test) -@@ -86,3 +87,4 @@ if (WIN32) - ENVIRONMENT "TZDIR=${TZDATA_DIR}" - ) - endif () -+endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..364470b 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -226,7 +226,7 @@ endif () - # ---------------------------------------------------------------------- - # IANA - Time Zone Database - --if (WIN32) -+if (WIN32 AND TEST_VALGRIND_MEMCHECK) - ExternalProject_Add(tzdata_ep - URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz" - URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D diff --git a/external_imported/vcpkg/ports/orc/fix-linux-error.patch b/external_imported/vcpkg/ports/orc/fix-linux-error.patch new file mode 100644 index 000000000..f4689501f --- /dev/null +++ b/external_imported/vcpkg/ports/orc/fix-linux-error.patch @@ -0,0 +1,21 @@ +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index ad52cf2..ed7ff28 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -145,7 +145,7 @@ endif () + # Zstd + + if (1) +- find_package (ZSTD CONFIG REQUIRED) ++ find_package (zstd CONFIG REQUIRED) + set(ZSTD_VENDORED FALSE) + else () + set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") +@@ -338,6 +338,7 @@ endif () + + if (1) + find_package (Protobuf CONFIG REQUIRED) ++ include_directories(${Protobuf_INCLUDE_DIRS}) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") diff --git a/external_imported/vcpkg/ports/orc/portfile.cmake b/external_imported/vcpkg/ports/orc/portfile.cmake index 722b6a10a..f8b8bb51a 100644 --- a/external_imported/vcpkg/ports/orc/portfile.cmake +++ b/external_imported/vcpkg/ports/orc/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc - REF 23ecc03e87548f6d6783c2d8af2b46672c52214c # rel/release-1.6.4 - SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e + REF 7ff749a4234c3db58d272a8fc1c7cc1860245692 # rel/release-1.7.6 + SHA512 1e7f0366530b691d7ea7ce671aa1e1a655cde2feb0fb0c3639da36ef565aceaf6f05e49a39c3c0ab7417dc324dc2cbb6e8babbf21f899ccb4cf5f0e63217afbf HEAD_REF master PATCHES 0003-dependencies-from-vcpkg.patch - 0005-disable-tzdata.patch + fix-linux-error.patch ) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") @@ -16,22 +16,28 @@ file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake") -if(CMAKE_HOST_WIN32) - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe) -else() - set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc) -endif() +set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_TOOLS OFF) + # when cross compiling, we can't run their test. however: + # - Windows doesn't support time_t < 0 => HAS_PRE_1970 test returns false + # - Windows doesn't support setenv => HAS_POST_2038 test fails to compile + set(time_t_checks "-DHAS_PRE_1970=OFF" "-DHAS_POST_2038=OFF") else() set(BUILD_TOOLS ON) + set(time_t_checks "") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS + ${time_t_checks} -DBUILD_TOOLS=${BUILD_TOOLS} -DBUILD_CPP_TESTS=OFF -DBUILD_JAVA=OFF @@ -40,25 +46,27 @@ vcpkg_configure_cmake( -DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE} -DSTOP_BUILD_ON_WARNING=OFF -DENABLE_TEST=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_TEST ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*) if(TOOLS) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/orc) + file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc") file(REMOVE ${TOOLS}) endif() -file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT BINS) - 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") -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}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/orc/vcpkg.json b/external_imported/vcpkg/ports/orc/vcpkg.json index 7f87b3c62..b8f09b1a2 100644 --- a/external_imported/vcpkg/ports/orc/vcpkg.json +++ b/external_imported/vcpkg/ports/orc/vcpkg.json @@ -1,14 +1,22 @@ { "name": "orc", - "version-string": "1.6.4", - "port-version": 2, + "version": "1.7.6", "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", + "license": "Apache-2.0", "dependencies": [ "gtest", "lz4", "protobuf", + { + "name": "protobuf", + "host": true + }, "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/external_imported/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch b/external_imported/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch deleted file mode 100644 index fd76db35b..000000000 --- a/external_imported/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt -index ab491c6..bee3d1f 100644 ---- a/applications/CMakeLists.txt -+++ b/applications/CMakeLists.txt -@@ -32,12 +32,16 @@ IF(DYNAMIC_OPENSCENEGRAPH) - ADD_SUBDIRECTORY(osgconv) - ADD_SUBDIRECTORY(osgfilecache) - ADD_SUBDIRECTORY(osgversion) -- ADD_SUBDIRECTORY(present3D) -+ if (NOT UNIX) -+ ADD_SUBDIRECTORY(present3D) -+ endif() - ELSE() - # need to define this on win32 or linker cries about _declspecs - ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) - - ADD_SUBDIRECTORY(osgversion) -- ADD_SUBDIRECTORY(present3D) -+ if (NOT UNIX) -+ ADD_SUBDIRECTORY(present3D) -+ endif() - ENDIF() - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 788e507..3c550bc 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -245,7 +245,7 @@ ELSE(DYNAMIC_OPENSCENEGRAPH) - - IF(OSG_BUILD_PLATFORM_IPHONE) - ADD_SUBDIRECTORY(osgviewerIPhone) -- ELSE() -+ ELSEIF (NOT UNIX) - ADD_SUBDIRECTORY(osgstaticviewer) - ENDIF() - diff --git a/external_imported/vcpkg/ports/osg/fix-curl.patch b/external_imported/vcpkg/ports/osg/fix-curl.patch deleted file mode 100644 index e95fbee5d..000000000 --- a/external_imported/vcpkg/ports/osg/fix-curl.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt -index cc459ff..370dbec 100644 ---- a/src/osgPlugins/curl/CMakeLists.txt -+++ b/src/osgPlugins/curl/CMakeLists.txt -@@ -23,11 +23,11 @@ SET(TARGET_H - - IF(ZLIB_FOUND) - SET(TARGET_LIBRARIES_VARS -- CURL_LIBRARY -+ CURL_LIBRARIES - ZLIB_LIBRARIES) - ELSE() - SET(TARGET_LIBRARIES_VARS -- CURL_LIBRARY) -+ CURL_LIBRARIES) - ENDIF() - - IF(WIN32 OR MINGW) diff --git a/external_imported/vcpkg/ports/osg/fix-dependency-coin.patch b/external_imported/vcpkg/ports/osg/fix-dependency-coin.patch deleted file mode 100644 index b04318683..000000000 --- a/external_imported/vcpkg/ports/osg/fix-dependency-coin.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 798b8b9..c975d78 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -740,7 +740,7 @@ ELSE() - # Common to all platforms except android: - FIND_PACKAGE(Freetype) - FIND_PACKAGE(ilmbase) -- FIND_PACKAGE(Inventor) -+ FIND_PACKAGE(coin CONFIG) - FIND_PACKAGE(Jasper) - FIND_PACKAGE(OpenEXR) - FIND_PACKAGE(OpenCascade) -diff --git a/src/osgPlugins/Inventor/CMakeLists.txt b/src/osgPlugins/Inventor/CMakeLists.txt -index 963a494..e34b6b8 100644 ---- a/src/osgPlugins/Inventor/CMakeLists.txt -+++ b/src/osgPlugins/Inventor/CMakeLists.txt -@@ -17,10 +17,6 @@ SET(TARGET_HDRS - ShuttleCallback.h - ) - --ADD_DEFINITIONS(-DCOIN_DLL) -- --INCLUDE_DIRECTORIES(${INVENTOR_INCLUDE_DIR}) -- --SET(TARGET_ADDED_LIBRARIES ${INVENTOR_LIBRARY}) -+SET(TARGET_ADDED_LIBRARIES Coin::Coin) - - SETUP_PLUGIN(iv iv) diff --git a/external_imported/vcpkg/ports/osg/fix-example-application.patch b/external_imported/vcpkg/ports/osg/fix-example-application.patch deleted file mode 100644 index ebef27fd4..000000000 --- a/external_imported/vcpkg/ports/osg/fix-example-application.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt -index df859d0..123313a 100644 ---- a/applications/present3D/CMakeLists.txt -+++ b/applications/present3D/CMakeLists.txt -@@ -103,6 +103,11 @@ ENDIF() - IF (WIN32) - # to support cluster code - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32) -+ -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) -+ -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) - ELSE() - CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME) - IF(LIB_NSL_HAS_GETHOSTBYNAME) -diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt -index 071ab26..bf8d85f 100644 ---- a/examples/osgstaticviewer/CMakeLists.txt -+++ b/examples/osgstaticviewer/CMakeLists.txt -@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND) - SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype) - ENDIF(FREETYPE_FOUND) - -+IF (WIN32) -+ find_package(EXPAT REQUIRED) -+ find_package(Iconv REQUIRED) -+ -+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv) -+ENDIF() -+ - SET(TARGET_SRC osgstaticviewer.cpp ) - #### end var setup ### - SETUP_EXAMPLE(osgstaticviewer) diff --git a/external_imported/vcpkg/ports/osg/fix-liblas.patch b/external_imported/vcpkg/ports/osg/fix-liblas.patch deleted file mode 100644 index c36396e97..000000000 --- a/external_imported/vcpkg/ports/osg/fix-liblas.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b84fa06..a991670 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -765,7 +765,10 @@ ELSE() - ENDIF() - FIND_PACKAGE(ZeroConf) - -- FIND_PACKAGE(LIBLAS) -+ FIND_PACKAGE(liblas CONFIG) -+ set(LIBLAS_FOUND ${liblas_FOUND}) -+ set(LIBLAS_LIBRARY liblas) -+ set(LIBLASC_LIBRARY liblas_c) - - IF (NOT(OSG_USE_LOCAL_LUA_SOURCE)) - FIND_PACKAGE(Lua52) diff --git a/external_imported/vcpkg/ports/osg/fix-nvtt-squish.patch b/external_imported/vcpkg/ports/osg/fix-nvtt-squish.patch new file mode 100644 index 000000000..fb7ef0870 --- /dev/null +++ b/external_imported/vcpkg/ports/osg/fix-nvtt-squish.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeModules/FindNVTT.cmake b/CMakeModules/FindNVTT.cmake +index d0e7414..f6fb761 100644 +--- a/CMakeModules/FindNVTT.cmake ++++ b/CMakeModules/FindNVTT.cmake +@@ -120,7 +120,7 @@ FIND_LIBRARY(NVTHREAD_LIBRARY_DEBUG + + # SQUISH + FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE +- NAMES squish ++ NAMES nvsquish NAMES_PER_DIR + PATHS + /usr/local + /usr +@@ -129,7 +129,7 @@ FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE + PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static + ) + FIND_LIBRARY(NVSQUISH_LIBRARY_DEBUG +- NAMES squish_d ++ NAMES nvsquish_d NAMES_PER_DIR + PATHS + /usr/local + /usr diff --git a/external_imported/vcpkg/ports/osg/fix-nvtt.patch b/external_imported/vcpkg/ports/osg/fix-nvtt.patch deleted file mode 100644 index 3cc1c4d58..000000000 --- a/external_imported/vcpkg/ports/osg/fix-nvtt.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a991670..5b530c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -759,7 +759,9 @@ ELSE() - FIND_PACKAGE(RSVG) - FIND_PACKAGE(GtkGl) - FIND_PACKAGE(DirectInput) -+ if (ENABLE_NVTT) - FIND_PACKAGE(NVTT) -+ endif() - IF (NOT WIN32) - FIND_PACKAGE(Asio) - ENDIF() diff --git a/external_imported/vcpkg/ports/osg/fix-sdl.patch b/external_imported/vcpkg/ports/osg/fix-sdl.patch index e97d86476..be0030fea 100644 --- a/external_imported/vcpkg/ports/osg/fix-sdl.patch +++ b/external_imported/vcpkg/ports/osg/fix-sdl.patch @@ -2,26 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 81328ea..c735419 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -755,8 +755,6 @@ ELSE() +@@ -755,7 +755,8 @@ ELSE() FIND_PACKAGE(GStreamer COMPONENTS app pbutils) FIND_PACKAGE(GLIB COMPONENTS gobject) FIND_PACKAGE(DirectShow) - FIND_PACKAGE(SDL2) -- FIND_PACKAGE(SDL) - FIND_PACKAGE(Poppler-glib) - FIND_PACKAGE(RSVG) - FIND_PACKAGE(GtkGl) -@@ -775,6 +773,10 @@ ELSE() - FIND_PACKAGE(Lua51) - ENDIF() - ENDIF() -+ -+ find_package(SDL) + find_package(SDL2 CONFIG) + set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main) - - # V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this. - # FIND_PACKAGE(V8) + FIND_PACKAGE(SDL) + FIND_PACKAGE(Poppler-glib) + FIND_PACKAGE(RSVG) diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp index 9de15b1..ae96e11 100644 --- a/examples/osgmovie/osgmovie.cpp diff --git a/external_imported/vcpkg/ports/osg/link-libraries.patch b/external_imported/vcpkg/ports/osg/link-libraries.patch new file mode 100644 index 000000000..b65844432 --- /dev/null +++ b/external_imported/vcpkg/ports/osg/link-libraries.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake +index ce55be0..9b7107c 100644 +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -37,6 +37,16 @@ SET(VALID_BUILDER_VERSION OFF) + + MACRO(LINK_WITH_VARIABLES TRGTNAME) + FOREACH(varname ${ARGN}) ++ string(REPLACE "_LIBRARY" "_LINK_LIBRARIES" lwv_link_libraries "${varname}") ++ if(DEFINED ${lwv_link_libraries}) ++ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_link_libraries}}) ++ continue() ++ endif() ++ string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}") ++ if(DEFINED ${lwv_libraries}) ++ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}}) ++ continue() ++ endif() + IF(${varname}_DEBUG) + IF(${varname}_RELEASE) + TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}") diff --git a/external_imported/vcpkg/ports/osg/openexr3.patch b/external_imported/vcpkg/ports/osg/openexr3.patch new file mode 100644 index 000000000..9d525008f --- /dev/null +++ b/external_imported/vcpkg/ports/osg/openexr3.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7de889..2a58f19 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -743,6 +743,9 @@ ELSE() + FIND_PACKAGE(Inventor) + FIND_PACKAGE(Jasper) + FIND_PACKAGE(OpenEXR) ++ set(OPENEXR_FOUND "${OpenEXR_FOUND}") ++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) ++ set(OPENEXR_LIBRARIES_VARS OPENEXR_LIBRARIES) + FIND_PACKAGE(OpenCascade) + FIND_PACKAGE(COLLADA) + FIND_PACKAGE(FBX) +diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp +index 7132e97..bea1483 100644 +--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp ++++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp +@@ -41,11 +41,11 @@ public: + { + return _inStream->read(c,n).good(); + }; +- virtual Int64 tellg () ++ virtual uint64_t tellg () + { + return _inStream->tellg(); + }; +- virtual void seekg (Int64 pos) ++ virtual void seekg (uint64_t pos) + { + _inStream->seekg(pos); + }; +@@ -69,11 +69,11 @@ public: + { + _outStream->write(c,n); + }; +- virtual Int64 tellp () ++ virtual uint64_t tellp () + { + return _outStream->tellp(); + }; +- virtual void seekp (Int64 pos) ++ virtual void seekp (uint64_t pos) + { + _outStream->seekp(pos); + }; diff --git a/external_imported/vcpkg/ports/osg/plugin-pdb-install.patch b/external_imported/vcpkg/ports/osg/plugin-pdb-install.patch new file mode 100644 index 000000000..2ba456514 --- /dev/null +++ b/external_imported/vcpkg/ports/osg/plugin-pdb-install.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake +index a12fcf1..ce55be0 100644 +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -351,7 +351,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) + LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) + IF(MSVC AND DYNAMIC_OPENSCENEGRAPH) + INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo) +- INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug) ++ INSTALL(FILES $ DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug) + ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) + ELSE(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} diff --git a/external_imported/vcpkg/ports/osg/portfile.cmake b/external_imported/vcpkg/ports/osg/portfile.cmake index 40744eee9..701b470b8 100644 --- a/external_imported/vcpkg/ports/osg/portfile.cmake +++ b/external_imported/vcpkg/ports/osg/portfile.cmake @@ -7,157 +7,175 @@ vcpkg_from_github( SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b HEAD_REF master PATCHES + link-libraries.patch collada.patch - static.patch fix-sdl.patch - fix-example-application.patch - disable-present3d-staticview-in-linux.patch #Due to some link error we cannot solve yet, disable them in linux. - fix-curl.patch - remove-prefix.patch # Remove this patch when cmake fix Findosg_functions.cmake - fix-liblas.patch - fix-nvtt.patch + fix-nvtt-squish.patch + plugin-pdb-install.patch use-boost-asio.patch - fix-dependency-coin.patch osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode + openexr3.patch + unofficial-export.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(OSG_DYNAMIC OFF) -else() - set(OSG_DYNAMIC ON) -endif() - -file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake) - -set(OSG_USE_UTF8_FILENAME ON) -if (NOT VCPKG_TARGET_IS_WINDOWS) - message("Build osg requires gcc with version higher than 4.7.") - # Enable OSG_USE_UTF8_FILENAME will call some windows-only functions. - set(OSG_USE_UTF8_FILENAME OFF) -endif() +file(REMOVE + "${SOURCE_PATH}/CMakeModules/FindFontconfig.cmake" + "${SOURCE_PATH}/CMakeModules/FindFreetype.cmake" + "${SOURCE_PATH}/CMakeModules/Findilmbase.cmake" + "${SOURCE_PATH}/CMakeModules/FindOpenEXR.cmake" + "${SOURCE_PATH}/CMakeModules/FindSDL2.cmake" +) -set(OPTIONS) -if(NOT "collada" IN_LIST FEATURES) - list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON) -endif() -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON) -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON) -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON) -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON) -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON) -list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=ON) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OSG_DYNAMIC) -# Due to nvtt CRT linkage error, we can only enable static builds here -set(ENABLE_NVTT ON) -if (VCPKG_TARGET_IS_WINDOWS AND OSG_DYNAMIC) - set(ENABLE_NVTT OFF) +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DOSG_USE_UTF8_FILENAME=ON) endif() -list(APPEND OPTIONS -DENABLE_NVTT=${ENABLE_NVTT}) - -if (VCPKG_TARGET_IS_WINDOWS) - list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=ON) - list(APPEND OPTIONS -DOSG_TEXT_USE_FONTCONFIG=OFF) +# Skip try_run checks +if(VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=0 -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS=1) +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS=0) +elseif(VCPKG_TARGET_IS_IOS) + # handled by osg +elseif(VCPKG_CROSSCOMPILING) + message(WARNING "Atomics detection may fail for cross builds. You can set osg cmake variables in a custom triplet.") endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_OSG_APPLICATIONS - examples BUILD_OSG_EXAMPLES - plugins BUILD_OSG_PLUGINS - packages BUILD_OSG_PACKAGES - docs BUILD_DOCUMENTATION - docs BUILD_REF_DOCS_SEARCHENGINE - docs BUILD_REF_DOCS_TAGFILE + FEATURES + tools BUILD_OSG_APPLICATIONS + examples BUILD_OSG_EXAMPLES + plugins BUILD_OSG_PLUGINS_BY_DEFAULT + plugins CMAKE_REQUIRE_FIND_PACKAGE_CURL + plugins CMAKE_REQUIRE_FIND_PACKAGE_Jasper + plugins CMAKE_REQUIRE_FIND_PACKAGE_GDAL + plugins CMAKE_REQUIRE_FIND_PACKAGE_GTA + packages BUILD_OSG_PACKAGES + docs BUILD_DOCUMENTATION + docs BUILD_REF_DOCS_SEARCHENGINE + docs BUILD_REF_DOCS_TAGFILE + fontconfig OSG_TEXT_USE_FONTCONFIG + freetype BUILD_OSG_PLUGIN_FREETYPE + freetype CMAKE_REQUIRE_FIND_PACKAGE_Freetype + collada BUILD_OSG_PLUGIN_DAE + collada CMAKE_REQUIRE_FIND_PACKAGE_COLLADA + nvtt BUILD_OSG_PLUGIN_NVTT + nvtt CMAKE_REQUIRE_FIND_PACKAGE_NVTT + openexr BUILD_OSG_PLUGIN_EXR + openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR + rest-http-device BUILD_OSG_PLUGIN_RESTHTTPDEVICE + sdl1 BUILD_OSG_PLUGIN_SDL + INVERTED_FEATURES + sdl1 CMAKE_DISABLE_FIND_PACKAGE_SDL # for apps and examples ) -set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE ON) -if(VCPKG_TARGET_IS_WINDOWS) - set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE OFF) +# 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") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} - -DOSG_USE_UTF8_FILENAME=${OSG_USE_UTF8_FILENAME} +# Plugin control variables are used only if prerequisites are satisfied. +set(plugin_vars "") +file(STRINGS "${SOURCE_PATH}/src/osgPlugins/CMakeLists.txt" plugin_lines REGEX "ADD_PLUGIN_DIRECTORY") +foreach(line IN LISTS plugin_lines) + if(NOT line MATCHES "ADD_PLUGIN_DIRECTORY\\(([^)]*)" OR NOT EXISTS "${SOURCE_PATH}/src/osgPlugins/${CMAKE_MATCH_1}/CMakeLists.txt") + continue() + endif() + string(TOUPPER "${CMAKE_MATCH_1}" plugin_upper) + list(APPEND plugin_vars "BUILD_OSG_PLUGIN_${plugin_upper}") +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC} -DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC} + -DOSG_MSVC_VERSIONED_DLL=OFF + -DOSG_DETERMINE_WIN_VERSION=OFF + -DUSE_3RDPARTY_BIN=OFF -DBUILD_OSG_PLUGIN_DICOM=OFF -DBUILD_OSG_PLUGIN_OPENCASCADE=OFF -DBUILD_OSG_PLUGIN_INVENTOR=OFF -DBUILD_OSG_PLUGIN_FBX=OFF -DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF + -DBUILD_OSG_PLUGIN_LAS=OFF -DBUILD_OSG_PLUGIN_QTKIT=OFF -DBUILD_OSG_PLUGIN_SVG=OFF -DBUILD_OSG_PLUGIN_VNC=OFF -DBUILD_OSG_PLUGIN_LUA=OFF - -DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=${BUILD_OSG_PLUGIN_RESTHTTPDEVICE} + -DOPENGL_PROFILE=${osg_OPENGL_PROFILE} -DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF -DBUILD_DASHBOARD_REPORTS=OFF -DCMAKE_CXX_STANDARD=11 - ${OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON + -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=ON + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON + ${OPTIONS} + OPTIONS_DEBUG + -DBUILD_OSG_APPLICATIONS=OFF + -DBUILD_OSG_EXAMPLES=OFF + -DBUILD_DOCUMENTATION=OFF + MAYBE_UNUSED_VARIABLES + BUILD_REF_DOCS_SEARCHENGINE + BUILD_REF_DOCS_TAGFILE + OSG_DETERMINE_WIN_VERSION + USE_3RDPARTY_BIN + ${plugin_vars} ) - -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-osg-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-osg/unofficial-osg-config.cmake" @ONLY) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-osg) -# handle osg tools and plugins -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - -file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -if (OSG_TOOLS) - file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) - file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH}) - file(REMOVE_RECURSE ${OSG_TOOLS}) - file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - file(REMOVE_RECURSE ${OSG_TOOLS_DBG}) -endif() -file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -if (OSG_TOOLS) - file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n") endif() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*) - if (OSG_PLUGINS_DBG) - file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) - endif() - file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*) - if (OSG_PLUGINS_REL) - if (NOT EXISTS ${OSG_TOOL_PATH}) - file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) - endif() - file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) +# Move all osg plugins to [/debug]/plugins/osgPlugins-${OSG_VER}, +# as a staging area for later deployment. +set(osg_plugins_subdir "osgPlugins-${OSG_VER}") +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/) endif() -file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*) -if (OSG_PLUGINS_DBG) - file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER}) -endif() +if("tools" IN_LIST FEATURES) + set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") + file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}") + if(NOT VCPKG_BUILD_TYPE) + file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") + file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/${osg_plugins_subdir}") + endif() -file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*) -if (OSG_PLUGINS_REL) - if (NOT EXISTS ${OSG_TOOL_PATH}) - file(MAKE_DIRECTORY ${OSG_TOOL_PATH}) + set(tools osgversion present3D) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND tools osgviewer osgarchive osgconv osgfilecache) endif() - file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER}) + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/) -#Cleanup -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openscenegraph.pc" "\\\n" " ") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/openscenegraph.pc" "\\\n" " ") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_fixup_pkgconfig() + +file(COPY "${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) diff --git a/external_imported/vcpkg/ports/osg/remove-prefix.patch b/external_imported/vcpkg/ports/osg/remove-prefix.patch deleted file mode 100644 index ced94522c..000000000 --- a/external_imported/vcpkg/ports/osg/remove-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake -index bb3be63..356edcd 100644 ---- a/CMakeModules/ModuleInstall.cmake -+++ b/CMakeModules/ModuleInstall.cmake -@@ -21,7 +21,7 @@ SOURCE_GROUP( - FILES ${TARGET_H} - ) - --IF(MSVC AND OSG_MSVC_VERSIONED_DLL) -+IF(0) - HANDLE_MSVC_DLL() - ENDIF() - -diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt -index 84550bd..0e816f7 100644 ---- a/src/OpenThreads/win32/CMakeLists.txt -+++ b/src/OpenThreads/win32/CMakeLists.txt -@@ -39,7 +39,7 @@ LINK_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ) - --IF(MSVC AND OSG_MSVC_VERSIONED_DLL) -+IF(0) - HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) - ENDIF() - diff --git a/external_imported/vcpkg/ports/osg/static.patch b/external_imported/vcpkg/ports/osg/static.patch deleted file mode 100644 index c7278d282..000000000 --- a/external_imported/vcpkg/ports/osg/static.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/src/osgPlugins/curl/CMakeLists.txt -+++ b/src/osgPlugins/curl/CMakeLists.txt -@@ -35,3 +35,3 @@ - ADD_DEFINITIONS(-DCURL_STATICLIB) -- SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32) -+ SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32 crypt32) - ENDIF() diff --git a/external_imported/vcpkg/ports/osg/unofficial-export.patch b/external_imported/vcpkg/ports/osg/unofficial-export.patch new file mode 100644 index 000000000..1061f704d --- /dev/null +++ b/external_imported/vcpkg/ports/osg/unofficial-export.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c975d78..cc53332 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1374,3 +1374,6 @@ ADD_CUSTOM_TARGET(uninstall + # + include(FeatureSummary) + feature_summary(WHAT ALL) ++ ++INSTALL(EXPORT osg-targets NAMESPACE unofficial::osg:: DESTINATION share/unofficial-osg) ++INSTALL(EXPORT osg-plugins NAMESPACE unofficial::osg:: DESTINATION share/unofficial-osg) +diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake +index f6714c5..d58f6fd 100644 +--- a/CMakeModules/ModuleInstall.cmake ++++ b/CMakeModules/ModuleInstall.cmake +@@ -27,6 +27,7 @@ ENDIF() + + INSTALL( + TARGETS ${LIB_NAME} ++ EXPORT osg-targets + RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph + LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph + ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev +diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake +index dcc1fe3..a12fcf1 100644 +--- a/CMakeModules/OsgMacroUtils.cmake ++++ b/CMakeModules/OsgMacroUtils.cmake +@@ -345,6 +345,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) + #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS} + IF(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} ++ EXPORT osg-plugins + RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} + ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev + LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) +@@ -354,6 +355,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) + ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) + ELSE(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} ++ EXPORT osg-plugins + RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} + ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev + LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) +diff --git a/src/OpenThreads/pthreads/CMakeLists.txt b/src/OpenThreads/pthreads/CMakeLists.txt +index e18969c..5a8ad62 100644 +--- a/src/OpenThreads/pthreads/CMakeLists.txt ++++ b/src/OpenThreads/pthreads/CMakeLists.txt +@@ -157,6 +157,7 @@ ELSE() + + INSTALL( + TARGETS OpenThreads ++ EXPORT osg-targets + ARCHIVE DESTINATION lib${LIB_POSTFIX} COMPONENT libopenthreads-dev + LIBRARY DESTINATION lib${LIB_POSTFIX} COMPONENT libopenthreads + RUNTIME DESTINATION bin COMPONENT libopenthreads +diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt +index 0e816f7..0c083fd 100644 +--- a/src/OpenThreads/win32/CMakeLists.txt ++++ b/src/OpenThreads/win32/CMakeLists.txt +@@ -45,6 +45,7 @@ ENDIF() + + INSTALL( + TARGETS OpenThreads ++ EXPORT osg-targets + ARCHIVE DESTINATION lib COMPONENT libopenthreads-dev + LIBRARY DESTINATION lib COMPONENT libopenthreads + RUNTIME DESTINATION bin COMPONENT libopenthreads diff --git a/external_imported/vcpkg/ports/osg/unofficial-osg-config.cmake b/external_imported/vcpkg/ports/osg/unofficial-osg-config.cmake new file mode 100644 index 000000000..512253b29 --- /dev/null +++ b/external_imported/vcpkg/ports/osg/unofficial-osg-config.cmake @@ -0,0 +1,23 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) +cmake_policy(SET CMP0057 NEW) +include("${CMAKE_CURRENT_LIST_DIR}/osg-targets.cmake") +include(CMakeFindDependencyMacro) +if("@OSG_TEXT_USE_FONTCONFIG@") + find_dependency(Fontconfig) # CMake 3.14 +endif() +if("plugins" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) + include("${CMAKE_CURRENT_LIST_DIR}/osg-plugins.cmake") + if(TARGET unofficial::osg::osgdb_curl) + find_dependency(CURL) + endif() + if(TARGET unofficial::osg::osgdb_exr) + find_dependency(OpenEXR CONFIG) + endif() + if(TARGET unofficial::osg::osgdb_gdal OR TARGET unofficial::osg::osgdb_ogr) + find_dependency(GDAL) + endif() +endif() +set(${CMAKE_FIND_PACKAGE_NAME}_VERSION "@OSG_VER@") +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/osg/usage b/external_imported/vcpkg/ports/osg/usage new file mode 100644 index 000000000..51e9c25a5 --- /dev/null +++ b/external_imported/vcpkg/ports/osg/usage @@ -0,0 +1,4 @@ +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) diff --git a/external_imported/vcpkg/ports/osg/vcpkg.json b/external_imported/vcpkg/ports/osg/vcpkg.json index 2d2d7f50a..a72f9314b 100644 --- a/external_imported/vcpkg/ports/osg/vcpkg.json +++ b/external_imported/vcpkg/ports/osg/vcpkg.json @@ -1,24 +1,37 @@ { "name": "osg", - "version-string": "3.6.5", - "port-version": 11, + "version": "3.6.5", + "port-version": 17, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", - "homepage": "https://github.com/openscenegraph/OpenSceneGraph", + "homepage": "https://www.openscenegraph.com/", + "license": null, + "supports": "!uwp", "dependencies": [ { "name": "expat", "platform": "windows" }, - { - "name": "fontconfig", - "platform": "!windows" - }, + "opengl-registry", { "name": "openimageio", + "default-features": false, "platform": "osx" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], + "default-features": [ + "default-features", + "freetype", + "plugins" + ], "features": { "collada": { "description": "Support for Collada (.dae) files", @@ -26,98 +39,176 @@ "collada-dom" ] }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "osg", + "default-features": false, + "features": [ + "openexr" + ], + "platform": "!uwp" + }, + { + "name": "osg", + "default-features": false, + "features": [ + "rest-http-device" + ], + "platform": "!windows" + }, + { + "name": "osg", + "default-features": false, + "features": [ + "fontconfig" + ], + "platform": "!android & !ios & !uwp" + }, + { + "name": "osg", + "default-features": false, + "features": [ + "nvtt" + ], + "platform": "!x86 & !(windows & arm64) & !uwp" + } + ] + }, "docs": { "description": "Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads" }, "examples": { "description": "Enable to build OSG Examples", "dependencies": [ - "freetype", { "name": "libiconv", "platform": "windows" }, - "sdl1", + { + "name": "osg", + "default-features": false, + "features": [ + "freetype" + ] + }, "sdl2" ] }, + "fontconfig": { + "description": "Enable Fontconfig support for osgText", + "dependencies": [ + "fontconfig", + { + "name": "osg", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, + "freetype": { + "description": "Enable Freetype support", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, + "nvtt": { + "description": "Build texture processing tools plugin", + "dependencies": [ + "nvtt" + ] + }, + "openexr": { + "description": "Build the exr plugin", + "dependencies": [ + "openexr" + ] + }, "packages": { "description": "Set to ON to generate CPack configuration files and packaging targets" }, "plugins": { - "description": "Build OSG Plugins - Disable for compile testing examples on a time limit", + "description": "Build most OSG Plugins", "dependencies": [ { - "name": "boost-asio", - "platform": "!windows" - }, - { - "name": "boost-bind", - "platform": "!windows" - }, - { - "name": "boost-core", - "platform": "!windows" - }, - { - "name": "boost-lexical-cast", - "platform": "!windows" - }, - { - "name": "boost-logic", - "platform": "!windows" - }, - { - "name": "boost-smart-ptr", - "platform": "!windows" + "name": "curl", + "default-features": false }, { - "name": "boost-tuple", - "platform": "!windows" + "name": "gdal", + "default-features": false }, - "coin", - "curl", - "freetype", - "gdal", { "name": "giflib", "platform": "windows" }, - "ilmbase", - "jasper", + { + "name": "jasper", + "default-features": false + }, "libgta", { "name": "libiconv", "platform": "windows" }, "libjpeg-turbo", - "liblas", "libpng", { "name": "libxml2", "platform": "windows" }, { - "name": "nvtt", - "platform": "!x86" - }, - "openexr", - "sdl1", - "tiff" + "name": "tiff", + "default-features": false + } + ] + }, + "rest-http-device": { + "description": "Build RestHttpDevice plugin", + "supports": "!windows", + "dependencies": [ + "boost-array", + "boost-asio", + "boost-bind", + "boost-core", + "boost-lexical-cast", + "boost-logic", + "boost-smart-ptr", + "boost-tuple" + ] + }, + "sdl1": { + "description": "Build SDL 1 plugin, and enable SDL 1 app features", + "dependencies": [ + "sdl1" ] }, "tools": { "description": "Enable to build OSG Applications (e.g. osgviewer)", "dependencies": [ - "curl", - "freetype", + { + "name": "curl", + "default-features": false + }, { "name": "libiconv", "platform": "windows" }, "libjpeg-turbo", "libpng", - "sdl1" + { + "name": "osg", + "default-features": false, + "features": [ + "freetype" + ] + } ] } } diff --git a/external_imported/vcpkg/ports/osgearth/StaticOSG.patch b/external_imported/vcpkg/ports/osgearth/StaticOSG.patch deleted file mode 100644 index 2f4b1bff1..000000000 --- a/external_imported/vcpkg/ports/osgearth/StaticOSG.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4e719ceacdc8df729f3296f62c9f50075c862967 Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Sun, 27 Dec 2020 22:26:32 -0800 -Subject: [PATCH] StaticOSG - ---- - CMakeLists.txt | 9 ++++++ - CMakeModules/FindGEOS.cmake | 29 +++++++++++++++++++++++++++-- - 2 files changed, 36 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 049e37e..d75a3b9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -266,6 +266,15 @@ ELSE() - SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") - ENDIF() - -+IF(NOT OSGEARTH_BUILD_SHARED_LIBS) -+ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) -+ENDIF() -+ -+OPTION(OSG_IS_STATIC "Set to ON to build OSG for static linking. Use OFF for dynamic." OFF) -+IF (OSG_IS_STATIC) -+ ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) -+ LINK_LIBRARIES(${CMAKE_DL_LIBS}) -+ENDIF(OSG_IS_STATIC) - - # OE Libraries - ADD_SUBDIRECTORY(src) -diff --git a/CMakeModules/FindGEOS.cmake b/CMakeModules/FindGEOS.cmake -index e85f922..b1bbfed 100644 ---- a/CMakeModules/FindGEOS.cmake -+++ b/CMakeModules/FindGEOS.cmake -@@ -65,7 +65,7 @@ FIND_LIBRARY(GEOS_LIBRARY - ) - - FIND_LIBRARY(GEOS_LIBRARY_DEBUG -- NAMES geos_cd geos_i_d geosd -+ NAMES geos_cd geos_i_d - PATHS - ${GEOS_DIR}/lib - $ENV{GEOS_DIR} -@@ -74,7 +74,7 @@ FIND_LIBRARY(GEOS_LIBRARY_DEBUG - ) - - FIND_LIBRARY(GEOS_LIBRARY_DEBUG -- NAMES geos_cd geos_i_d geosd -+ NAMES geos_cd geos_i_d - PATHS - ~/Library/Frameworks - /Library/Frameworks -@@ -92,3 +92,28 @@ SET(GEOS_FOUND "NO") - IF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR) - SET(GEOS_FOUND "YES") - ENDIF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR) -+ -+OPTION(GEOS_IS_STATIC "Set to ON to build GEOS for static linking. Use OFF for dynamic." OFF) -+IF (GEOS_IS_STATIC) -+ FIND_LIBRARY(GEOS_CXX_LIBRARY -+ NAMES geos -+ PATHS -+ ${GEOS_DIR}/lib -+ $ENV{GEOS_DIR} -+ NO_DEFAULT_PATH -+ PATH_SUFFIXES lib64 lib -+ ) -+ -+ FIND_LIBRARY(GEOS_CXX_LIBRARY_DEBUG -+ NAMES geosd -+ PATHS -+ ${GEOS_DIR}/lib -+ $ENV{GEOS_DIR} -+ NO_DEFAULT_PATH -+ PATH_SUFFIXES lib64 lib -+ ) -+ -+ set(GEOS_LIBRARY "${GEOS_LIBRARY};${GEOS_CXX_LIBRARY}" CACHE STRING "Geos Libraries" FORCE ) -+ set(GEOS_LIBRARY_DEBUG "${GEOS_LIBRARY_DEBUG};${GEOS_CXX_LIBRARY_DEBUG}" CACHE STRING "Geos Debug Libraries" FORCE ) -+ -+ENDIF(GEOS_IS_STATIC) --- -2.29.2 - diff --git a/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch b/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch deleted file mode 100644 index 2b706573e..000000000 --- a/external_imported/vcpkg/ports/osgearth/blend2d-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp -index 84007aee9..de8e511df 100644 ---- a/src/osgEarth/FeatureRasterizer.cpp -+++ b/src/osgEarth/FeatureRasterizer.cpp -@@ -245,8 +245,8 @@ namespace osgEarth { - }); - - Color color(Color::White); -- uint32_t cap = BL_STROKE_CAP_ROUND; -- uint32_t join = BL_STROKE_JOIN_ROUND; -+ auto cap = BL_STROKE_CAP_ROUND; -+ auto join = BL_STROKE_JOIN_ROUND; - - if (symbol->stroke().isSet()) - { diff --git a/external_imported/vcpkg/ports/osgearth/make-all-find-packages-required.patch b/external_imported/vcpkg/ports/osgearth/find-package.patch similarity index 52% rename from external_imported/vcpkg/ports/osgearth/make-all-find-packages-required.patch rename to external_imported/vcpkg/ports/osgearth/find-package.patch index 51bd86f40..4ce2b8c5e 100644 --- a/external_imported/vcpkg/ports/osgearth/make-all-find-packages-required.patch +++ b/external_imported/vcpkg/ports/osgearth/find-package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7541c8d07..cc14d2160 100755 +index 36ea6c81f..8ed39eb24 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -124,9 +124,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -13,15 +13,28 @@ index 7541c8d07..cc14d2160 100755 + find_package(OpenGL REQUIRED) ENDIF (OSGEARTH_USE_GLES) + +@@ -144,35 +144,52 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + endif() + # required - find_package(OSG REQUIRED) --find_package(CURL REQUIRED) -+find_package(CURL CONFIG REQUIRED) -+set(CURL_LIBRARY CURL::libcurl) +-find_package(OSG REQUIRED) ++find_package(OSG NAMES unofficial-osg) ++find_path(OSG_INCLUDE_DIR osg/Version) # For detecting the version and setting the plugin path ++set(OSG_INCLUDE_DIRS "") ++set(OSG_LIBRARY unofficial::osg::osg) ++set(OSGUTIL_LIBRARY unofficial::osg::osgUtil) ++set(OSGDB_LIBRARY unofficial::osg::osgDB) ++set(OSGTEXT_LIBRARY unofficial::osg::osgText) ++set(OSGSIM_LIBRARY unofficial::osg::osgSim) ++set(OSGVIEWER_LIBRARY unofficial::osg::osgViewer) ++set(OSGGA_LIBRARY unofficial::osg::osgViewer) ++set(OSGSHADOW_LIBRARY unofficial::osg::osgShadow) ++set(OSGMANIPULATOR_LIBRARY unofficial::osg::osgManipulator) ++set(OPENTHREADS_LIBRARY unofficial::osg::OpenThreads) + find_package(CURL REQUIRED) find_package(GDAL REQUIRED) -- -+set(GDAL_LIBRARY ${GDAL_LIBRARIES}) -+set(GDAL_FOUND 1) + # optional -find_package(GEOS) -find_package(Sqlite3) @@ -31,24 +44,20 @@ index 7541c8d07..cc14d2160 100755 -find_package(Protobuf) -find_package(WEBP) -find_package(Blend2D) -+find_package(geos CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c) -+set(GEOS_FOUND 1) -+find_package(unofficial-sqlite3 CONFIG REQUIRED) -+set(SQLITE3_FOUND 1) +-find_package(blosc) ++find_package(GEOS CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos_c) ++find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED) +set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) +find_package(Draco REQUIRED) +find_package(BASISU REQUIRED) +find_package(GLEW REQUIRED) -+set(GLEW_LIBRARIES GLEW::GLEW) -+set(GLEW_FOUND 1) -+find_package(protobuf CONFIG REQUIRED) -+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) -+set(Protobuf_FOUND 1) -+find_package(WebP CONFIG REQUIRED) ++find_package(Protobuf REQUIRED) ++find_package(WEBP NAMES WebP CONFIG REQUIRED) +set(WEBP_LIBRARY WebP::webp) -+set(WEBP_FOUND 1) -+find_package(Blend2D CONFIG REQUIRED) ++find_package(BLEND2D CONFIG REQUIRED) ++set(BLEND2D_LIBRARY blend2d::blend2d) ++find_package(BLOSC REQUIRED) if(OSGEARTH_ENABLE_PROFILING) - find_package(Tracy) @@ -57,9 +66,8 @@ index 7541c8d07..cc14d2160 100755 if(OSGEARTH_BUILD_ZIP_PLUGIN) - find_package(LIBZIP) -+ find_package(libzip CONFIG REQUIRED) ++ find_package(LIBZIP CONFIG REQUIRED) + set(LIBZIP_LIBRARY libzip::zip) -+ set(LIBZIP_FOUND 1) endif() if(OSGEARTH_BUILD_TRITON_NODEKIT) @@ -73,7 +81,7 @@ index 7541c8d07..cc14d2160 100755 endif() # Sqlite enables the MBTiles format: -@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile +@@ -214,7 +231,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) @@ -82,34 +90,21 @@ index 7541c8d07..cc14d2160 100755 ENDIF (WITH_EXTERNAL_DUKTAPE) # Whether to install shaders (glsl files). -@@ -204,7 +218,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak +@@ -225,7 +242,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) - find_package(TinyXML) -+ find_package(tinyxml CONFIG REQUIRED) -+ set(TINYXML_FOUND 1) ++ find_package(TINYXML NAMES tinyxml REQUIRED) + set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) ENDIF (WITH_EXTERNAL_TINYXML) # postfix settings for various configs -diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt -index cd55c1164..4ecb61f0d 100644 ---- a/src/osgEarth/CMakeLists.txt -+++ b/src/osgEarth/CMakeLists.txt -@@ -909,11 +909,11 @@ IF(FILEGDB_FOUND) - LINK_WITH_VARIABLES(${LIB_NAME} FILEGDB_LIBRARY) +@@ -300,6 +318,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) + SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") + ELSE() + SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") ++ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) ENDIF() --IF(BLEND2D_FOUND) -+#IF(BLEND2D_FOUND) - add_definitions(-DOSGEARTH_HAVE_BLEND2D) -- include_directories(${BLEND2D_INCLUDES}) -- link_with_variables(${LIB_NAME} BLEND2D_LIBRARY) --ENDIF() -+# include_directories(${BLEND2D_INCLUDES}) -+ target_link_libraries(${LIB_NAME} blend2d::blend2d) -+#ENDIF() - - IF (WIN32) - LINK_EXTERNAL(${LIB_NAME} ${TARGET_EXTERNAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ) + diff --git a/external_imported/vcpkg/ports/osgearth/fix-dependency-osg.patch b/external_imported/vcpkg/ports/osgearth/fix-dependency-osg.patch deleted file mode 100644 index 6aae9a560..000000000 --- a/external_imported/vcpkg/ports/osgearth/fix-dependency-osg.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake -index b7dff11..d1ec2ff 100644 ---- a/CMakeModules/FindOSG.cmake -+++ b/CMakeModules/FindOSG.cmake -@@ -121,5 +121,40 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) - SET( OSG_FOUND "YES" ) - SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} ) - GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH ) -+ -+ find_package(ZLIB REQUIRED) -+ set(ZLIB_LIBRARY ZLIB::ZLIB) -+ -+ find_package(Freetype REQUIRED) -+ set(FREETYPE_LIBRARY Freetype::Freetype) -+ -+ find_package(unofficial-brotli CONFIG REQUIRED) -+ find_package(BZip2 REQUIRED) -+ find_package(expat CONFIG REQUIRED) -+ find_package(PNG REQUIRED) -+ find_package(JPEG REQUIRED) -+ find_package(TIFF REQUIRED) -+ find_package(zstd REQUIRED) -+ find_package(GIF REQUIRED) -+ if (WIN32) -+ find_package(pthreads CONFIG REQUIRED) -+ list(APPEND OSG_DEPENDS_LIBRARY PThreads4W::PThreads4W) -+ endif() -+ -+ if (UNIX) -+ list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread) -+ # Due to Linux Linker dependency issues these need to included again -+ set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio openjp2 xml2) -+ else(UNIX) -+ set(DEPEND_LIB_LIST cfitsio) -+ endif() -+ foreach (libname ${DEPEND_LIB_LIST}) -+ find_library(${libname}_LIBRARY_RELEASE NAMES ${libname} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) -+ find_library(${libname}_LIBRARY_DEBUG NAMES ${libname} ${libname}d ${libname}_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -+ select_library_configurations(${libname}) -+ list(APPEND OSG_DEPENDS_LIBRARY ${${libname}_LIBRARY}) -+ endforeach() -+ list(APPEND OSG_DEPENDS_LIBRARY ZLIB::ZLIB Freetype::Freetype expat::expat PNG::PNG JPEG::JPEG TIFF::TIFF ${GIF_LIBRARIES} ${CFITSIO_LIBRARY}) -+ - ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR ) - -diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt -index e1dc876..6d688ff 100644 ---- a/src/applications/osgearth_3pv/CMakeLists.txt -+++ b/src/applications/osgearth_3pv/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_3pv.cpp ) - -diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt -index aadbb5e..69698c7 100644 ---- a/src/applications/osgearth_atlas/CMakeLists.txt -+++ b/src/applications/osgearth_atlas/CMakeLists.txt -@@ -1,6 +1,6 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) - --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_atlas.cpp ) - -diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt -index fe9ec6b..52915b0 100644 ---- a/src/applications/osgearth_boundarygen/CMakeLists.txt -+++ b/src/applications/osgearth_boundarygen/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_H - BoundaryUtil -diff --git a/src/applications/osgearth_clamp/CMakeLists.txt b/src/applications/osgearth_clamp/CMakeLists.txt -index 996ea43..728ee77 100644 ---- a/src/applications/osgearth_clamp/CMakeLists.txt -+++ b/src/applications/osgearth_clamp/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_clamp.cpp) - -diff --git a/src/applications/osgearth_conv/CMakeLists.txt b/src/applications/osgearth_conv/CMakeLists.txt -index a77d703..2aac5f2 100644 ---- a/src/applications/osgearth_conv/CMakeLists.txt -+++ b/src/applications/osgearth_conv/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_conv.cpp ) - -diff --git a/src/applications/osgearth_overlayviewer/CMakeLists.txt b/src/applications/osgearth_overlayviewer/CMakeLists.txt -index bb2802a..5175cfc 100644 ---- a/src/applications/osgearth_overlayviewer/CMakeLists.txt -+++ b/src/applications/osgearth_overlayviewer/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_overlayviewer.cpp ) - -diff --git a/src/applications/osgearth_tfs/CMakeLists.txt b/src/applications/osgearth_tfs/CMakeLists.txt -index 90c153a..d331019 100644 ---- a/src/applications/osgearth_tfs/CMakeLists.txt -+++ b/src/applications/osgearth_tfs/CMakeLists.txt -@@ -1,6 +1,6 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) - --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_tfs.cpp ) - -diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt -index b32c523..7b25b79 100644 ---- a/src/applications/osgearth_toc/CMakeLists.txt -+++ b/src/applications/osgearth_toc/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGWIDGET_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_toc.cpp ) - -diff --git a/src/applications/osgearth_version/CMakeLists.txt b/src/applications/osgearth_version/CMakeLists.txt -index 1f1d48d..01e963b 100644 ---- a/src/applications/osgearth_version/CMakeLists.txt -+++ b/src/applications/osgearth_version/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_version.cpp ) - -diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt -index 8c61e42..bbda7be 100644 ---- a/src/applications/osgearth_viewer/CMakeLists.txt -+++ b/src/applications/osgearth_viewer/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} ) --SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY) - - SET(TARGET_SRC osgearth_viewer.cpp ) - -diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt -index cd55c1164..7cecdac74 100644 ---- a/src/osgEarth/CMakeLists.txt -+++ b/src/osgEarth/CMakeLists.txt -@@ -928,9 +928,11 @@ ENDIF(TRACY_FOUND) - - OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF) - if(NOT NRL_STATIC_LIBRARIES) -- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY) -+ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) -+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES}) - else(NOT NRL_STATIC_LIBRARIES) -- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY) -+ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) -+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY}) - endif(NOT NRL_STATIC_LIBRARIES) - - LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY}) - diff --git a/external_imported/vcpkg/ports/osgearth/fix-gcc11-compilation.patch b/external_imported/vcpkg/ports/osgearth/fix-gcc11-compilation.patch deleted file mode 100644 index 582389068..000000000 --- a/external_imported/vcpkg/ports/osgearth/fix-gcc11-compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Wed, 28 Jul 2021 06:40:45 -0700 -Subject: [PATCH] fix-gcc11-compilation - ---- - src/osgEarth/Units | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/osgEarth/Units b/src/osgEarth/Units -index dd19afe..bfe826a 100644 ---- a/src/osgEarth/Units -+++ b/src/osgEarth/Units -@@ -196,17 +196,17 @@ namespace osgEarth - class qualified_double - { - public: -- qualified_double( double value, const Units& units ) : _value(value), _units(units) { } -+ qualified_double( double value, const Units& units ) : _value(value), _units(units) { } - -- qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } -+ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } - - // parses the qualified number from a parseable string (e.g., "123km") -- qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { -+ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { - Units::parse( parseable, _value, _units, defaultUnits ); - } - - // loads the qualified number from an old-school config (e.g., { value="123" units="km" } ) -- qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { -+ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { - if ( conf.hasValue("value") ) { - _value = conf.value("value", 0.0); - if ( !Units::parse( conf.value("units"), _units ) ) --- -2.31.1 - diff --git a/external_imported/vcpkg/ports/osgearth/fix-imgui.patch b/external_imported/vcpkg/ports/osgearth/fix-imgui.patch deleted file mode 100644 index 495c3dff8..000000000 --- a/external_imported/vcpkg/ports/osgearth/fix-imgui.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 2aa1535341c9aace4a5ca0115fa51dbf76f582ec Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Wed, 29 Sep 2021 23:12:52 -0700 -Subject: [PATCH] patch - ---- - src/applications/osgearth_imgui/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt -index 246fd89..5ea6f63 100644 ---- a/src/applications/osgearth_imgui/CMakeLists.txt -+++ b/src/applications/osgearth_imgui/CMakeLists.txt -@@ -1,3 +1,3 @@ --set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) -+set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY) - set(TARGET_SRC osgearth_imgui.cpp) - SETUP_IMGUI_APPLICATION(osgearth_imgui) --- -2.31.1 - diff --git a/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch b/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch new file mode 100644 index 000000000..04a061e93 --- /dev/null +++ b/external_imported/vcpkg/ports/osgearth/fix-osgearth-config.patch @@ -0,0 +1,85 @@ +diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in +index 3f27dffe9..4141ff939 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 ++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/external_imported/vcpkg/ports/osgearth/link-libraries.patch b/external_imported/vcpkg/ports/osgearth/link-libraries.patch new file mode 100644 index 000000000..19f34fb18 --- /dev/null +++ b/external_imported/vcpkg/ports/osgearth/link-libraries.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake +index 7dd0998..730af85 100644 +--- a/CMakeModules/OsgEarthMacroUtils.cmake ++++ b/CMakeModules/OsgEarthMacroUtils.cmake +@@ -92,6 +92,11 @@ ENDMACRO(DETECT_OSG_VERSION) + + MACRO(LINK_WITH_VARIABLES TRGTNAME) + FOREACH(varname ${ARGN}) ++ string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}") ++ if(DEFINED ${lwv_libraries}) ++ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}}) ++ continue() ++ endif() + IF(${varname}_DEBUG) + IF(${varname}_RELEASE) + TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}") diff --git a/external_imported/vcpkg/ports/osgearth/portfile.cmake b/external_imported/vcpkg/ports/osgearth/portfile.cmake index edc87e6eb..5bd04f4a5 100644 --- a/external_imported/vcpkg/ports/osgearth/portfile.cmake +++ b/external_imported/vcpkg/ports/osgearth/portfile.cmake @@ -1,47 +1,59 @@ -# Only dynamic build need dlls -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB OSG_PLUGINS_SUBDIR "${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*") - list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH) - if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1) - message(FATAL_ERROR "Could not determine osg version") - endif() - string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2 - SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670 + REF 6b5fb806a9190f7425c32db65d3ea905a55a9c16 #version 3.3 + SHA512 fe79ce6c73341f83d4aee8cb4da5341dead56a92f998212f7898079b79725f46b2209d64e68fe3b4d99d3c5c25775a8efd1bf3c3b3a049d4f609d3e30172d3bf HEAD_REF master PATCHES - StaticOSG.patch # Fix port compilation in static-md module - make-all-find-packages-required.patch - fix-dependency-osg.patch + link-libraries.patch + find-package.patch remove-tool-debug-suffix.patch - fix-imgui.patch - fix-gcc11-compilation.patch - blend2d-fix.patch + remove-lerc-gltf.patch + fix-osgearth-config.patch ) -# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 -file(REMOVE "${SOURCE_PATH}/src/osgEarth/tinyxml.h") +if("tools" IN_LIST FEATURES) + message(STATUS "Downloading submodules") + # Download submodules from github manually since vpckg doesn't support submodules natively. + # IMGUI + #osgEarth is currently using imgui docking branch for osgearth_imgui example + vcpkg_from_github( + OUT_SOURCE_PATH IMGUI_SOURCE_PATH + REPO ocornut/imgui + REF 9e8e5ac36310607012e551bb04633039c2125c87 #docking branch + SHA512 1f1f743833c9a67b648922f56a638a11683b02765d86f14a36bc6c242cc524c4c5c5c0b7356b8053eb923fafefc53f4c116b21fb3fade7664554a1ad3b25e5ff + HEAD_REF master + ) + + # Remove exisiting folder in case it was not cleaned + file(REMOVE_RECURSE "${SOURCE_PATH}/src/third_party/imgui") + # Copy the submodules to the right place + file(COPY "${IMGUI_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/third_party/imgui") +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}/src/osgEarth/tinyxml.h" # https://github.com/gwaldron/osgearth/issues/1002 +) -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 - tools OSGEARTH_BUILD_TOOLS + FEATURES + tools OSGEARTH_BUILD_TOOLS + blend2d CMAKE_REQUIRE_FIND_PACKAGE_BLEND2D ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DLIB_POSTFIX= -DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED} - -DNRL_STATIC_LIBRARIES=${BUILD_STATIC} - -DOSG_IS_STATIC=${BUILD_STATIC} - -DGEOS_IS_STATIC=${BUILD_STATIC} - -DCURL_IS_STATIC=${BUILD_STATIC} -DOSGEARTH_BUILD_EXAMPLES=OFF -DOSGEARTH_BUILD_TESTS=OFF -DOSGEARTH_BUILD_DOCS=OFF @@ -49,37 +61,48 @@ vcpkg_cmake_configure( -DOSGEARTH_BUILD_TRITON_NODEKIT=OFF -DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF -DWITH_EXTERNAL_TINYXML=ON + -DCMAKE_JOB_POOL_LINK=console # Serialize linking to avoid OOM + OPTIONS_DEBUG + -DOSGEARTH_BUILD_TOOLS=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) -if (WIN32 AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) - #Release - set(OSGEARTH_TOOL_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - set(OSGEARTH_TOOL_PLUGIN_PATH "${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") - - file(MAKE_DIRECTORY "${OSGEARTH_TOOL_PLUGIN_PATH}") - file(GLOB OSGDB_PLUGINS "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") - - file(COPY ${OSGDB_PLUGINS} DESTINATION "${OSGEARTH_TOOL_PLUGIN_PATH}") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}") - - #Debug - set(OSGEARTH_DEBUG_TOOL_PATH "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") - set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH "${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}") - - file(MAKE_DIRECTORY "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") - - file(GLOB OSGDB_DEBUG_PLUGINS "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll") - - file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/osgEarth/Export" "defined( OSGEARTH_LIBRARY_STATIC )" "1") +endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}") +# Merge osgearth plugins into [/debug]/plugins/osgPlugins-${OSG_VER}, +# as a staging area for later deployment. +set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB osg_plugins_subdir RELATIVE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/bin/osgPlugins-*") + list(LENGTH osg_plugins_subdir osg_plugins_subdir_LENGTH) + if(NOT osg_plugins_subdir_LENGTH EQUAL 1) + message(FATAL_ERROR "Could not determine osg plugins directory.") + endif() + file(GLOB osgearth_plugins "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}/${osg_plugin_pattern}") + file(INSTALL ${osgearth_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}") + if(NOT VCPKG_BUILD_TYPE) + file(GLOB osgearth_plugins "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}/${osg_plugin_pattern}") + file(INSTALL ${osgearth_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}") endif() -if ("tools" IN_LIST FEATURES) +if("tools" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") + file(INSTALL ${osg_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${osg_plugins_subdir}") + if(NOT VCPKG_BUILD_TYPE) + file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") + 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_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + osgearth_createtile osgearth_mvtindex AUTO_CLEAN ) endif() diff --git a/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch b/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch new file mode 100644 index 000000000..4c6f0fdb2 --- /dev/null +++ b/external_imported/vcpkg/ports/osgearth/remove-lerc-gltf.patch @@ -0,0 +1,20 @@ +diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt +index d178f951b..010896310 100644 +--- a/src/osgEarthDrivers/CMakeLists.txt ++++ b/src/osgEarthDrivers/CMakeLists.txt +@@ -30,7 +30,6 @@ add_subdirectory(earth) + add_subdirectory(engine_rex) + add_subdirectory(featurefilter_intersect) + add_subdirectory(featurefilter_join) +-add_subdirectory(gltf) + 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) diff --git a/external_imported/vcpkg/ports/osgearth/vcpkg.json b/external_imported/vcpkg/ports/osgearth/vcpkg.json index f9dcae84c..364478fc0 100644 --- a/external_imported/vcpkg/ports/osgearth/vcpkg.json +++ b/external_imported/vcpkg/ports/osgearth/vcpkg.json @@ -1,13 +1,13 @@ { "name": "osgearth", - "version": "3.2", - "port-version": 4, + "version": "3.3", + "port-version": 2, "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)", "dependencies": [ "basisu", - "blend2d", "cfitsio", "draco", "geos", @@ -17,6 +17,7 @@ "opengl", { "name": "osg", + "default-features": false, "features": [ "plugins" ] @@ -28,12 +29,35 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ - "tools" + "default-features" ], "features": { + "blend2d": { + "description": "Enable Blend2D support", + "dependencies": [ + "blend2d" + ] + }, + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "osgearth", + "default-features": false, + "features": [ + "blend2d" + ], + "platform": "!arm & !uwp & !wasm32" + } + ] + }, "tools": { "description": "Build tools" } diff --git a/external_imported/vcpkg/ports/otl/portfile.cmake b/external_imported/vcpkg/ports/otl/portfile.cmake index 6809aa182..a9f04b06b 100644 --- a/external_imported/vcpkg/ports/otl/portfile.cmake +++ b/external_imported/vcpkg/ports/otl/portfile.cmake @@ -3,7 +3,7 @@ set(OTL_VERSION 40463) vcpkg_download_distfile(ARCHIVE URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip" - SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392 + SHA512 9485a0fe15a737d55b0746a7e289b1a20e9435ed5c69bda7010705f8cde0a456163d83221d0103236a723837596613b578edc6d3d0007ce80a6cc76b4ed83888 ) vcpkg_extract_source_archive_ex( diff --git a/external_imported/vcpkg/ports/otl/vcpkg.json b/external_imported/vcpkg/ports/otl/vcpkg.json index 0c0a12814..d20d845c5 100644 --- a/external_imported/vcpkg/ports/otl/vcpkg.json +++ b/external_imported/vcpkg/ports/otl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "otl", "version": "4.0.463", - "port-version": 1, + "port-version": 2, "description": "Oracle, Odbc and DB2-CLI Template Library", "homepage": "http://otl.sourceforge.net/", "license": "ISC" diff --git a/external_imported/vcpkg/ports/outcome/fix-find-library.patch b/external_imported/vcpkg/ports/outcome/fix-find-library.patch new file mode 100644 index 000000000..5d7f22b8b --- /dev/null +++ b/external_imported/vcpkg/ports/outcome/fix-find-library.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a292728cf4..5286b5e366 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,17 +40,6 @@ include(QuickCppLibRequireOutOfSourceBuild) + include(QuickCppLibUtils) + include(QuickCppLibPolicies) + +-if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) +- ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git") +-else() +- find_quickcpplib_library(status-code +- GIT_REPOSITORY "https://github.com/ned14/status-code.git" +- GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}" +- REQUIRED +- IS_HEADER_ONLY +- ) +-endif() +- + # Parse the version we tell cmake directly from the version header file + ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/detail/version.hpp" VERSIONSTRING) + # Sets the usual PROJECT_NAME etc +@@ -99,8 +88,16 @@ else() + IS_HEADER_ONLY + ) + endif() +-if (NOT OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) +- list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX /status-code/include/) ++if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) ++ ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git") ++else() ++ find_quickcpplib_library(status-code ++ GIT_REPOSITORY "https://github.com/ned14/status-code.git" ++ GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}" ++ REQUIRED ++ IS_HEADER_ONLY ++ ) ++ list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX include/outcome/experimental/status-code/) + endif() + + # Make an interface only library so dependent CMakeLists can bring in this header-only library diff --git a/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch b/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch new file mode 100644 index 000000000..1b601054a --- /dev/null +++ b/external_imported/vcpkg/ports/outcome/fix-status-code-include.patch @@ -0,0 +1,16 @@ +diff --git a/include/outcome/experimental/coroutine_support.hpp b/include/outcome/experimental/coroutine_support.hpp +index 21759ede58..6c4b152294 100644 +--- a/include/outcome/experimental/coroutine_support.hpp ++++ b/include/outcome/experimental/coroutine_support.hpp +@@ -45,7 +45,11 @@ Distributed under the Boost Software License, Version 1.0. + OUTCOME_V2_NAMESPACE_END + + #ifdef __cpp_exceptions ++#if 0 + #include "status-code/include/system_code_from_exception.hpp" ++#else ++#include ++#endif + OUTCOME_V2_NAMESPACE_BEGIN + namespace awaitables + { diff --git a/external_imported/vcpkg/ports/outcome/outcome-prune-sources.patch b/external_imported/vcpkg/ports/outcome/outcome-prune-sources.patch deleted file mode 100644 index 59c5db01a..000000000 --- a/external_imported/vcpkg/ports/outcome/outcome-prune-sources.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git "a/cmake/headers.cmake" "b/cmake/headers.cmake" -index 108038d16..bf4807e16 100644 ---- "a/cmake/headers.cmake" -+++ "b/cmake/headers.cmake" -@@ -47,7 +47,6 @@ set(outcome_HEADERS - "include/outcome/experimental/status-code/include/system_code_from_exception.hpp" - "include/outcome/experimental/status-code/include/system_error2.hpp" - "include/outcome/experimental/status-code/include/win32_code.hpp" -- "include/outcome/experimental/status-code/single-header/system_error2.hpp" - "include/outcome/experimental/status_outcome.hpp" - "include/outcome/experimental/status_result.hpp" - "include/outcome/iostream_support.hpp" diff --git a/external_imported/vcpkg/ports/outcome/portfile.cmake b/external_imported/vcpkg/ports/outcome/portfile.cmake index a031a77b0..d6943416d 100644 --- a/external_imported/vcpkg/ports/outcome/portfile.cmake +++ b/external_imported/vcpkg/ports/outcome/portfile.cmake @@ -15,63 +15,48 @@ # the exact copy of those third party libraries known to # have passed Outcome's CI process. -message(WARNING [=[ -Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. -]=]) +if ("polyfill-cxx20" IN_LIST FEATURES) + message(WARNING [=[ + Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF 9c6ad6e8e6a48ddde65c0617e3df306bc901b41d - SHA512 b53807fdf9ac3647882f2029a7c5311e7f313abaec703142d2c6d4e73651898d868bfdd600e5f2fa3344e91ebb576324b4624ccf4aa8e09314b7a7ede4cb0fbc + REF 90032f99503b4620f21d8160dc3af06fa343541f + SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f HEAD_REF develop PATCHES - outcome-prune-sources.patch -) - -# Outcome needs a copy of QuickCppLib with which to bootstrap its cmake -file(COPY "${CURRENT_INSTALLED_DIR}/include/quickcpplib" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/include/" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/ned14-internal-quickcpplib/" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/" -) - -# Outcome expects status-code to live inside its include directory -file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/" - DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/" -) -file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/detail/" - DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/detail/" + fix-find-library.patch # incorporated into upstream after 2.2.4 + fix-status-code-include.patch # incorporated into upstream after 2.2.4 ) # Because outcome's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) -# Already installed dependencies don't appear on the include path, which Outcome assumes. -string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") -string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") - # Use Outcome's own build process, skipping examples and tests. -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_FOUND=1 + -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib + -DOUTCOME_BUNDLE_EMBEDDED_STATUS_CODE=OFF + -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCXX_CONCEPTS_FLAGS= ) if("run-tests" IN_LIST FEATURES) - vcpkg_build_cmake(TARGET test) + vcpkg_cmake_build(TARGET test) endif() -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/outcome) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/outcome) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/external_imported/vcpkg/ports/outcome/vcpkg.json b/external_imported/vcpkg/ports/outcome/vcpkg.json index eb8b45aa3..5ae09aacd 100644 --- a/external_imported/vcpkg/ports/outcome/vcpkg.json +++ b/external_imported/vcpkg/ports/outcome/vcpkg.json @@ -1,14 +1,59 @@ { "name": "outcome", - "version-string": "2.2.2-20211208", + "version": "2.2.4", + "port-version": 1, + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", + "license": "Apache-2.0 OR BSL-1.0", "supports": "!uwp", "dependencies": [ "ned14-internal-quickcpplib", - "status-code" + "status-code", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { + "polyfill-cxx17": { + "description": "Polyfill C++17 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "polyfill-cxx17" + ] + }, + { + "name": "outcome", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + } + ] + }, + "polyfill-cxx20": { + "description": "Polyfill C++20 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + } + ] + }, "run-tests": { "description": "Build and run the dependency validation tests" } diff --git a/external_imported/vcpkg/ports/pagmo2/disable-C4701.patch b/external_imported/vcpkg/ports/pagmo2/disable-C4701.patch deleted file mode 100644 index 05ed75bd2..000000000 --- a/external_imported/vcpkg/ports/pagmo2/disable-C4701.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96653ba..1afaafa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ endif() - if(YACMA_COMPILER_IS_MSVC) - # Disable the idiotic minmax macros on MSVC, some annoying warnings, - # enable the bigobj option and the WIN32_LEAN_AND_MEAN definition. -- list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") -+ list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/wd4701" "/bigobj" "-DWIN32_LEAN_AND_MEAN") - list(APPEND PAGMO_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") - # Enable strict conformance mode, if supported. - set(CMAKE_REQUIRED_QUIET TRUE) diff --git a/external_imported/vcpkg/ports/pagmo2/disable-md-override.patch b/external_imported/vcpkg/ports/pagmo2/disable-md-override.patch deleted file mode 100644 index a5e09d3fa..000000000 --- a/external_imported/vcpkg/ports/pagmo2/disable-md-override.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96653ba..549d9d4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,7 @@ endif() - # Boost setup. - include(PagmoFindBoost) - -+if(0) - # Explanation: on MSVC, when building static libraries, it is good practice to link - # to the static runtime. CMake, however, is hard-coded to link to the dynamic runtime. - # Hence we hackishly replace the /MD flag with /MT. This is the approach suggested -@@ -161,6 +162,7 @@ if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY) - endif() - endforeach() - endif() -+endif() - - # List of source files. - set(PAGMO_SRC_FILES diff --git a/external_imported/vcpkg/ports/pagmo2/disable-werror.patch b/external_imported/vcpkg/ports/pagmo2/disable-werror.patch new file mode 100644 index 000000000..bc5ba11b3 --- /dev/null +++ b/external_imported/vcpkg/ports/pagmo2/disable-werror.patch @@ -0,0 +1,20 @@ +diff --git a/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake b/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake +index 7d7aa1b..81c8bf6 100644 +--- a/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake ++++ b/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake +@@ -95,7 +95,6 @@ if(NOT _YACMACompilerLinkerSettingsRun) + # NOTE: enable unconditionally, as it seems like the CMake + # machinery for detecting this fails. Perhaps the source code + # used for checking the flag emits warnings? +- list(APPEND _YACMA_CXX_FLAGS_DEBUG "-Werror") + # New warnings in clang 8. + # NOTE: a few issues with macros here, let's disable for now. + # _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wextra-semi-stmt) +@@ -180,7 +179,6 @@ if(NOT _YACMACompilerLinkerSettingsRun) + # Enable higher warning level than usual. + _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(/W4) + # Treat warnings as errors. +- _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(/WX) + endif() + + # Set the cache variables. diff --git a/external_imported/vcpkg/ports/pagmo2/doxygen.patch b/external_imported/vcpkg/ports/pagmo2/doxygen.patch new file mode 100644 index 000000000..1a59a9110 --- /dev/null +++ b/external_imported/vcpkg/ports/pagmo2/doxygen.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34bad69..dfb942d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,8 +398,8 @@ endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/include/pagmo/config.hpp" @ONLY) + + # Configure the doc files. +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile" @ONLY) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py" @ONLY) ++# configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile" @ONLY) ++# configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py" @ONLY) + + # This is just a simple counter variable, internal use only. + set(_PAGMO_TEST_NUM "0") diff --git a/external_imported/vcpkg/ports/pagmo2/find-tbb.patch b/external_imported/vcpkg/ports/pagmo2/find-tbb.patch index 8781910f8..56d998e3e 100644 --- a/external_imported/vcpkg/ports/pagmo2/find-tbb.patch +++ b/external_imported/vcpkg/ports/pagmo2/find-tbb.patch @@ -2,11 +2,12 @@ diff --git a/pagmo-config.cmake.in b/pagmo-config.cmake.in index 9553fc8..cb5e90b 100644 --- a/pagmo-config.cmake.in +++ b/pagmo-config.cmake.in -@@ -8,6 +8,7 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) +@@ -8,6 +8,8 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) find_package(Threads REQUIRED) unset(THREADS_PREFER_PTHREAD_FLAG) include(PagmoFindBoost) -+find_package(TBB REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(TBB CONFIG) @_PAGMO_CONFIG_OPTIONAL_DEPS@ # Restore original module path. set(CMAKE_MODULE_PATH "${_PAGMO_CONFIG_OLD_MODULE_PATH}") diff --git a/external_imported/vcpkg/ports/pagmo2/portfile.cmake b/external_imported/vcpkg/ports/pagmo2/portfile.cmake index a709a2fb6..a22174554 100644 --- a/external_imported/vcpkg/ports/pagmo2/portfile.cmake +++ b/external_imported/vcpkg/ports/pagmo2/portfile.cmake @@ -1,36 +1,37 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO esa/pagmo2 - REF v2.16.1 - SHA512 dac85a8525316e827df809d187d40f14dc20db7119796b7384d7855f83ba37e0bb595f6d8199053aac857460816929dd599c9d43802f2ed920a6f42dd2f16a03 + REPO esa/pagmo2 + REF v2.18.0 + SHA512 026f038e979bb884bdc4e465bd60ffe60d3d74d38159a70897da7c890230450a0457a943e25c8bdb3f17bafdaa388a6a21f6d44502b4d08860dae6cb4e75a477 HEAD_REF master PATCHES - "disable-C4701.patch" - "disable-md-override.patch" - "find-tbb.patch" + doxygen.patch + find-tbb.patch + disable-werror.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - nlopt PAGMO_WITH_NLOPT + nlopt PAGMO_WITH_NLOPT ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DPAGMO_BUILD_TESTS=OFF + -DPAGMO_BUILD_BENCHMARKS=OFF + -DPAGMO_BUILD_TUTORIALS=OFF -DPAGMO_WITH_EIGEN3=ON -DPAGMO_BUILD_STATIC_LIBRARY=${PAGMO_BUILD_STATIC_LIBRARY} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pagmo) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pagmo") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/COPYING.lgpl3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.lgpl3" "${SOURCE_PATH}/COPYING.gpl3") diff --git a/external_imported/vcpkg/ports/pagmo2/vcpkg.json b/external_imported/vcpkg/ports/pagmo2/vcpkg.json index 4e491b496..a177b2df3 100644 --- a/external_imported/vcpkg/ports/pagmo2/vcpkg.json +++ b/external_imported/vcpkg/ports/pagmo2/vcpkg.json @@ -1,14 +1,23 @@ { "name": "pagmo2", - "version": "2.16.1", - "description": "A C++ platform to perform parallel computations of optimisation tasks (global and local) via the asynchronous generalized island model.", + "version": "2.18.0", + "description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.", "homepage": "https://esa.github.io/pagmo2/", + "license": "GPL-3.0-or-later OR LGPL-3.0-or-later", "dependencies": [ "boost-any", "boost-graph", "boost-serialization", "eigen3", - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "nlopt": { diff --git a/external_imported/vcpkg/ports/paho-mqtt/fix-install-path.patch b/external_imported/vcpkg/ports/paho-mqtt/fix-install-path.patch deleted file mode 100644 index 68cb3b4c4..000000000 --- a/external_imported/vcpkg/ports/paho-mqtt/fix-install-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa4ad05..669adde 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC) - MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both") - ENDIF() - --IF(PAHO_BUILD_DEB_PACKAGE) -- set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt) -+IF(1) -+ set(CMAKE_INSTALL_DOCDIR share/paho-mqtt) - set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) - set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=") - ENDIF() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bc7194..db4a0ac 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC) - ENDIF() - - INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h MQTTExportDeclarations.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt) - - IF (PAHO_WITH_SSL) - SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes") diff --git a/external_imported/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch b/external_imported/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch index 772636832..0b7e9fb88 100644 --- a/external_imported/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch +++ b/external_imported/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch @@ -1,11 +1,12 @@ diff --git a/src/SHA1.c b/src/SHA1.c -index 3ef07d9..f0e82ce 100644 +index 3ef07d9..8ed6b16 100644 --- a/src/SHA1.c +++ b/src/SHA1.c -@@ -19,6 +19,7 @@ +@@ -18,7 +18,7 @@ + #if !defined(OPENSSL) #if defined(_WIN32) || defined(_WIN64) - #pragma comment(lib, "crypt32.lib") +-#pragma comment(lib, "crypt32.lib") +#pragma comment(lib, "Advapi32.lib") int SHA1_Init(SHA_CTX *c) diff --git a/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake b/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake index 7c7875bb2..5257c91be 100644 --- a/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake +++ b/external_imported/vcpkg/ports/paho-mqtt/portfile.cmake @@ -1,21 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9 - SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7 + REF eff2da4875725509fc97641b118d6badf3e3a08f # v1.3.10 + SHA512 5e190ffd978dad0f60b70bdad2727e567539aff2c55e38023dfbcbe9b50bcbe75d8230c501c09e9c0a0329bed3fd149d5d59d65ad0ba0f84a54f641b4f01390a HEAD_REF master PATCHES - remove_compiler_options.patch - fix-install-path.patch fix-unresolvedsymbol-arm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC} @@ -23,15 +20,22 @@ vcpkg_configure_cmake( -DPAHO_ENABLE_TESTING=FALSE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c TARGET_PATH share/eclipse-paho-mqtt-c) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME eclipse-paho-mqtt-c CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c) vcpkg_copy_pdbs() 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)]] +) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/paho-mqtt/remove_compiler_options.patch b/external_imported/vcpkg/ports/paho-mqtt/remove_compiler_options.patch deleted file mode 100644 index a1193fee8..000000000 --- a/external_imported/vcpkg/ports/paho-mqtt/remove_compiler_options.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 531c39c..3df385a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ IF (PAHO_HIGH_PERFORMANCE) - ENDIF() - - IF(WIN32) -- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD) -+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN) - ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - ADD_DEFINITIONS(-DOSX) - ENDIF() diff --git a/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json b/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json index 186e1299e..2bed81bb8 100644 --- a/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/paho-mqtt/vcpkg.json @@ -1,9 +1,18 @@ { "name": "paho-mqtt", - "version-semver": "1.3.9", + "version-semver": "1.3.10", "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": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/fix-include-path.patch b/external_imported/vcpkg/ports/paho-mqttpp3/fix-include-path.patch deleted file mode 100644 index 17310738d..000000000 --- a/external_imported/vcpkg/ports/paho-mqttpp3/fix-include-path.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h -index 7fb13a4..59247ca 100644 ---- a/src/mqtt/async_client.h -+++ b/src/mqtt/async_client.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_async_client_h - #define __mqtt_async_client_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/token.h" - #include "mqtt/create_options.h" -diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h -index 63f21a1..c4638fa 100644 ---- a/src/mqtt/callback.h -+++ b/src/mqtt/callback.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_callback_h - #define __mqtt_callback_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/delivery_token.h" - #include "mqtt/types.h" - #include -diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h -index 8001fe3..650ba91 100644 ---- a/src/mqtt/connect_options.h -+++ b/src/mqtt/connect_options.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_connect_options_h - #define __mqtt_connect_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" -diff --git a/src/mqtt/create_options.h b/src/mqtt/create_options.h -index d57e32b..2bb3561 100644 ---- a/src/mqtt/create_options.h -+++ b/src/mqtt/create_options.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_create_options_h - #define __mqtt_create_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - - namespace mqtt { -diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h -index b70d582..ee1b306 100644 ---- a/src/mqtt/delivery_token.h -+++ b/src/mqtt/delivery_token.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_delivery_token_h - #define __mqtt_delivery_token_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/token.h" - #include "mqtt/message.h" - #include -diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h -index db93679..2739d89 100644 ---- a/src/mqtt/disconnect_options.h -+++ b/src/mqtt/disconnect_options.h -@@ -23,7 +23,7 @@ - #ifndef __mqtt_disconnect_options_h - #define __mqtt_disconnect_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/token.h" - #include "mqtt/properties.h" -diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h -index 9db330a..32b7c97 100644 ---- a/src/mqtt/exception.h -+++ b/src/mqtt/exception.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_exception_h - #define __mqtt_exception_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - #include -diff --git a/src/mqtt/iaction_listener.h b/src/mqtt/iaction_listener.h -index 1e34577..2af8c1b 100644 ---- a/src/mqtt/iaction_listener.h -+++ b/src/mqtt/iaction_listener.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_iaction_listener_h - #define __mqtt_iaction_listener_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - -diff --git a/src/mqtt/iclient_persistence.h b/src/mqtt/iclient_persistence.h -index 635a292..aedc1d9 100644 ---- a/src/mqtt/iclient_persistence.h -+++ b/src/mqtt/iclient_persistence.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_iclient_persistence_h - #define __mqtt_iclient_persistence_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/buffer_view.h" - #include "mqtt/string_collection.h" -diff --git a/src/mqtt/message.h b/src/mqtt/message.h -index 4cb95a6..e036269 100644 ---- a/src/mqtt/message.h -+++ b/src/mqtt/message.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_message_h - #define __mqtt_message_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/buffer_ref.h" - #include "mqtt/properties.h" - #include "mqtt/exception.h" -diff --git a/src/mqtt/properties.h b/src/mqtt/properties.h -index 826bc97..42c286a 100644 ---- a/src/mqtt/properties.h -+++ b/src/mqtt/properties.h -@@ -25,7 +25,7 @@ - #define __mqtt_properties_h - - extern "C" { -- #include "MQTTProperties.h" -+ #include "paho-mqtt/MQTTAsync.h" - } - - #include "mqtt/types.h" -diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h -index 7bcb45c..40e45a2 100644 ---- a/src/mqtt/response_options.h -+++ b/src/mqtt/response_options.h -@@ -7,7 +7,7 @@ - #ifndef __mqtt_response_options_h - #define __mqtt_response_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/token.h" - #include "mqtt/delivery_token.h" - #include "subscribe_options.h" -diff --git a/src/mqtt/server_response.h b/src/mqtt/server_response.h -index a111839..094135b 100644 ---- a/src/mqtt/server_response.h -+++ b/src/mqtt/server_response.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_server_response_h - #define __mqtt_server_response_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/properties.h" - -diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h -index eba49ed..aad0da3 100644 ---- a/src/mqtt/ssl_options.h -+++ b/src/mqtt/ssl_options.h -@@ -27,7 +27,7 @@ - #ifndef __mqtt_ssl_options_h - #define __mqtt_ssl_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" - #include "mqtt/types.h" -diff --git a/src/mqtt/string_collection.h b/src/mqtt/string_collection.h -index bc43775..99a2674 100644 ---- a/src/mqtt/string_collection.h -+++ b/src/mqtt/string_collection.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_string_collection_h - #define __mqtt_string_collection_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - #include -diff --git a/src/mqtt/subscribe_options.h b/src/mqtt/subscribe_options.h -index 753c811..5f0d86c 100644 ---- a/src/mqtt/subscribe_options.h -+++ b/src/mqtt/subscribe_options.h -@@ -24,8 +24,8 @@ - #ifndef __mqtt_subscribe_options_h - #define __mqtt_subscribe_options_h - --#include "MQTTAsync.h" --#include "MQTTSubscribeOpts.h" -+#include "paho-mqtt/MQTTAsync.h" -+#include "paho-mqtt/MQTTSubscribeOpts.h" - #include "mqtt/types.h" - - namespace mqtt { -diff --git a/src/mqtt/token.h b/src/mqtt/token.h -index 4cafda7..1815ab9 100644 ---- a/src/mqtt/token.h -+++ b/src/mqtt/token.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_token_h - #define __mqtt_token_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/iaction_listener.h" - #include "mqtt/exception.h" - #include "mqtt/types.h" -diff --git a/src/mqtt/topic.h b/src/mqtt/topic.h -index 618eb85..555de60 100644 ---- a/src/mqtt/topic.h -+++ b/src/mqtt/topic.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_topic_h - #define __mqtt_topic_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/delivery_token.h" - #include "mqtt/subscribe_options.h" - #include "mqtt/message.h" -diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h -index 8c5c67d..63bfffc 100644 ---- a/src/mqtt/will_options.h -+++ b/src/mqtt/will_options.h -@@ -26,7 +26,7 @@ - #ifndef __mqtt_will_options_h - #define __mqtt_will_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake b/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake index 7926d0d73..d2103a8c5 100644 --- a/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake +++ b/external_imported/vcpkg/ports/paho-mqttpp3/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55 HEAD_REF master PATCHES - fix-include-path.patch fix-dependency.patch ) @@ -43,9 +42,8 @@ else() set(PAHO_OPTIONS) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC} -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED} @@ -55,13 +53,13 @@ vcpkg_configure_cmake( ) # Run the build, copy pdbs and fixup the cmake targets -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/PahoMqttCpp" TARGET_PATH "share/pahomqttcpp") +vcpkg_cmake_config_fixup(PACKAGE_NAME PahoMqttCpp CONFIG_PATH "lib/cmake/PahoMqttCpp") # Remove the include and share folders in debug folder -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") # Add copyright -file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/about.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json b/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json index b4152d708..4ea7289ec 100644 --- a/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json +++ b/external_imported/vcpkg/ports/paho-mqttpp3/vcpkg.json @@ -1,10 +1,20 @@ { "name": "paho-mqttpp3", "version": "1.2.0", + "port-version": 1, "description": "Paho project provides open-source C++ wrapper for Paho C library", "homepage": "https://github.com/eclipse/paho.mqtt.cpp", + "license": "EPL-1.0", "dependencies": [ - "paho-mqtt" + "paho-mqtt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "ssl" diff --git a/external_imported/vcpkg/ports/pango/portfile.cmake b/external_imported/vcpkg/ports/pango/portfile.cmake index 3dd0e5b96..0132f369f 100644 --- a/external_imported/vcpkg/ports/pango/portfile.cmake +++ b/external_imported/vcpkg/ports/pango/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango - REF 37a427018c92a2bc679ef104097e07a619609c9c #v1.50.6 - SHA512 4990022cae2130b4842d0d9d3161545c7214ac3dd445d85a7ec49b0a89e39319b404fecc66d4025965cd2407823c7476b937e6ee53e2e6763b35048db8ff387f + REF a3517dcc6de9bae1193075b7112aa7db97b39dcc #v1.50.9 + SHA512 d09bc672e65897f5a3deae45f6e7f91844fb6d72c43944d3480a4b9e84b43fcb0e701b0b84d864b15d8520287f6d0d02b489a42775df6746ffe6673588f8f05c HEAD_REF master # branch name ) diff --git a/external_imported/vcpkg/ports/pango/vcpkg.json b/external_imported/vcpkg/ports/pango/vcpkg.json index faf48574f..566a8a0bc 100644 --- a/external_imported/vcpkg/ports/pango/vcpkg.json +++ b/external_imported/vcpkg/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version": "1.50.6", + "version": "1.50.9", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", diff --git a/external_imported/vcpkg/ports/pangolin/fix-dependencies.patch b/external_imported/vcpkg/ports/pangolin/fix-dependencies.patch index e3ced434e..9aef48802 100644 --- a/external_imported/vcpkg/ports/pangolin/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/pangolin/fix-dependencies.patch @@ -52,7 +52,7 @@ index ddeb144..ee27d57 100644 list(APPEND HEADERS ${INCDIR}/video/drivers/uvc.h ) list(APPEND SOURCES video/drivers/uvc.cpp) list(APPEND VIDEO_FACTORY_REG RegisterUvcVideoFactory ) -@@ -584,11 +590,10 @@ endif() +@@ -584,11 +590,14 @@ endif() option(BUILD_PANGOLIN_LIBOPENEXR "Build support for libopenexr image input" ON) if(BUILD_PANGOLIN_LIBOPENEXR) @@ -62,7 +62,11 @@ index ddeb144..ee27d57 100644 set(HAVE_OPENEXR 1) - list(APPEND INTERNAL_INC ${OpenEXR_INCLUDE_DIR} ) - list(APPEND LINK_LIBS ${OpenEXR_LIBRARY} ) -+ list(APPEND LINK_LIBS OpenEXR::IlmImf OpenEXR::IlmImfUtil OpenEXR::IlmImfConfig ) ++ list(APPEND LINK_LIBS OpenEXR::OpenEXR) ++ string(APPEND ExternConfig " ++ include(CMakeFindDependencyMacro) ++ find_dependency(OpenEXR CONFIG) ++") message(STATUS "libopenexr Found and Enabled") endif() endif() @@ -95,3 +99,31 @@ index ddeb144..ee27d57 100644 target_link_libraries(pypangolin PRIVATE ${LIBRARY_NAME}) target_include_directories(pypangolin PRIVATE "${USER_INC}") endif() +diff --git a/src/image/image_io_exr.cpp b/src/image/image_io_exr.cpp +index 52c0078..1bd6c55 100644 +--- a/src/image/image_io_exr.cpp ++++ b/src/image/image_io_exr.cpp +@@ -4,6 +4,8 @@ + #include + + #ifdef HAVE_OPENEXR ++#include ++#include + #include + #include + #include +@@ -54,12 +56,12 @@ class StdIStream: public Imf::IStream + return true; + } + +- virtual Imf::Int64 tellg () ++ virtual uint64_t tellg () + { + return std::streamoff (_is->tellg()); + } + +- virtual void seekg (Imf::Int64 pos) ++ virtual void seekg (uint64_t pos) + { + _is->seekg (pos); + } diff --git a/external_imported/vcpkg/ports/pangolin/vcpkg.json b/external_imported/vcpkg/ports/pangolin/vcpkg.json index f44614473..5bf49539b 100644 --- a/external_imported/vcpkg/ports/pangolin/vcpkg.json +++ b/external_imported/vcpkg/ports/pangolin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pangolin", "version": "0.6", - "port-version": 2, + "port-version": 3, "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "supports": "!uwp", diff --git a/external_imported/vcpkg/ports/pangomm/COPYING b/external_imported/vcpkg/ports/pangomm/COPYING deleted file mode 100644 index c4792dd27..000000000 --- a/external_imported/vcpkg/ports/pangomm/COPYING +++ /dev/null @@ -1,515 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -You should also get your employer (if you work as a programmer) or -your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James -Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/external_imported/vcpkg/ports/pangomm/portfile.cmake b/external_imported/vcpkg/ports/pangomm/portfile.cmake index 3c2a0c32f..bc19a9516 100644 --- a/external_imported/vcpkg/ports/pangomm/portfile.cmake +++ b/external_imported/vcpkg/ports/pangomm/portfile.cmake @@ -1,3 +1,4 @@ +# Keep distfile, don't use GitLab! vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.50/pangomm-2.50.0.tar.xz" FILENAME "pangomm-2.50.0.tar.xz" @@ -10,9 +11,10 @@ vcpkg_extract_source_archive_ex( ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" 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' @@ -23,4 +25,4 @@ vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/pangomm/vcpkg.json b/external_imported/vcpkg/ports/pangomm/vcpkg.json index b2a91c871..a78702129 100644 --- a/external_imported/vcpkg/ports/pangomm/vcpkg.json +++ b/external_imported/vcpkg/ports/pangomm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pangomm", "version": "2.50.0", - "port-version": 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://ftp.gnome.org/pub/GNOME/sources/pangomm", + "homepage": "https://gitlab.gnome.org/GNOME/pangomm", + "license": "LGPL-2.1", "supports": "!arm", "dependencies": [ "cairo", diff --git a/external_imported/vcpkg/ports/paraview/portfile.cmake b/external_imported/vcpkg/ports/paraview/portfile.cmake index 94ccea1a6..46ea8b9a8 100644 --- a/external_imported/vcpkg/ports/paraview/portfile.cmake +++ b/external_imported/vcpkg/ports/paraview/portfile.cmake @@ -1,5 +1,5 @@ file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json) -string(JSON _ver_string GET "${_vcpkg_json}" "version-semver") +string(JSON _ver_string GET "${_vcpkg_json}" "version") string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -62,9 +62,9 @@ vcpkg_from_gitlab( ) -file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge) -file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting) -file(COPY ${CATALYST_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst) +file(COPY "${VISITIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/Utilities/VisItBridge") +file(COPY "${QTTESTING_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting") +file(COPY "${CATALYST_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst") if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) @@ -75,9 +75,8 @@ if("python" IN_LIST FEATURES) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON @@ -102,16 +101,16 @@ if(CMAKE_HOST_UNIX) set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}:${CURRENT_INSTALLED_DIR}/lib") endif() -vcpkg_install_cmake(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools +vcpkg_cmake_install(ADD_BIN_TO_PATH) # Bin to path required since paraview will use some self build tools if(CMAKE_HOST_UNIX) set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-${VERSION}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION}) -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") # see https://gitlab.kitware.com/paraview/paraview/-/issues/21328 file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h") @@ -131,34 +130,34 @@ foreach(tool ${TOOLS}) # Remove debug tools set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${tool}-${TOOLVER}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(REMOVE ${filename}) + file(REMOVE "${filename}") endif() # Move release tools set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") endif() set(filename ${CURRENT_PACKAGES_DIR}/bin/${tool}-${TOOLVER}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) if(EXISTS ${filename}) - file(INSTALL ${filename} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${filename}) + file(INSTALL "${filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${filename}") endif() endforeach() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) # # Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME Copyright.txt) # Which one is the correct one? -file(INSTALL ${SOURCE_PATH}/License_v1.2.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one? +file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") macro(move_bin_to_lib name) @@ -182,5 +181,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(WRITE "${cmake_file}" "${_contents}") endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() \ No newline at end of file + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# The plugins also work without these files +file(REMOVE "${CURRENT_PACKAGES_DIR}/Applications/paraview.app/Contents/Resources/paraview.conf") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/Applications/paraview.app/Contents/Resources/paraview.conf") diff --git a/external_imported/vcpkg/ports/paraview/vcpkg.json b/external_imported/vcpkg/ports/paraview/vcpkg.json index c531933dc..ba62136a0 100644 --- a/external_imported/vcpkg/ports/paraview/vcpkg.json +++ b/external_imported/vcpkg/ports/paraview/vcpkg.json @@ -1,15 +1,24 @@ { "name": "paraview", - "version-semver": "5.9.1", - "port-version": 1, + "version": "5.9.1", + "port-version": 2, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", + "license": "BSD-3-Clause", "dependencies": [ "boost-algorithm", "boost-core", "boost-format", "cgns", "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "vtk", "default-features": false, diff --git a/external_imported/vcpkg/ports/parmetis/build-fixes.patch b/external_imported/vcpkg/ports/parmetis/build-fixes.patch new file mode 100644 index 000000000..ff12d4551 --- /dev/null +++ b/external_imported/vcpkg/ports/parmetis/build-fixes.patch @@ -0,0 +1,98 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 146bc5f..8d6ae23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(ParMETIS C) + + +@@ -24,20 +24,16 @@ include(./conf/gkbuild.cmake) + # i.e., the -I equivalent + include_directories(include) + include_directories(${MPI_INCLUDE_PATH}) +-include_directories(${GKLIB_PATH}/include) +-include_directories(${METIS_PATH}/include) +-include_directories(${CMAKE_INSTALL_PREFIX}/include) +- +-# List of paths that the compiler will search for library files. +-# i.e., the -L equivalent +-link_directories(${GKLIB_PATH}/lib) +-link_directories(${METIS_PATH}/lib) +-link_directories(${CMAKE_INSTALL_PREFIX}/lib) +- + # List of directories that cmake will look for CMakeLists.txt +-add_subdirectory(include) + add_subdirectory(libparmetis) +-add_subdirectory(programs) + + # This is for testing during development and is not being distributed + #add_subdirectory(test) ++ ++install(EXPORT parmetisTargets FILE "parmetisTargets.cmake" DESTINATION "share/parmetis") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/parmetis/parmetisConfig.cmake" [=[ ++include(CMakeFindDependencyMacro) ++find_dependency(GKlib CONFIG) ++find_dependency(metis CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/parmetisTargets.cmake") ++]=]) +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index afcafdd..3040b09 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -15,7 +15,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GK_COPTS "/Ox") + set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GK_COPTS "-DUSE_GKREGEX") +@@ -33,7 +32,7 @@ if(CMAKE_COMPILER_IS_GNUCC) + set(GK_COPTIONS "${GK_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GK_COPTIONS "${GK_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -64,7 +63,7 @@ endif(OPENMP) + if(GDB) + set(GK_COPTS "${GK_COPTS} -g") + set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() ++elseif(0) + set(GK_COPTS "-O3") + endif(GDB) + +@@ -135,4 +134,3 @@ endif() + + # Finally set the official C flags. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GK_COPTIONS} ${GK_COPTS}") +- +diff --git a/libparmetis/CMakeLists.txt b/libparmetis/CMakeLists.txt +index e8c3213..dcdf64e 100644 +--- a/libparmetis/CMakeLists.txt ++++ b/libparmetis/CMakeLists.txt +@@ -4,10 +4,14 @@ include_directories(.) + # Find sources. + file(GLOB parmetis_sources *.c) + ++find_package(GKlib CONFIG REQUIRED) ++find_package(metis CONFIG REQUIRED) ++find_package(MPI REQUIRED) ++ + # Create libparmetis + add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) +- +-install(TARGETS parmetis +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- ARCHIVE DESTINATION lib) ++target_link_libraries(parmetis PRIVATE GKlib metis ${MPI_C_LIBRARIES}) ++target_include_directories(parmetis PUBLIC ${MPI_C_INCLUDE_DIRS}) ++target_include_directories(parmetis PRIVATE "../include") ++install(FILES "../include/parmetis.h" DESTINATION "include") ++install(TARGETS parmetis EXPORT parmetisTargets INCLUDES DESTINATION include) diff --git a/external_imported/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch b/external_imported/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch deleted file mode 100644 index 059890e36..000000000 --- a/external_imported/vcpkg/ports/parmetis/fix-gklib-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/metis/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 -+++ b/metis/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 -@@ -58,7 +58,7 @@ - #define PTRDIFF_MAX INT64_MAX - #endif - --#ifdef __MSC__ -+#if defined(__MSC__) && (_MSC_VER < 1900) - /* MSC does not have rint() function */ - #define rint(x) ((int)((x)+0.5)) - diff --git a/external_imported/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch b/external_imported/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch deleted file mode 100644 index 6cdd7be62..000000000 --- a/external_imported/vcpkg/ports/parmetis/fix-libparmetis-cmakelist.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libparmetis/CMakeLists.txt Sat Mar 30 17:24:50 2013 -+++ b/libparmetis/CMakeLists.txt Wed Dec 21 19:40:28 2016 -@@ -5,10 +5,10 @@ - # Create libparmetis - add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) - # Link with metis and MPI libraries. --target_link_libraries(parmetis metis ${MPI_LIBRARIES}) -+target_link_libraries(parmetis ${METIS_LIBRARY} ${MPI_LIBRARIES}) - set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") - - install(TARGETS parmetis - LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -+ RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib) diff --git a/external_imported/vcpkg/ports/parmetis/fix-metis-vs14-math.patch b/external_imported/vcpkg/ports/parmetis/fix-metis-vs14-math.patch deleted file mode 100644 index ddf10052a..000000000 --- a/external_imported/vcpkg/ports/parmetis/fix-metis-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/metis/libmetis/metislib.h Sat Mar 30 17:24:45 2013 -+++ b/metis/libmetis/metislib.h Wed Dec 21 18:30:59 2016 -@@ -31,7 +31,7 @@ - #include - - --#if defined(COMPILER_MSC) -+#if defined(COMPILER_MSC) && (_MSC_VER < 1900) - #if defined(rint) - #undef rint - #endif diff --git a/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch b/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch deleted file mode 100644 index 8f4630bfa..000000000 --- a/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist-2.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt 2013-03-30 17:24:50.000000000 +0100 -+++ b/CMakeLists.txt 2021-04-20 10:41:49.946801222 +0200 -@@ -1,12 +1,12 @@ - cmake_minimum_required(VERSION 2.8) - project(ParMETIS) - --set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib") --set(METIS_PATH METIS CACHE PATH "path to METIS") -+set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/metis/GKlib CACHE PATH "path to GKlib") -+set(METIS_PATH metis CACHE PATH "path to METIS") - - # Symlink ./metis to wherever metis is. This allows files to be - # included from metis/libmetis/. --execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) -+#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) - - # Search for MPI. - # GK commented this out as it seems to be creating problems diff --git a/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist.patch b/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist.patch deleted file mode 100644 index 914bf9189..000000000 --- a/external_imported/vcpkg/ports/parmetis/fix-root-cmakelist.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CMakeLists.txt Sat Mar 30 17:24:50 2013 -+++ b/CMakeLists.txt Wed Dec 21 19:38:12 2016 -@@ -16,6 +16,9 @@ - # endif() - # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}") - -+find_package(MPI REQUIRED) -+find_library(METIS_LIBRARY NAMES metis) -+ - # Prepare libraries. - if(SHARED) - set(ParMETIS_LIBRARY_TYPE SHARED) -@@ -30,13 +33,13 @@ - include_directories(include) - include_directories(${MPI_INCLUDE_PATH}) - include_directories(${GKLIB_PATH}) --include_directories(${METIS_PATH}/include) -+# include_directories(${METIS_PATH}/include) - - # List of directories that cmake will look for CMakeLists.txt --add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) -+# add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) - add_subdirectory(include) - add_subdirectory(libparmetis) --add_subdirectory(programs) -+# add_subdirectory(programs) - - # This is for testing during development and is not being distributed - #add_subdirectory(test) diff --git a/external_imported/vcpkg/ports/parmetis/portfile.cmake b/external_imported/vcpkg/ports/parmetis/portfile.cmake index 62d633eac..b845ca81c 100644 --- a/external_imported/vcpkg/ports/parmetis/portfile.cmake +++ b/external_imported/vcpkg/ports/parmetis/portfile.cmake @@ -1,36 +1,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(ADDITIONAL_OPTIONS -DSHARED=OFF) -vcpkg_download_distfile(ARCHIVE - URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" - FILENAME "parmetis-4.0.3.tar.gz" - SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO KarypisLab/ParMETIS + REF 44fadbf58c71a74b39abb110a7691355d2a760ca + SHA512 d07e2ccb358948b728be3d282841ad42a8358908a4f1ab3342d4c3016e71a06c1b5966640a06e713f4c773365d7dba4f0c68795d615802f3af07194c0778f362 PATCHES - fix-metis-vs14-math.patch - fix-gklib-vs14-math.patch - fix-root-cmakelist.patch - fix-libparmetis-cmakelist.patch - use_stdint.patch - fix-root-cmakelist-2.patch + build-fixes.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${ADDITIONAL_OPTIONS} + -DSHARED=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parmetis) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/parmetis/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/parmetis/copyright) +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +parmetis provides CMake targets: + find_package(parmetis CONFIG REQUIRED) + target_link_libraries(main PRIVATE parmetis) +]=]) diff --git a/external_imported/vcpkg/ports/parmetis/vcpkg.json b/external_imported/vcpkg/ports/parmetis/vcpkg.json index 4b5cf9966..50c1c8760 100644 --- a/external_imported/vcpkg/ports/parmetis/vcpkg.json +++ b/external_imported/vcpkg/ports/parmetis/vcpkg.json @@ -1,11 +1,19 @@ { "name": "parmetis", - "version-string": "4.0.3", - "port-version": 5, + "version-date": "2022-07-27", "description": "Parallel Graph Partitioning and Fill-reducing Matrix Ordering", "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview", + "license": null, "dependencies": [ "metis", - "mpi" + "mpi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake index 1da5a37ab..60336eb04 100644 --- a/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake +++ b/external_imported/vcpkg/ports/pcapplusplus/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO seladb/PcapPlusPlus - REF v21.11 - SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac + REF v22.05 + SHA512 8ffe33406b903fe104f7bf0cf7254028bb3a9997bb5f4b226276af3b2a310e1ed1621558b9fd96ed09c75fa05dfcbfbd7111fe4b19a9288eb214ebcf1254cf6b HEAD_REF master ) file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json index b1df5ae7a..83438c9be 100644 --- a/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json +++ b/external_imported/vcpkg/ports/pcapplusplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pcapplusplus", - "version": "21.11", - "port-version": 1, + "version-string": "22.05", "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/external_imported/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch b/external_imported/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch new file mode 100644 index 000000000..dd014bf6f --- /dev/null +++ b/external_imported/vcpkg/ports/pcre/pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c3a309..cdd480f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ FIND_PACKAGE( Editline ) + + INCLUDE(CheckIncludeFile) + INCLUDE(CheckIncludeFileCXX) +-INCLUDE(CheckFunctionExists) ++INCLUDE(CheckSymbolExists) + INCLUDE(CheckTypeSize) + INCLUDE(GNUInstallDirs) # for CMAKE_INSTALL_LIBDIR + +@@ -109,12 +109,12 @@ CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) + CHECK_INCLUDE_FILE_CXX(type_traits.h HAVE_TYPE_TRAITS_H) + CHECK_INCLUDE_FILE_CXX(bits/type_traits.h HAVE_BITS_TYPE_TRAITS_H) + +-CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY) +-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) +-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) +-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL) +-CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ) +-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64) ++CHECK_SYMBOL_EXISTS(bcopy strings.h HAVE_BCOPY) ++CHECK_SYMBOL_EXISTS(memmove strings.h HAVE_MEMMOVE) ++CHECK_SYMBOL_EXISTS(strerror strings.h HAVE_STRERROR) ++CHECK_SYMBOL_EXISTS(strtoll stdlib.h HAVE_STRTOLL) ++CHECK_SYMBOL_EXISTS(strtoq stdlib.h HAVE_STRTOQ) ++CHECK_SYMBOL_EXISTS(_strtoi64 stdlib.h HAVE__STRTOI64) + + CHECK_TYPE_SIZE("long long" LONG_LONG) + CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG) diff --git a/external_imported/vcpkg/ports/pcre/portfile.cmake b/external_imported/vcpkg/ports/pcre/portfile.cmake index b7a11172b..f7b42765f 100644 --- a/external_imported/vcpkg/ports/pcre/portfile.cmake +++ b/external_imported/vcpkg/ports/pcre/portfile.cmake @@ -7,7 +7,8 @@ set(PATCHES pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch # Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600 pcre-8.45_fix_postfix_for_debug_Windows_builds.patch - export-cmake-targets.patch) + export-cmake-targets.patch + pcre-8.4.5_fix_check_function_exists_for_arm-androi_builds.patch) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -18,6 +19,11 @@ vcpkg_from_sourceforge( PATCHES ${PATCHES} ) +set(IS_PCRE_SUPPORT_JIT YES) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") + set(IS_PCRE_SUPPORT_JIT NO) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -26,7 +32,7 @@ vcpkg_cmake_configure( -DPCRE_BUILD_PCRE32=YES -DPCRE_BUILD_PCRE16=YES -DPCRE_BUILD_PCRE8=YES - -DPCRE_SUPPORT_JIT=YES + -DPCRE_SUPPORT_JIT=${IS_PCRE_SUPPORT_JIT} -DPCRE_SUPPORT_UTF=YES -DPCRE_SUPPORT_UNICODE_PROPERTIES=YES # optional dependencies for PCREGREP @@ -61,10 +67,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config") endif() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/pcre/vcpkg.json b/external_imported/vcpkg/ports/pcre/vcpkg.json index 1e006173f..576d1b239 100644 --- a/external_imported/vcpkg/ports/pcre/vcpkg.json +++ b/external_imported/vcpkg/ports/pcre/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pcre", "version": "8.45", - "port-version": 2, + "port-version": 5, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/pcre2/no-static-suffix.patch b/external_imported/vcpkg/ports/pcre2/no-static-suffix.patch new file mode 100644 index 000000000..7f41bcd56 --- /dev/null +++ b/external_imported/vcpkg/ports/pcre2/no-static-suffix.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa2181e..3bf5317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -711,8 +711,8 @@ IF(PCRE2_BUILD_PCRE2_8) + SET(targets ${targets} pcre2-posix-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8-static) +- SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix-static) ++ SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) ++ SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-8-static PROPERTIES OUTPUT_NAME pcre2-8) + SET_TARGET_PROPERTIES(pcre2-posix-static PROPERTIES OUTPUT_NAME pcre2-posix) +@@ -777,7 +777,7 @@ IF(PCRE2_BUILD_PCRE2_16) + SET(targets ${targets} pcre2-16-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16-static) ++ SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-16-static PROPERTIES OUTPUT_NAME pcre2-16) + ENDIF(MSVC) +@@ -829,7 +829,7 @@ IF(PCRE2_BUILD_PCRE2_32) + SET(targets ${targets} pcre2-32-static) + + IF(MSVC) +- SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32-static) ++ SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ELSE(MSVC) + SET_TARGET_PROPERTIES(pcre2-32-static PROPERTIES OUTPUT_NAME pcre2-32) + ENDIF(MSVC) diff --git a/external_imported/vcpkg/ports/pcre2/portfile.cmake b/external_imported/vcpkg/ports/pcre2/portfile.cmake index 0568f07a3..8211bb287 100644 --- a/external_imported/vcpkg/ports/pcre2/portfile.cmake +++ b/external_imported/vcpkg/ports/pcre2/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO PhilipHazel/pcre2 - REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39 - SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667 + REPO PCRE2Project/pcre2 + REF pcre2-10.40 + SHA512 098c21d60ecb3bb8449173f50c9ab8e6018fafd5d55548be08b15df37f8e08bcd4f851d75758c4d22505db30a3444bb65783d83cd876c63fdf0de2850815ef93 HEAD_REF master PATCHES pcre2-10.35_fix-uwp.patch + no-static-suffix.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/pcre2/vcpkg.json b/external_imported/vcpkg/ports/pcre2/vcpkg.json index b6a59e074..410cd552e 100644 --- a/external_imported/vcpkg/ports/pcre2/vcpkg.json +++ b/external_imported/vcpkg/ports/pcre2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "pcre2", - "version": "10.39", - "port-version": 2, + "version": "10.40", "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", - "homepage": "https://github.com/PhilipHazel/pcre2", + "homepage": "https://github.com/PCRE2Project/pcre2", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch b/external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch deleted file mode 100644 index f739cdf7d..000000000 --- a/external_imported/vcpkg/ports/pdal/0002-no-source-dir-writes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc146d1..9b82544 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -140,7 +140,7 @@ get_git_head_revision(GIT_REFSPEC GIT_SHA1) - - configure_file( - "${PROJECT_SOURCE_DIR}/gitsha.cpp.in" -- "${PROJECT_SOURCE_DIR}/pdal/gitsha.cpp") -+ "${PROJECT_BINARY_DIR}/pdal/gitsha.cpp") - - # needs to come before configuration of pdal_features - if(APPLE) -@@ -201,6 +201,7 @@ file(GLOB BASE_SRCS - ${PDAL_IO_DIR}/*.cpp - ${PDAL_KERNELS_DIR}/*.cpp - ${PDAL_SRC_DIR}/*.cpp -+ ${PROJECT_BINARY_DIR}/pdal/gitsha.cpp - ${PDAL_SRC_DIR}/compression/*.cpp) - file(GLOB_RECURSE PRIVATE_SRCS - ${PDAL_FILTERS_DIR}/private/*.cpp diff --git a/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch b/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch deleted file mode 100644 index 092c4651f..000000000 --- a/external_imported/vcpkg/ports/pdal/0003-fix-copy-vendor.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e918a3e..a3f9a03 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} - install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} - DESTINATION include/pdal - ) -+# Instaqll vendor headers -+install(DIRECTORY -+ ${PDAL_VENDOR_DIR}/arbiter -+ ${PDAL_VENDOR_DIR}/kazhdan -+ ${PDAL_VENDOR_DIR}/nanoflann -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) - - # - # CPACK diff --git a/external_imported/vcpkg/ports/pdal/cmake-project-include.cmake b/external_imported/vcpkg/ports/pdal/cmake-project-include.cmake new file mode 100644 index 000000000..37fd8c2bd --- /dev/null +++ b/external_imported/vcpkg/ports/pdal/cmake-project-include.cmake @@ -0,0 +1,6 @@ +include(CheckIncludeFileCXX) + +check_include_file_cxx("filesystem" HAVE_CXX17_FILESYSTEM) +if(NOT HAVE_CXX17_FILESYSTEM) + message(FATAL_ERROR "Unable to find header. PDAL requires full C++17 compiler support.") +endif() diff --git a/external_imported/vcpkg/ports/pdal/fix-dependency.patch b/external_imported/vcpkg/ports/pdal/fix-dependency.patch index 8e7949464..1c29b5689 100644 --- a/external_imported/vcpkg/ports/pdal/fix-dependency.patch +++ b/external_imported/vcpkg/ports/pdal/fix-dependency.patch @@ -6,22 +6,22 @@ index 42cca1e..43b0ced 100644 target_link_libraries(${PDAL_BASE_LIB_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT} + ${CMAKE_DL_LIBS} - ${GDAL_LIBRARY} + ${GDAL_LIBRARIES} ${GEOTIFF_LIBRARY} - ${LASZIP_LIBRARY} ${LIBXML2_LIBRARIES} + ${ZLIB_LIBRARIES} diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake index bfaa5b2..e73ec9e 100644 --- a/cmake/zstd.cmake +++ b/cmake/zstd.cmake -@@ -4,7 +4,15 @@ +@@ -4,7 +4,14 @@ option(WITH_ZSTD "Build support for compression/decompression with Zstd." TRUE) if (WITH_ZSTD) - find_package(ZSTD QUIET) -+ find_package(zstd CONFIG REQUIRED) -+ set(ZSTD_FOUND TRUE) ++ find_package(ZSTD NAMES zstd REQUIRED) + set(ZSTD_INCLUDE_DIRS "") + if(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) diff --git a/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch b/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch index 53eefb68d..be3cd71ee 100644 --- a/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch +++ b/external_imported/vcpkg/ports/pdal/fix-find-library-suffix.patch @@ -1,16 +1,11 @@ diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake -index dae98ea..edab055 100644 +index 665bc53..fcdcf2c 100644 --- a/cmake/libraries.cmake +++ b/cmake/libraries.cmake -@@ -3,11 +3,7 @@ - option(PDAL_BUILD_STATIC "Build PDAL as a static library" OFF) - if (PDAL_BUILD_STATIC) - set(PDAL_LIB_TYPE "STATIC") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) - else () - set(PDAL_LIB_TYPE "SHARED") -- if (WIN32) +@@ -1,6 +1,3 @@ + # Build shared libraries by default. + + set(PDAL_LIB_TYPE "SHARED") +-if (WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) -- endif() - endif() - mark_as_advanced(PDAL_BUILD_STATIC) +-endif() diff --git a/external_imported/vcpkg/ports/pdal/portfile.cmake b/external_imported/vcpkg/ports/pdal/portfile.cmake index dda2aead1..cb507baa1 100644 --- a/external_imported/vcpkg/ports/pdal/portfile.cmake +++ b/external_imported/vcpkg/ports/pdal/portfile.cmake @@ -3,37 +3,47 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF 2.3.0 - SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59 + REF 2.4.3 + SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a HEAD_REF master PATCHES - 0002-no-source-dir-writes.patch - 0003-fix-copy-vendor.patch fix-dependency.patch - use-vcpkg-boost.patch fix-unix-compiler-options.patch fix-find-library-suffix.patch no-pkgconfig-requires.patch no-rpath.patch ) -file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") -file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/pdalboost/boost" "${SOURCE_PATH}/vendor/pdalboost/libs") - # Prefer pristine CMake find modules + wrappers and config files from vcpkg. -foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) +foreach(package IN ITEMS Curl GeoTIFF ICONV ZSTD) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() +# De-vendoring +file(REMOVE_RECURSE + "${SOURCE_PATH}/vendor/nanoflann" + "${SOURCE_PATH}/vendor/nlohmann" + "${SOURCE_PATH}/pdal/JsonFwd.hpp" +) +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nanoflann.hpp" DESTINATION "${SOURCE_PATH}/vendor/nanoflann") +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json.hpp" DESTINATION "${SOURCE_PATH}/vendor/nlohmann/nlohmann") +file(APPEND "${SOURCE_PATH}/vendor/nlohmann/nlohmann/json.hpp" "namespace NL = nlohmann;\n") +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json_fwd.hpp" DESTINATION "${SOURCE_PATH}/pdal") +file(RENAME "${SOURCE_PATH}/pdal/json_fwd.hpp" "${SOURCE_PATH}/pdal/JsonFwd.hpp") +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 e57 BUILD_PLUGIN_E57 hdf5 BUILD_PLUGIN_HDF i3s BUILD_PLUGIN_I3S - laszip WITH_LASZIP lzma WITH_LZMA pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD zstd WITH_ZSTD @@ -45,17 +55,14 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DPDAL_PLUGIN_INSTALL_PATH=. "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" - -DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF - -DWITH_LAZPERF:BOOL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - POSTGRESQL_LIBRARIES ) vcpkg_cmake_install() @@ -83,4 +90,38 @@ file(REMOVE_RECURSE ) 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) + +file(READ "${SOURCE_PATH}/LICENSE.txt" pdal_license) +file(READ "${SOURCE_PATH}/vendor/arbiter/LICENSE" arbiter_license) +file(READ "${SOURCE_PATH}/vendor/kazhdan/PoissonRecon.h" kazhdan_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" kazhdan_license "${kazhdan_license}") +file(READ "${SOURCE_PATH}/vendor/lazperf/lazperf.hpp" lazperf_license) +string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_license "${lazperf_license}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${pdal_license} +--- + +Files in vendor/arbiter/: + +${arbiter_license} +--- + +Files in vendor/kazhdan/: + +${kazhdan_license} +--- + +Files in vendor/lazperf/: + +${lazperf_license} +--- + +Files in vendor/eigen: + +Most Eigen source code is subject to the terms of the Mozilla Public License +v. 2.0. You can obtain a copy the MPL 2.0 at http://mozilla.org/MPL/2.0/. + +Some files included in Eigen are under one of the following licenses: + - Apache License, Version 2.0 + - BSD 3-Clause \"New\" or \"Revised\" License +") diff --git a/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch b/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch deleted file mode 100644 index d07bf6eea..000000000 --- a/external_imported/vcpkg/ports/pdal/use-vcpkg-boost.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83a396b..7ebcc3b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,7 +67,8 @@ else() - endif() - set(PDAL_LIB_NAME pdalcpp) - set(PDAL_UTIL_LIB_NAME pdal_util) --set(PDAL_BOOST_LIB_NAME pdal_boost) -+find_package(Boost COMPONENTS filesystem system REQUIRED) -+set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) - set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) - set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) - -@@ -179,13 +180,11 @@ endif() - - add_subdirectory(plugins) - --#include_directories(vendor/pdalboost) - if (WITH_TESTS) - include (${PDAL_CMAKE_DIR}/gtest.cmake) - add_subdirectory(test) - endif() - add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - add_subdirectory(pdal/util) -@@ -269,7 +268,6 @@ target_include_directories(${PDAL_BASE_LIB_NAME} - ${PROJECT_BINARY_DIR}/include - ${PDAL_VENDOR_DIR} - ${PDAL_VENDOR_DIR}/eigen -- ${PDAL_VENDOR_DIR}/pdalboost - ${LIBXML2_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} - ${NLOHMANN_INCLUDE_DIR} -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 6b3e889..8a42122 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -40,8 +40,6 @@ target_link_libraries(${PDAL_UTIL_LIB_NAME} - ${CMAKE_DL_LIBS} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -- ${PDAL_VENDOR_DIR}/pdalboost) - - set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES - VERSION "${PDAL_BUILD_VERSION}" -diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index ee47b55..4a57268 100644 ---- a/pdal/util/FileUtils.cpp -+++ b/pdal/util/FileUtils.cpp -@@ -98,6 +98,12 @@ inline std::string const& toNative(std::string const& in) { return in; } - - } // unnamed namespace - -+namespace pdalboost -+{ -+ namespace filesystem = boost::filesystem; -+ namespace system = boost::system; -+} -+ - namespace FileUtils - { - diff --git a/external_imported/vcpkg/ports/pdal/vcpkg.json b/external_imported/vcpkg/ports/pdal/vcpkg.json index b4f2a01dd..393338965 100644 --- a/external_imported/vcpkg/ports/pdal/vcpkg.json +++ b/external_imported/vcpkg/ports/pdal/vcpkg.json @@ -1,12 +1,11 @@ { "name": "pdal", - "version": "2.3.0", + "version": "2.4.3", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", + "license": null, "supports": "!(windows & staticcrt)", "dependencies": [ - "boost-filesystem", - "boost-system", { "name": "curl", "default-features": false @@ -17,6 +16,8 @@ }, "libgeotiff", "libxml2", + "nanoflann", + "nlohmann-json", { "name": "vcpkg-cmake", "host": true @@ -27,7 +28,6 @@ } ], "default-features": [ - "laszip", "supported-plugins" ], "features": { @@ -59,10 +59,7 @@ ] }, "laszip": { - "description": "LASzip support", - "dependencies": [ - "laszip" - ] + "description": "Obsolete. PDAL includes LAZperf." }, "liblzma": { "description": "Support for compression/decompression with LZMA", diff --git a/external_imported/vcpkg/ports/pegtl/portfile.cmake b/external_imported/vcpkg/ports/pegtl/portfile.cmake index 4183a1010..5746327c2 100644 --- a/external_imported/vcpkg/ports/pegtl/portfile.cmake +++ b/external_imported/vcpkg/ports/pegtl/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.5 - SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14 - HEAD_REF main + REF e65017d398a3b733aedab70bb64b8055472d47aa + SHA512 05ca3754a9c1c94a205c6823e4442dca1f11a890aadd4b0c96f6ccd8946eec061c0a723bc67f8b57b074154e1ab1171bdcdd035926f55e42b5517b9d5ecae873 + HEAD_REF 3.x ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/pegtl/vcpkg.json b/external_imported/vcpkg/ports/pegtl/vcpkg.json index b173e2ba8..e2455acb9 100644 --- a/external_imported/vcpkg/ports/pegtl/vcpkg.json +++ b/external_imported/vcpkg/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.5", + "version-semver": "3.2.6", "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/external_imported/vcpkg/ports/pffft/fix-invalid-command.patch b/external_imported/vcpkg/ports/pffft/fix-invalid-command.patch new file mode 100644 index 000000000..ddb69883e --- /dev/null +++ b/external_imported/vcpkg/ports/pffft/fix-invalid-command.patch @@ -0,0 +1,17 @@ +diff --git a/pffft.c b/pffft.c +index d12f572..7cc0546 100644 +--- a/pffft.c ++++ b/pffft.c +@@ -173,7 +173,11 @@ typedef float32x4_t v4sf; + # define VALIGNED(ptr) ((((long long)(ptr)) & 0x3) == 0) + #else + # if !defined(PFFFT_SIMD_DISABLE) +-# warning "building with simd disabled !\n"; ++# ifdef COMPILER_MSVC ++# pragma message ("building with simd disabled !\n"); ++# else ++# warning "building with simd disabled !\n"; ++# endif + # define PFFFT_SIMD_DISABLE // fallback to scalar code + # endif + #endif diff --git a/external_imported/vcpkg/ports/pffft/portfile.cmake b/external_imported/vcpkg/ports/pffft/portfile.cmake index 32d4f833f..434f47ce9 100644 --- a/external_imported/vcpkg/ports/pffft/portfile.cmake +++ b/external_imported/vcpkg/ports/pffft/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_bitbucket( REF ed78751d751e51bbd94c41d24f748b400f272d69 SHA512 44f65c7f7e5b71f549dca2e03d58b1fd64e698858f79e4c2833a9ae3dff8a835cf9d5e14be2341c6370f800012cb69b05b9226d6918b12e67f7f7e81ed8e9ad4 HEAD_REF master + PATCHES + fix-invalid-command.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/pffft/vcpkg.json b/external_imported/vcpkg/ports/pffft/vcpkg.json index 5ea7a3bd2..f06a359e1 100644 --- a/external_imported/vcpkg/ports/pffft/vcpkg.json +++ b/external_imported/vcpkg/ports/pffft/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pffft", "version-date": "2021-10-09", + "port-version": 1, "description": "PFFFT, a pretty fast Fourier Transform.", "homepage": "https://bitbucket.org/jpommier/pffft/", - "supports": "static", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/physfs/portfile.cmake b/external_imported/vcpkg/ports/physfs/portfile.cmake index 879a2b0e0..b47465de2 100644 --- a/external_imported/vcpkg/ports/physfs/portfile.cmake +++ b/external_imported/vcpkg/ports/physfs/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" REF ${PHYSFS_VERSION} PATCHES "001-fix-lzmasdk-arm64-windows.patch" @@ -20,8 +20,13 @@ vcpkg_extract_source_archive_ex( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} diff --git a/external_imported/vcpkg/ports/physfs/vcpkg.json b/external_imported/vcpkg/ports/physfs/vcpkg.json index b740565ca..649fa9384 100644 --- a/external_imported/vcpkg/ports/physfs/vcpkg.json +++ b/external_imported/vcpkg/ports/physfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physfs", "version-semver": "3.0.2", - "port-version": 6, + "port-version": 7, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/physx/portfile.cmake b/external_imported/vcpkg/ports/physx/portfile.cmake index 7fe812dc2..090f74419 100644 --- a/external_imported/vcpkg/ports/physx/portfile.cmake +++ b/external_imported/vcpkg/ports/physx/portfile.cmake @@ -1,3 +1,17 @@ +vcpkg_download_distfile( + patch1 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/ada4fccf04e5a5832af1353d6d1f91de691aa47d.patch" + FILENAME "physx-PR569-ada4fccf.patch" + SHA512 ec2fc2fce0b5aab4d42b77f21373bf067f129543e672516477513419241c56b99f2d663b992cb29d296933440e7e7cc31a57198f6fcc78d6eac26b7706c1e937 +) + +vcpkg_download_distfile( + patch2 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/d590c88e3cbf0fb682726abf7d7c16417855084f.patch" + FILENAME "physx-PR569-d590c88e.patch" + SHA512 4eb7630db1cb10b2372220c3706dfe255075f466c6b2b12654c9fbc3b17c4df69d7b91e6f0d798c92a4cb8806e1c34b66bb52b46d9358d643ca62ec0de321fd2 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIAGameWorks/PhysX @@ -6,6 +20,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-compiler-flag.patch + "${patch1}" + "${patch2}" remove-werror.patch ) @@ -40,6 +56,7 @@ set(OPTIONS_DEBUG if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=uwp") + set(configure_options WINDOWS_USE_MSBUILD) elseif(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=windows") elseif(VCPKG_TARGET_IS_OSX) @@ -76,6 +93,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" + ${configure_options} DISABLE_PARALLEL_CONFIGURE OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} @@ -136,4 +154,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/source" "${CURRENT_PACKAGES_DIR}/source" ) -file(INSTALL ${SOURCE_PATH}/README.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/external_imported/vcpkg/ports/physx/remove-werror.patch b/external_imported/vcpkg/ports/physx/remove-werror.patch index 94f802e0f..86f3a1d71 100644 --- a/external_imported/vcpkg/ports/physx/remove-werror.patch +++ b/external_imported/vcpkg/ports/physx/remove-werror.patch @@ -1,66 +1,52 @@ diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt -index 06e0d98b..e6a77f17 100644 +index 06e0d98..2e5454d 100644 --- a/physx/source/compiler/cmake/android/CMakeLists.txt +++ b/physx/source/compiler/cmake/android/CMakeLists.txt -@@ -33,15 +33,15 @@ STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE) - SET(PHYSX_WARNING_DISABLES "-Wno-invalid-offsetof -Wno-maybe-uninitialized -Wno-unused-variable -Wno-variadic-macros -Wno-array-bounds -Wno-strict-aliasing") +@@ -52,6 +52,8 @@ SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") - IF(${ANDROID_ABI} STREQUAL "armeabi-v7a") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "armeabi-v7a with NEON") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "arm64-v8a") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "x86") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "x86_64") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX") - ENDIF() - # Build debug info for all configurations + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt -index 5605e9af..3d2fe6f0 100644 +index 5605e9a..b40500b 100644 --- a/physx/source/compiler/cmake/ios/CMakeLists.txt +++ b/physx/source/compiler/cmake/ios/CMakeLists.txt -@@ -26,7 +26,7 @@ - ## Copyright (c) 2008-2021 NVIDIA Corporation. All rights reserved. - +@@ -39,6 +39,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") --SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -Werror -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") -+SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") - SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "") + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt -index aba53365..6246e488 100644 +index aba5336..fd5f813 100644 --- a/physx/source/compiler/cmake/linux/CMakeLists.txt +++ b/physx/source/compiler/cmake/linux/CMakeLists.txt -@@ -28,8 +28,8 @@ - STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE) +@@ -45,6 +45,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "PhysX Release CXX Flags") - #TODO: Fix warnings --SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Werror -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt") --SET(GCC_WARNINGS "-Wall -Werror -Wno-invalid-offsetof -Wno-uninitialized") -+SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt") -+SET(GCC_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-uninitialized") + # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above) ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - # using Clang + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt -index 36799700..97cb4c7f 100644 +index bfd1357..cffb090 100644 --- a/physx/source/compiler/cmake/mac/CMakeLists.txt +++ b/physx/source/compiler/cmake/mac/CMakeLists.txt -@@ -28,7 +28,7 @@ - SET(OSX_BITNESS "-arch x86_64") - SET(CMAKE_OSX_ARCHITECTURES "x86_64") +@@ -49,6 +49,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") --SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") -+SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") - SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "") + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/external_imported/vcpkg/ports/physx/vcpkg.json b/external_imported/vcpkg/ports/physx/vcpkg.json index fd3665a64..1a3adee24 100644 --- a/external_imported/vcpkg/ports/physx/vcpkg.json +++ b/external_imported/vcpkg/ports/physx/vcpkg.json @@ -1,10 +1,11 @@ { "name": "physx", - "version-semver": "4.1.2", - "port-version": 1, + "version": "4.1.2", + "port-version": 4, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", - "supports": "!mingw", + "license": null, + "supports": "!mingw & !(windows & arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/pipewire/portfile.cmake b/external_imported/vcpkg/ports/pipewire/portfile.cmake new file mode 100644 index 000000000..df9531df7 --- /dev/null +++ b/external_imported/vcpkg/ports/pipewire/portfile.cmake @@ -0,0 +1,93 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO pipewire/pipewire + REF 0.3.52 + SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a + HEAD_REF master # branch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dalsa=disabled + -Daudioconvert=disabled + -Daudiomixer=disabled + -Daudiotestsrc=disabled + -Davahi=disabled + -Dbluez5-backend-hfp-native=disabled + -Dbluez5-backend-hsp-native=disabled + -Dbluez5-backend-hsphfpd=disabled + -Dbluez5-backend-ofono=disabled + -Dbluez5-codec-aac=disabled + -Dbluez5-codec-aptx=disabled + -Dbluez5-codec-lc3plus=disabled + -Dbluez5-codec-ldac=disabled + -Dbluez5=disabled + -Dcontrol=disabled + -Ddbus=disabled + -Ddocs=disabled + -Decho-cancel-webrtc=disabled + -Devl=disabled + -Dexamples=disabled + -Dffmpeg=disabled + -Dgstreamer-device-provider=disabled + -Dgstreamer=disabled + -Dinstalled_tests=disabled + -Djack-devel=false + -Djack=disabled + -Dlegacy-rtkit=false + -Dlibcamera=disabled + -Dlibcanberra=disabled + -Dlibpulse=disabled + -Dlibusb=disabled + -Dlv2=disabled + -Dman=disabled + -Dpipewire-alsa=disabled + -Dpipewire-jack=disabled + -Dpipewire-v4l2=disabled + -Dpw-cat=disabled + -Draop=disabled + -Droc=disabled + -Dsdl2=disabled + -Dsndfile=disabled + -Dspa-plugins=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsupport=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsystemd-system-service=disabled + -Dsystemd-system-unit-dir=disabled + -Dsystemd-user-service=disabled + -Dsystemd-user-unit-dir=disabled + -Dsystemd=disabled + -Dtest=disabled + -Dtests=disabled + -Dudev=disabled + -Dudevrulesdir=disabled + -Dv4l2=disabled + -Dvideoconvert=disabled + -Dvideotestsrc=disabled + -Dvolume=disabled + -Dvulkan=disabled + -Dx11-xfixes=disabled + -Dx11=disabled + -Dsession-managers=[] +) +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# remove absolute paths +file(GLOB config_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.conf") +foreach(file ${config_files}) + vcpkg_replace_string("${file}" "in ${CURRENT_PACKAGES_DIR}/etc/pipewire for system-wide changes\n# or" "") + cmake_path(GET file FILENAME filename) + vcpkg_replace_string("${file}" "# ${CURRENT_PACKAGES_DIR}/etc/pipewire/${filename}.d/ for system-wide changes or in" "") +endforeach() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pipewire/pipewire.conf" "${CURRENT_PACKAGES_DIR}/bin" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pipewire/minimal.conf" "${CURRENT_PACKAGES_DIR}/bin" "") diff --git a/external_imported/vcpkg/ports/pipewire/vcpkg.json b/external_imported/vcpkg/ports/pipewire/vcpkg.json new file mode 100644 index 000000000..1a759218d --- /dev/null +++ b/external_imported/vcpkg/ports/pipewire/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "pipewire", + "version": "0.3.52", + "port-version": 1, + "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", + "homepage": "https://pipewire.org", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/pixel/portfile.cmake b/external_imported/vcpkg/ports/pixel/portfile.cmake index 1cac519bf..36c5424f4 100644 --- a/external_imported/vcpkg/ports/pixel/portfile.cmake +++ b/external_imported/vcpkg/ports/pixel/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message(WARNING"${PORT} currently requires libglu1-mesa from the system package manager: + message(WARNING "${PORT} currently requires libglu1-mesa from the system package manager: This can be installed on Ubuntu systems via sudo apt install libglu1-mesa-dev") endif() diff --git a/external_imported/vcpkg/ports/pixel/vcpkg.json b/external_imported/vcpkg/ports/pixel/vcpkg.json index 00d5b4c22..cc01890b4 100644 --- a/external_imported/vcpkg/ports/pixel/vcpkg.json +++ b/external_imported/vcpkg/ports/pixel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pixel", "version-date": "2022-03-15", + "port-version": 1, "description": "Simple 2D Graphics based on standard and portable OpenGL.", "homepage": "https://github.com/dascandy/pixel", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/pixman/fix_clang-cl.patch b/external_imported/vcpkg/ports/pixman/fix_clang-cl.patch new file mode 100644 index 000000000..0a6bdba56 --- /dev/null +++ b/external_imported/vcpkg/ports/pixman/fix_clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index d7cf2659d..625a08ace 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -137,7 +137,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B) + * then define USE_M64_CASTS. + * If __m64 is a double datatype, then define USE_M64_DOUBLE. + */ +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && !defined(__clang__) + # define M64_MEMBER m64_u64 + #elif defined(__ICC) + # define USE_CVT_INTRINSICS diff --git a/external_imported/vcpkg/ports/pixman/missing_intrin_include.patch b/external_imported/vcpkg/ports/pixman/missing_intrin_include.patch new file mode 100644 index 000000000..76f74af70 --- /dev/null +++ b/external_imported/vcpkg/ports/pixman/missing_intrin_include.patch @@ -0,0 +1,15 @@ +diff --git a/pixman/pixman-x86.c b/pixman/pixman-x86.c +index 0130b7bfa..d3d0fe1d9 100644 +--- a/pixman/pixman-x86.c ++++ b/pixman/pixman-x86.c +@@ -24,7 +24,10 @@ + #endif + + #include "pixman-private.h" ++#ifdef _MSC_VER ++#include ++#endif + + #if defined(USE_X86_MMX) || defined (USE_SSE2) || defined (USE_SSSE3) + + /* The CPU detection code needs to be in a file not compiled with diff --git a/external_imported/vcpkg/ports/pixman/portfile.cmake b/external_imported/vcpkg/ports/pixman/portfile.cmake index fa6c8687a..8e6096369 100644 --- a/external_imported/vcpkg/ports/pixman/portfile.cmake +++ b/external_imported/vcpkg/ports/pixman/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs -endif() - if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS -Dmmx=disabled @@ -21,12 +17,16 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") -Dsse2=enabled -Dssse3=enabled) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - list(APPEND OPTIONS - #-Darm-simd=enabled does not work with arm64-windows - -Dmmx=disabled - -Dsse2=disabled - -Dssse3=disabled - ) + list(APPEND OPTIONS + #-Darm-simd=enabled does not work with arm64-windows + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips") + list(APPEND OPTIONS + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) endif() set(PIXMAN_VERSION 0.40.0) @@ -42,6 +42,8 @@ vcpkg_extract_source_archive_ex( PATCHES remove_test_demos.patch no-host-cpu-checks.patch + fix_clang-cl.patch + missing_intrin_include.patch ) # Meson install wrongly pkgconfig file! vcpkg_configure_meson( diff --git a/external_imported/vcpkg/ports/pixman/vcpkg.json b/external_imported/vcpkg/ports/pixman/vcpkg.json index b475c2fb7..d46c7195d 100644 --- a/external_imported/vcpkg/ports/pixman/vcpkg.json +++ b/external_imported/vcpkg/ports/pixman/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pixman", "version": "0.40.0", - "port-version": 2, + "port-version": 4, "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "license": "MIT", diff --git a/external_imported/vcpkg/ports/pkgconf/portfile.cmake b/external_imported/vcpkg/ports/pkgconf/portfile.cmake index 7c5ccb242..0f269dc13 100644 --- a/external_imported/vcpkg/ports/pkgconf/portfile.cmake +++ b/external_imported/vcpkg/ports/pkgconf/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" NO_PKG_CONFIG OPTIONS -Dtests=false - ) +) set(systemsuffix "") set(architectureprefix "") @@ -69,6 +69,8 @@ vcpkg_fixup_pkgconfig(SKIP_CHECK) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pkgconf/libpkgconf/libpkgconf-api.h" "#if defined(PKGCONFIG_IS_STATIC)" "#if 1") diff --git a/external_imported/vcpkg/ports/pkgconf/vcpkg.json b/external_imported/vcpkg/ports/pkgconf/vcpkg.json index 8ea4e30e7..e8beeb95b 100644 --- a/external_imported/vcpkg/ports/pkgconf/vcpkg.json +++ b/external_imported/vcpkg/ports/pkgconf/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pkgconf", "version": "1.8.0", - "port-version": 2, + "port-version": 3, "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/plog/portfile.cmake b/external_imported/vcpkg/ports/plog/portfile.cmake index a4b769dc3..b06b55b71 100644 --- a/external_imported/vcpkg/ports/plog/portfile.cmake +++ b/external_imported/vcpkg/ports/plog/portfile.cmake @@ -1,15 +1,20 @@ -# Header-only library -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SergiusTheBest/plog - REF 1.1.5 - SHA512 c16b428e1855c905c486130c8610d043962bedc2b40d1d986c250c8f7fd7139540164a3cbb408ed08298370aa150d5937f358c13ccae2728ce8ea47fa897fd0b - HEAD_REF master -) - -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/plog) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/plog/LICENSE ${CURRENT_PACKAGES_DIR}/share/plog/copyright) - -# Copy header files -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h") +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SergiusTheBest/plog + REF 1.1.8 + SHA512 09bf6e0cae7f20c1b42e68a174b4cd6a2fb8751db9758efb87449cbff48375708e43c147c72b7ed17fb9334acaf7802441f61578356284a8ed337fd886a45e79 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPLOG_BUILD_SAMPLES=OFF) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Copy usage file +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/plog/usage b/external_imported/vcpkg/ports/plog/usage new file mode 100644 index 000000000..bfba94d5e --- /dev/null +++ b/external_imported/vcpkg/ports/plog/usage @@ -0,0 +1,6 @@ +The package plog is header only and can be used from CMake via: + +Modern CMake: + find_package(plog CONFIG REQUIRED) + target_link_libraries(main PRIVATE plog::plog) + diff --git a/external_imported/vcpkg/ports/plog/vcpkg.json b/external_imported/vcpkg/ports/plog/vcpkg.json index c1de0acff..7f0444360 100644 --- a/external_imported/vcpkg/ports/plog/vcpkg.json +++ b/external_imported/vcpkg/ports/plog/vcpkg.json @@ -1,7 +1,17 @@ { "name": "plog", - "version-string": "1.1.5", - "port-version": 1, + "version": "1.1.8", "description": "Portable, simple and extensible C++ logging library.", - "homepage": "https://github.com/SergiusTheBest/plog" + "homepage": "https://github.com/SergiusTheBest/plog", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/pmdk/portfile.cmake b/external_imported/vcpkg/ports/pmdk/portfile.cmake index dcda72d8c..6d60acbf9 100644 --- a/external_imported/vcpkg/ports/pmdk/portfile.cmake +++ b/external_imported/vcpkg/ports/pmdk/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -set(PMDK_VERSION "1.11.0") +set(PMDK_VERSION "1.12.0") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pmem/pmdk - REF 8583fcfd68764ac6779e6f93db89b06971b26704 #Commit id corresponding to the version 1.11.0 - SHA512 6d0a9697c97f75ac10e9e8736c2397c6ee23c26af96b65c746e0c32bc2d16f083b177e52bc399aa93c6f2e29ac6106c2696c6bbf9779788d9d19167ac07000b8 + REF 73d8f958e855904dc0776a7d77d0f0d3698a65b1 #v1.12.0 + SHA512 ffe77796c9028478985ca98e4162a671e3e7f580faa46b31d0dcf8c5e97aa6478044efdf7ad238285044f18f754a20a4e2a1b5992c7b9cffa709884eb62007ab HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/pmdk/vcpkg.json b/external_imported/vcpkg/ports/pmdk/vcpkg.json index 75c6148da..ae45ff2d1 100644 --- a/external_imported/vcpkg/ports/pmdk/vcpkg.json +++ b/external_imported/vcpkg/ports/pmdk/vcpkg.json @@ -1,8 +1,8 @@ { "name": "pmdk", - "version": "1.11.0", - "port-version": 1, + "version": "1.12.0", "description": "Persistent Memory Development Kit", "homepage": "https://github.com/pmem/pmdk", + "license": "BSD-3-Clause", "supports": "!(arm | x86)" } diff --git a/external_imported/vcpkg/ports/poco/arm64_pcre.patch b/external_imported/vcpkg/ports/poco/arm64_pcre.patch index 75151dc34..b47561ca7 100644 --- a/external_imported/vcpkg/ports/poco/arm64_pcre.patch +++ b/external_imported/vcpkg/ports/poco/arm64_pcre.patch @@ -1,16 +1,3 @@ -diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index 9a945f3..f5a9a7f 100644 ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -191,7 +191,7 @@ - #else - #define POCO_ARCH_LITTLE_ENDIAN 1 - #endif --#elif defined(__arm64__) || defined(__arm64) -+#elif defined(__arm64__) || defined(__arm64) || defined(_M_ARM64) - #define POCO_ARCH POCO_ARCH_ARM64 - #if defined(__ARMEB__) - #define POCO_ARCH_BIG_ENDIAN 1 diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp index 1f51296..c67b71b 100644 --- a/Foundation/src/EventLogChannel.cpp @@ -24,7 +11,7 @@ index 1f51296..c67b71b 100644 #include "Poco/EventLogChannel.h" #include "Poco/Message.h" diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 4328344..5eeafcd 100644 +index 0a222c7..0843315 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h @@ -91,7 +91,7 @@ int main(int argc, char** argv) { diff --git a/external_imported/vcpkg/ports/poco/portfile.cmake b/external_imported/vcpkg/ports/poco/portfile.cmake index e4ceb12b4..c6c9c0f52 100644 --- a/external_imported/vcpkg/ports/poco/portfile.cmake +++ b/external_imported/vcpkg/ports/poco/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF de61f0049175a941cc83c2615c3bdc5e947b89f9 # poco-1.11.1-release - SHA512 0290eeeca8a85286efe8f583224062ea97668c2730f8f7db4e075ce75e997b0a0c969159d4034c27fbb2e8d4b9c6504888d8ffa001193f7eb0e450bca2d5d7a2 + REF 9d1c428c861f2e5ccf09149bbe8d2149720c5896 # poco-1.11.2-release + SHA512 b812bb194783c94e2a048daf6659e0f0fa5e9040ebd49342a5d39636cee600754d0465f8b28725d76dcb2681d1b64dfd8b08ac9c85b95b4ac8edf9b53d68feb1 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode diff --git a/external_imported/vcpkg/ports/poco/vcpkg.json b/external_imported/vcpkg/ports/poco/vcpkg.json index 98519295d..d4a8c97aa 100644 --- a/external_imported/vcpkg/ports/poco/vcpkg.json +++ b/external_imported/vcpkg/ports/poco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "poco", - "version": "1.11.1", + "version": "1.11.2", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/external_imported/vcpkg/ports/podofo/fix-compiler.patch b/external_imported/vcpkg/ports/podofo/fix-compiler.patch new file mode 100644 index 000000000..e698da3e0 --- /dev/null +++ b/external_imported/vcpkg/ports/podofo/fix-compiler.patch @@ -0,0 +1,12 @@ +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/external_imported/vcpkg/ports/podofo/install-cmake-config.patch b/external_imported/vcpkg/ports/podofo/install-cmake-config.patch new file mode 100644 index 000000000..1373e5839 --- /dev/null +++ b/external_imported/vcpkg/ports/podofo/install-cmake-config.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df623ef..8e653b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -569,10 +569,4 @@ CONFIGURE_FILE(${PoDoFo_SOURCE_DIR}/podofo_config.h.in ${PoDoFo_BINARY_DIR}/podo + # 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) + +diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt +index bba6b5f..16f0798 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 ++ 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 ++ DESTINATION share/podofo ++ ) + + + # Create a pkg-config file for linking against shared library diff --git a/external_imported/vcpkg/ports/podofo/portfile.cmake b/external_imported/vcpkg/ports/podofo/portfile.cmake index b47fbaaf8..d9cc0308b 100644 --- a/external_imported/vcpkg/ports/podofo/portfile.cmake +++ b/external_imported/vcpkg/ports/podofo/portfile.cmake @@ -1,4 +1,4 @@ -set(PODOFO_VERSION 0.9.7) +set(PODOFO_VERSION 0.9.8) if (VCPKG_TARGET_IS_UWP) set(ADDITIONAL_PATCH "0003-uwp_fix.patch") @@ -9,13 +9,15 @@ vcpkg_from_sourceforge( REPO podofo/podofo REF ${PODOFO_VERSION} FILENAME "podofo-${PODOFO_VERSION}.tar.gz" - SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b + SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 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) @@ -27,16 +29,15 @@ 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_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) +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) +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPODOFO_BUILD_LIB_ONLY=1 -DPODOFO_BUILD_SHARED=${PODOFO_BUILD_SHARED} @@ -47,10 +48,27 @@ vcpkg_configure_cmake( -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 ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/${PORT}/PoDoFoConfig.cmake" + "# Create imported target podofo_shared" +[[ +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +# Create imported target podofo_shared +]] +) + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/podofo/vcpkg.json b/external_imported/vcpkg/ports/podofo/vcpkg.json index 19429b858..d27ed0bfc 100644 --- a/external_imported/vcpkg/ports/podofo/vcpkg.json +++ b/external_imported/vcpkg/ports/podofo/vcpkg.json @@ -1,8 +1,9 @@ { "name": "podofo", - "version": "0.9.7", + "version": "0.9.8", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://sourceforge.net/projects/podofo/", + "license": "LGPL-2.0-only", "supports": "!uwp", "dependencies": [ "freetype", @@ -10,6 +11,14 @@ "libpng", "openssl", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/external_imported/vcpkg/ports/polymorphic-value/001_no_catch_submodule.patch b/external_imported/vcpkg/ports/polymorphic-value/001_no_catch_submodule.patch deleted file mode 100644 index 8fec58a76..000000000 --- a/external_imported/vcpkg/ports/polymorphic-value/001_no_catch_submodule.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git C:/Users/Charles Barto/Source/vcpkg/buildtrees/polymorphic-value/src/1.3.0-33dc249788/CMakeLists.txt C:/Users/Charles Barto/patched_list.txt -index 2819bf6a4..0ee5fba76 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,9 +9,9 @@ set(POLYMOPHIC_VALUE_VERSION "1.3.0") # Revision 3, see paper p0201r3 - project(polymorphic_value VERSION ${POLYMOPHIC_VALUE_VERSION}) - - option(ENABLE_SANITIZERS "Enable Address Sanitizer and Undefined Behaviour Sanitizer if available" OFF) -- -+if(BUILD_TESTING) - add_subdirectory(externals/catch) -- -+endif() - add_library(polymorphic_value INTERFACE) - target_include_directories(polymorphic_value - INTERFACE -@@ -45,6 +45,7 @@ target_compile_features(polymorphic_value - add_library(polymorphic_value::polymorphic_value ALIAS polymorphic_value) - - if(POLYMORPHIC_IS_NOT_SUBPROJECT) -+ if(BUILD_TESTING) - add_executable(test_polymorphic_value test_polymorphic_value.cpp) - target_link_libraries(test_polymorphic_value - PRIVATE -@@ -107,7 +108,7 @@ if(POLYMORPHIC_IS_NOT_SUBPROJECT) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/externals/catch/contrib) - include(Catch) - catch_discover_tests(test_polymorphic_value) -- -+ endif() - install( - FILES - "${CMAKE_CURRENT_SOURCE_DIR}/polymorphic_value.h" diff --git a/external_imported/vcpkg/ports/polymorphic-value/002_fixed_config.patch b/external_imported/vcpkg/ports/polymorphic-value/002_fixed_config.patch deleted file mode 100644 index 77a99b058..000000000 --- a/external_imported/vcpkg/ports/polymorphic-value/002_fixed_config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/./broken_config.cmake.in b/./fixed_config.cmake.in -index e64f8a20f..38c441451 100644 ---- a/polymorphic_value-config.cmake.in -+++ b/polymorphic_value-config.cmake.in -@@ -1,5 +1,7 @@ - @PACKAGE_INIT@ - --set_and_check(POLYMORPHIC_VALUE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - --check_required_components(Foo) -+ -+check_required_components(polymorphic_value) -+ -+include(${CMAKE_CURRENT_LIST_DIR}/polymorphic_value-target.cmake) diff --git a/external_imported/vcpkg/ports/polymorphic-value/portfile.cmake b/external_imported/vcpkg/ports/polymorphic-value/portfile.cmake index 5a03c827b..56c665a55 100644 --- a/external_imported/vcpkg/ports/polymorphic-value/portfile.cmake +++ b/external_imported/vcpkg/ports/polymorphic-value/portfile.cmake @@ -1,32 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbcoe/polymorphic_value - REF 1.3.0 - SHA512 67d49933c46d2a2bccb68c65c6f28b92603e193c68ff434b2c6b1602a573855a176fc98227d85cd24a64ae9299461adb42e792b4f165482bb250488620161742 - HEAD_REF master - PATCHES 001_no_catch_submodule.patch - 002_fixed_config.patch + REF 8b386a006c68c25c8f8c119c1f9620a916fb5afc #v1.3.0 + SHA512 4b131b5d7c86d589418d85f25afcee70ceb48c11d2ea807ef0e97667ba273ee27659ebf95a2a7aefb6379e43bb8e5f3c25d7921cfa348ca53db4b56a5336933c + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -if(VCPKG_HEAD_VERSION) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/polymorphic_value TARGET_PATH share/polymorphic_value) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -else() - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/polymorphic_value) - file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.txt") -endif() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/polymorphic_value) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file( - INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/polymorphic-value/vcpkg.json b/external_imported/vcpkg/ports/polymorphic-value/vcpkg.json index a47f48294..8604b7400 100644 --- a/external_imported/vcpkg/ports/polymorphic-value/vcpkg.json +++ b/external_imported/vcpkg/ports/polymorphic-value/vcpkg.json @@ -1,7 +1,18 @@ { "name": "polymorphic-value", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "A polymorphic value-type for C++", - "homepage": "https://github.com/jbcoe/polymorphic_value" + "homepage": "https://github.com/jbcoe/polymorphic_value", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/poppler/portfile.cmake b/external_imported/vcpkg/ports/poppler/portfile.cmake index 3ae105866..e0d3db59a 100644 --- a/external_imported/vcpkg/ports/poppler/portfile.cmake +++ b/external_imported/vcpkg/ports/poppler/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO poppler/poppler - REF poppler-22.03.0 - SHA512 0229e50bbf21154f398480730649fd15ca37c7edae5abd63ed41ab722852d09e4dc2b9df66b13b1cfe3e7a0da945916e1bd39c75c4879ded2759eb465f69424a + REF 12853d22e9d0527c10ada02666aef629db3e5e7c #poppler-22.08.0 + SHA512 d181bc8a521e216f163096e8baad7e73c898c24b18a5a4ab3b687bff4c29333c8c19961adaef54e684c1bdf26dab90183c3553fadb963b7a664e063bd3abcfcf HEAD_REF master PATCHES export-unofficial-poppler.patch @@ -18,6 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS curl ENABLE_LIBCURL private-api ENABLE_UNSTABLE_API_ABI_HEADERS zlib ENABLE_ZLIB + glib ENABLE_GLIB ) if("fontconfig" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") @@ -50,7 +51,6 @@ vcpkg_cmake_configure( -DBUILD_CPP_TESTS=OFF -DBUILD_MANUAL_TESTS=OFF -DENABLE_UTILS=OFF - -DENABLE_GLIB=OFF -DENABLE_GOBJECT_INTROSPECTION=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF diff --git a/external_imported/vcpkg/ports/poppler/vcpkg.json b/external_imported/vcpkg/ports/poppler/vcpkg.json index f1a3be54c..441d29f13 100644 --- a/external_imported/vcpkg/ports/poppler/vcpkg.json +++ b/external_imported/vcpkg/ports/poppler/vcpkg.json @@ -1,7 +1,6 @@ { "name": "poppler", - "version": "22.3.0", - "port-version": 1, + "version": "22.8.0", "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", @@ -67,6 +66,22 @@ "fontconfig" ] }, + "glib": { + "description": "glib for poppler", + "dependencies": [ + { + "name": "glib", + "default-features": false + }, + { + "name": "poppler", + "default-features": false, + "features": [ + "cairo" + ] + } + ] + }, "private-api": { "description": "Install headers for private API (aka unstable API/ABI headers)" }, diff --git a/external_imported/vcpkg/ports/portable-snippets/vcpkg.json b/external_imported/vcpkg/ports/portable-snippets/vcpkg.json index acd3cde95..f10854b20 100644 --- a/external_imported/vcpkg/ports/portable-snippets/vcpkg.json +++ b/external_imported/vcpkg/ports/portable-snippets/vcpkg.json @@ -1,7 +1,9 @@ { "name": "portable-snippets", - "version-string": "2019-09-20", - "port-version": 1, + "version-date": "2019-09-20", + "port-version": 2, "description": "Collection of miscellaneous portable C snippets", - "homepage": "https://github.com/nemequ/portable-snippets" + "homepage": "https://github.com/nemequ/portable-snippets", + "license": null, + "supports": "!(arm & osx)" } diff --git a/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch b/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch index 629643086..8f5f625d9 100644 --- a/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch +++ b/external_imported/vcpkg/ports/proj/fix-proj4-targets-cmake.patch @@ -43,24 +43,20 @@ index 7d736d129..2be8f8be9 100644 message(SEND_ERROR "curl dependency not found!") endif() diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index 23f997abd..8baef00f0 100644 +index 7d5579ae..0cf96252 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -7,6 +7,17 @@ - # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib - # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin - # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) +@@ -12,6 +12,13 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4") + endif() + + include(CMakeFindDependencyMacro) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) -+include(CMakeFindDependencyMacro) +find_dependency(unofficial-sqlite3 CONFIG) +if("@ENABLE_TIFF@") + find_dependency(TIFF) +endif() -+if("@ENABLE_CURL@") -+ find_dependency(CURL CONFIG) -+endif() +cmake_policy(POP) - - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + if("@CURL_ENABLED@" STREQUAL "TRUE") + # Chainload CURL usage requirements + find_dependency(CURL) diff --git a/external_imported/vcpkg/ports/proj/portfile.cmake b/external_imported/vcpkg/ports/proj/portfile.cmake index 63a50506c..36c60274b 100644 --- a/external_imported/vcpkg/ports/proj/portfile.cmake +++ b/external_imported/vcpkg/ports/proj/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 9.0.0 - SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + REF 9.1.0 + SHA512 0a0c887e14dc4dddc8ea3d1de01683cd81d9d6cc5788601aa224e1fecf46af10fb289e7260547431b35e4b771b020feccf04101135b86c6343221c8f446a766b HEAD_REF master PATCHES fix-win-output-name.patch fix-proj4-targets-cmake.patch tools-cmake.patch + remove-doc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -31,8 +32,6 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DNLOHMANN_JSON=external - -DPROJ_LIB_SUBDIR=lib - -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/${PORT}/data -DBUILD_TESTING=OFF "-DEXE_SQLITE3=${EXE_SQLITE3}" diff --git a/external_imported/vcpkg/ports/proj/remove-doc.patch b/external_imported/vcpkg/ports/proj/remove-doc.patch new file mode 100644 index 000000000..725b5151a --- /dev/null +++ b/external_imported/vcpkg/ports/proj/remove-doc.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c9744e6..a6d5e4eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -318,15 +335,12 @@ include_directories(${PROJ_SOURCE_DIR}/src) + add_subdirectory(data) + add_subdirectory(include) + add_subdirectory(src) +-add_subdirectory(man) + add_subdirectory(cmake) + if(BUILD_TESTING) + add_subdirectory(test) + endif() + +-set(docfiles COPYING NEWS AUTHORS) +-install(FILES ${docfiles} +- DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++ + + ################################################################################ + # pkg-config support +@@ -378,6 +392,7 @@ set(CPACK_SOURCE_IGNORE_FILES + + include(CPack) + ++if(0) + # Simplify README.md to README + add_custom_target(README + COMMAND ${CMAKE_COMMAND} +@@ -393,3 +408,4 @@ if(NOT _is_multi_config_generator) + ) + message(STATUS "PROJ: Configured 'dist' target") + endif() ++endif() diff --git a/external_imported/vcpkg/ports/proj/vcpkg.json b/external_imported/vcpkg/ports/proj/vcpkg.json index a17d5a8aa..77f6414d3 100644 --- a/external_imported/vcpkg/ports/proj/vcpkg.json +++ b/external_imported/vcpkg/ports/proj/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proj", - "version": "9.0.0", + "version": "9.1.0", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", diff --git a/external_imported/vcpkg/ports/prometheus-cpp/portfile.cmake b/external_imported/vcpkg/ports/prometheus-cpp/portfile.cmake index 256f69c8d..de74f9ba8 100644 --- a/external_imported/vcpkg/ports/prometheus-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/prometheus-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF 4ea303fa66e4c26dc4df67045fa0edf09c2f3077 # v1.0.0 - SHA512 f97f380182cb7d8576f444e263159d5cc4572d71020b14a2d599041a6a4e5e2cb677a80c637b5a2bca55d4f0e570e87c2863d5dd48e317e9a912cca5a192e81a + REF 76470b3ec024c8214e1f4253fb1f4c0b28d3df94 # v1.0.1 + SHA512 bf5e68d99b5b0251154337bac11703ad4e84e0dc1292ecb3b9cbe0573bf2c0acbb5e3e96a417b0712b85665ea7a54514837a04be762fba954014f600148fd35f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/prometheus-cpp/vcpkg.json b/external_imported/vcpkg/ports/prometheus-cpp/vcpkg.json index 1f5ae41ba..69217cea6 100644 --- a/external_imported/vcpkg/ports/prometheus-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/prometheus-cpp/vcpkg.json @@ -1,7 +1,8 @@ { "name": "prometheus-cpp", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "description": "Prometheus Client Library for Modern C++", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/protobuf/compile_options.patch b/external_imported/vcpkg/ports/protobuf/compile_options.patch new file mode 100644 index 000000000..8cf541774 --- /dev/null +++ b/external_imported/vcpkg/ports/protobuf/compile_options.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04cb3303a..608c580be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,12 +242,12 @@ endif (protobuf_BUILD_SHARED_LIBS) + if (MSVC) + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Build with multiple processes +- add_definitions(/MP) ++ add_compile_options(/MP) + endif() + # Set source file and execution character sets to UTF-8 +- add_definitions(/utf-8) ++ add_compile_options(/utf-8) + # MSVC warning suppressions +- add_definitions( ++ add_compile_options( + /wd4065 # switch statement contains 'default' but no 'case' labels + /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data + /wd4251 # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' +@@ -262,23 +262,17 @@ if (MSVC) + /wd4996 # The compiler encountered a deprecated declaration. + ) + # Allow big object +- add_definitions(/bigobj) ++ add_compile_options(/bigobj) + string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) + string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR}) + string(REPLACE "." "," protobuf_RC_FILEVERSION "${protobuf_VERSION}") + configure_file(${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in extract_includes.bat) + + # Suppress linker warnings about files with no symbols defined. +- set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221") ++ string(APPEND CMAKE_STATIC_LINKER_FLAGS " /ignore:4221") + +- if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +- # Configure Resource Compiler +- enable_language(RC) +- # use English language (0x409) in resource compiler +- set(rc_flags "/l0x409") +- # fix rc.exe invocations because of usage of add_definitions() +- set(CMAKE_RC_COMPILE_OBJECT " ${rc_flags} /fo ") +- endif() ++ # use English language (0x409) in resource compiler ++ string(APPEND CMAKE_RC_FLAGS " -l0x409") + + # Generate the version.rc file used elsewhere. + configure_file(${protobuf_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) diff --git a/external_imported/vcpkg/ports/protobuf/fix-default-proto-file-path.patch b/external_imported/vcpkg/ports/protobuf/fix-default-proto-file-path.patch index a5af918b3..1c850b1de 100644 --- a/external_imported/vcpkg/ports/protobuf/fix-default-proto-file-path.patch +++ b/external_imported/vcpkg/ports/protobuf/fix-default-proto-file-path.patch @@ -1,11 +1,12 @@ diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc -index f192ae6..22900ed 100644 +index 5e9a2c4..8eaa6e0 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc -@@ -260,11 +260,15 @@ void AddDefaultProtoPaths( +@@ -261,12 +261,15 @@ void AddDefaultProtoPaths( + std::pair("", path + "/include")); return; } - // Check if the upper level directory has an "include" subdirectory. +- // Check if the upper level directory has an "include" subdirectory. + // change "'$/bin' is next to 'include'" assumption to "'$/bin/tools' is next to 'include'" + for (int i = 0; i < 2; i++) + { diff --git a/external_imported/vcpkg/ports/protobuf/fix-static-build.patch b/external_imported/vcpkg/ports/protobuf/fix-static-build.patch index d0e3ae010..496c6c4d5 100644 --- a/external_imported/vcpkg/ports/protobuf/fix-static-build.patch +++ b/external_imported/vcpkg/ports/protobuf/fix-static-build.patch @@ -1,26 +1,13 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 51e8478..64347c4 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -182,7 +182,7 @@ else (protobuf_BUILD_SHARED_LIBS) - # making programmatic control difficult. Prefer the functionality in newer - # CMake versions when available. - if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) -- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) -+ - else() - # In case we are building static libraries, link also the runtime library statically - # so that MSVCR*.DLL is not required at runtime. -diff --git a/cmake/install.cmake b/cmake/install.cmake -index 4e1c5de..d3aa865 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) -- if (UNIX AND NOT APPLE) -+ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) - set_property(TARGET protoc - PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") - elseif (APPLE) +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 825cb25..4f453d6 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) ++ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) + set_property(TARGET protoc + PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + elseif (APPLE) diff --git a/external_imported/vcpkg/ports/protobuf/portfile.cmake b/external_imported/vcpkg/ports/protobuf/portfile.cmake index 205cf7cd7..bab855835 100644 --- a/external_imported/vcpkg/ports/protobuf/portfile.cmake +++ b/external_imported/vcpkg/ports/protobuf/portfile.cmake @@ -1,12 +1,15 @@ +set(version 3.21.6) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF v3.19.4 - SHA512 2653b9852e5ac69f1de9b6ac02887c366aa0a9efd2b29e53135f61a9a10f5a1b5853a8c4cbb3658f519dfdbde9f32c547c39751ab417f123162b08be9e76c9e1 + REF v3.21.6 + SHA512 31506c777d30c7ff0d510a4cfa56d5b352e3c299dbaf8ab6c623220dbead96ff8d3cd5819d28d9f9fe742e31fa5e260c68be7074dae6412860195ab3b6aec5d0 HEAD_REF master PATCHES fix-static-build.patch fix-default-proto-file-path.patch + compile_options.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) @@ -31,7 +34,7 @@ if (VCPKG_DOWNLOAD_MODE) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/cmake + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} @@ -77,7 +80,7 @@ if(protobuf_BUILD_PROTOC_BINARIES) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() - vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.19.4.0 AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES protoc protoc-${version}.0 AUTO_CLEAN) endif() else() file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") diff --git a/external_imported/vcpkg/ports/protobuf/vcpkg.json b/external_imported/vcpkg/ports/protobuf/vcpkg.json index 3eaa26fc5..99afe6026 100644 --- a/external_imported/vcpkg/ports/protobuf/vcpkg.json +++ b/external_imported/vcpkg/ports/protobuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protobuf", - "version-semver": "3.19.4", + "version": "3.21.6", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/protopuf/portfile.cmake b/external_imported/vcpkg/ports/protopuf/portfile.cmake index 9b1e9c948..af73a5f28 100644 --- a/external_imported/vcpkg/ports/protopuf/portfile.cmake +++ b/external_imported/vcpkg/ports/protopuf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PragmaTwice/protopuf - REF v2.1.0 - SHA512 328fe2a861009c8eaa38299bf1ba31d3a47d73220018d3539b8457bb1d5d512c05e9652769a0261f0ae18be4e1e4e839e5471dfabdf0e6d130361e719ff6aadc + REF v2.2.0 + SHA512 b7f00b1575b83ffad66e6fa555b2e420f1178ddf5b9aed64ae2c3af583e3d6c7292f0280e97cb91d4048cd0d0464ea89805f38444b86b7724abe03503682ac7f HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/protopuf/vcpkg.json b/external_imported/vcpkg/ports/protopuf/vcpkg.json index c0063acdd..ddb27f429 100644 --- a/external_imported/vcpkg/ports/protopuf/vcpkg.json +++ b/external_imported/vcpkg/ports/protopuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "protopuf", - "version-semver": "2.1.0", - "port-version": 1, + "version": "2.2.0", "description": "A little, highly templated, and protobuf-compatible serialization/deserialization library written in C++20", "homepage": "https://github.com/PragmaTwice/protopuf", "dependencies": [ diff --git a/external_imported/vcpkg/ports/protozero/fix-builderror.patch b/external_imported/vcpkg/ports/protozero/fix-builderror.patch deleted file mode 100644 index 74ae39800..000000000 --- a/external_imported/vcpkg/ports/protozero/fix-builderror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9702d6..bd41cbe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ if(MSVC) - add_definitions(/W3) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) - else() -- add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) -+ add_definitions(-std=c++17 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default) - if(WERROR) - add_definitions(-Werror) - endif() diff --git a/external_imported/vcpkg/ports/protozero/fix-no-tests.patch b/external_imported/vcpkg/ports/protozero/fix-no-tests.patch new file mode 100644 index 000000000..6cedbd965 --- /dev/null +++ b/external_imported/vcpkg/ports/protozero/fix-no-tests.patch @@ -0,0 +1,17 @@ +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d490..df2ca15f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- diff --git a/external_imported/vcpkg/ports/protozero/portfile.cmake b/external_imported/vcpkg/ports/protozero/portfile.cmake index abfe4956b..84e704c3c 100644 --- a/external_imported/vcpkg/ports/protozero/portfile.cmake +++ b/external_imported/vcpkg/ports/protozero/portfile.cmake @@ -2,15 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/protozero - SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b - REF v1.7.0 + SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2 + REF v1.7.1 HEAD_REF master - PATCHES fix-builderror.patch + PATCHES + fix-no-tests.patch # from https://github.com/mapbox/protozero/pull/110 ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) diff --git a/external_imported/vcpkg/ports/protozero/vcpkg.json b/external_imported/vcpkg/ports/protozero/vcpkg.json index 3d4ba85b9..320b34ed8 100644 --- a/external_imported/vcpkg/ports/protozero/vcpkg.json +++ b/external_imported/vcpkg/ports/protozero/vcpkg.json @@ -1,10 +1,10 @@ { "name": "protozero", - "version-semver": "1.7.0", - "port-version": 1, + "version-semver": "1.7.1", "description": "Minimalist protocol buffer decoder and encoder in C++", "homepage": "https://github.com/mapbox/protozero", "license": "BSD-2-Clause", + "supports": "!uwp", "dependencies": [ "protobuf", { diff --git a/external_imported/vcpkg/ports/proxy/portfile.cmake b/external_imported/vcpkg/ports/proxy/portfile.cmake new file mode 100644 index 000000000..ef7321cf2 --- /dev/null +++ b/external_imported/vcpkg/ports/proxy/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/proxy + REF release/1.0.1 + SHA512 5822064b373d3da8cea884d0c727e98d988252a7324ea9b78fa63fc86ee6afd73852a49f3685842345b86d625380140f80998263a6c8150fe66a30d6ba7e928a + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/proxy/vcpkg.json b/external_imported/vcpkg/ports/proxy/vcpkg.json new file mode 100644 index 000000000..602cf0dd3 --- /dev/null +++ b/external_imported/vcpkg/ports/proxy/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "proxy", + "version": "1.0.1", + "description": "A single-header C++20 library that facilitates runtime polymorphism.", + "homepage": "https://github.com/microsoft/proxy", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/proxygen/portfile.cmake b/external_imported/vcpkg/ports/proxygen/portfile.cmake index 524f98d40..f8abe645d 100644 --- a/external_imported/vcpkg/ports/proxygen/portfile.cmake +++ b/external_imported/vcpkg/ports/proxygen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF v2022.03.21.00 - SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9 + REF 0c932f6c57095838494520ec4ce7243a7f0c1234 #v2022.07.11.00 + SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093 HEAD_REF master PATCHES remove-register.patch @@ -13,16 +13,7 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_find_acquire_program(GPERF) - get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) - vcpkg_add_to_path(${GPERF_PATH}) -else() - # gperf only have windows package in vcpkg now. - if (NOT EXISTS /usr/bin/gperf) - message(FATAL_ERROR "proxygen requires gperf, these can be installed on Ubuntu systems via apt-get install gperf.") - endif() -endif() +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/external_imported/vcpkg/ports/proxygen/vcpkg.json b/external_imported/vcpkg/ports/proxygen/vcpkg.json index a0f89963a..25080b933 100644 --- a/external_imported/vcpkg/ports/proxygen/vcpkg.json +++ b/external_imported/vcpkg/ports/proxygen/vcpkg.json @@ -1,9 +1,9 @@ { "name": "proxygen", - "version-string": "2022.03.21.00", - "port-version": 1, + "version-string": "2022.07.11.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", + "license": "BSD-3-Clause", "supports": "!windows", "dependencies": [ "boost-context", @@ -16,6 +16,10 @@ "boost-thread", "fizz", "folly", + { + "name": "gperf", + "host": true + }, "openssl", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/pthread-stubs/portfile.cmake b/external_imported/vcpkg/ports/pthread-stubs/portfile.cmake new file mode 100644 index 000000000..10f0df695 --- /dev/null +++ b/external_imported/vcpkg/ports/pthread-stubs/portfile.cmake @@ -0,0 +1,51 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/pthread-stubs + REF 50f0755a7f894acae168f19c66e52a3f139ca4ec # 0.4.0 + SHA512 15fcb2144a8abb7b9b1b8f6d9732759351268fb440c7a59380b0ca6ddf48b74a37ce5afbf777ce58fc1993df0c8d6ffb82e452800ce2fcaf16edcbcc1750e338 + HEAD_REF master +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +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/${PORT}" RENAME copyright) + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pthread-stubs.pc") +file(READ "${_file}" _contents) +string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") +if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/pthreadGC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") +endif() +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pthread-stubs.pc") +file(READ "${_file}" _contents) +string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3d" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3d" _contents "${_contents}") +endif() +file(WRITE "${_file}" "${_contents}") diff --git a/external_imported/vcpkg/ports/pthread-stubs/vcpkg.json b/external_imported/vcpkg/ports/pthread-stubs/vcpkg.json new file mode 100644 index 000000000..f72f2ae2e --- /dev/null +++ b/external_imported/vcpkg/ports/pthread-stubs/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "pthread-stubs", + "version": "0.4", + "description": "Stub replacements for POSIX Threads functions.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/pthread-stubs", + "license": "X11-distribute-modifications-variant", + "dependencies": [ + "pthread" + ] +} diff --git a/external_imported/vcpkg/ports/pthreadpool/fix-uwp.patch b/external_imported/vcpkg/ports/pthreadpool/fix-uwp.patch index 6ad039d21..0b1e5109a 100644 --- a/external_imported/vcpkg/ports/pthreadpool/fix-uwp.patch +++ b/external_imported/vcpkg/ports/pthreadpool/fix-uwp.patch @@ -2,12 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index a07945c..6df83d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,7 +75,7 @@ ELSE() +@@ -75,7 +75,8 @@ ELSE() LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c) IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd")) LIST(APPEND PTHREADPOOL_SRCS src/gcd.c) - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event")) ++ add_compile_options(-wd4146) LIST(APPEND PTHREADPOOL_SRCS src/windows.c) ELSE() LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c) diff --git a/external_imported/vcpkg/ports/pthreadpool/vcpkg.json b/external_imported/vcpkg/ports/pthreadpool/vcpkg.json index cff1bc650..8341b32ce 100644 --- a/external_imported/vcpkg/ports/pthreadpool/vcpkg.json +++ b/external_imported/vcpkg/ports/pthreadpool/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthreadpool", "version-date": "2020-04-10", - "port-version": 1, + "port-version": 2, "description": "Portable (POSIX/Windows/Emscripten) thread pool for C/C++", "homepage": "https://github.com/Maratyszcza/pthreadpool", "dependencies": [ diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/pthreads/PThreads4WConfig.cmake similarity index 75% rename from external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake rename to external_imported/vcpkg/ports/pthreads/PThreads4WConfig.cmake index f9818d384..a3a132e9f 100644 --- a/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/pthreads/PThreads4WConfig.cmake @@ -46,7 +46,7 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) if(NOT PThreads4W_INCLUDE_DIR) - find_path(PThreads4W_INCLUDE_DIR NAMES pthread.h) + find_path(PThreads4W_INCLUDE_DIR NAMES pthread.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) endif() set(PThreads4W_MAJOR_VERSION 3) @@ -56,18 +56,18 @@ set(PThreads4W_VERSION "${PThreads4W_MAJOR_VERSION}.${PThreads4W_MINOR_VERSION}. # Allow libraries to be set manually if(NOT PThreads4W_LIBRARY) - find_library(PThreads4W_LIBRARY_RELEASE NAMES pthreadVC${PThreads4W_MAJOR_VERSION}) - find_library(PThreads4W_LIBRARY_DEBUG NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d) + find_library(PThreads4W_LIBRARY_RELEASE NAMES pthreadVC${PThreads4W_MAJOR_VERSION} PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + find_library(PThreads4W_LIBRARY_DEBUG NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(PThreads4W) endif() if(NOT PThreads4W_CXXEXC_LIBRARY) - find_library(PThreads4W_CXXEXC_LIBRARY_RELEASE NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}) - find_library(PThreads4W_CXXEXC_LIBRARY_DEBUG NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d) + find_library(PThreads4W_CXXEXC_LIBRARY_RELEASE NAMES pthreadVCE${PThreads4W_MAJOR_VERSION} PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + find_library(PThreads4W_CXXEXC_LIBRARY_DEBUG NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(PThreads4W_CXXEXC) endif() if(NOT PThreads4W_STRUCTEXC_LIBRARY) - find_library(PThreads4W_STRUCTEXC_LIBRARY_RELEASE NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}) - find_library(PThreads4W_STRUCTEXC_LIBRARY_DEBUG NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d) + find_library(PThreads4W_STRUCTEXC_LIBRARY_RELEASE NAMES pthreadVSE${PThreads4W_MAJOR_VERSION} PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + find_library(PThreads4W_STRUCTEXC_LIBRARY_DEBUG NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(PThreads4W_STRUCTEXC) endif() @@ -88,23 +88,6 @@ find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR find_file(PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) -#Compatibility definitions, deprecated -set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") -set(PTHREADS_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") -set(PThreads_windows_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") -set(PTHREAD_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "") -set(PTHREADS_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "") -set(PTHREAD_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") -set(PTHREADS_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") -set(LIBPTHREAD ${PThreads4W_LIBRARY} CACHE STRING "") -set(LIBPTHREADS ${PThreads4W_LIBRARY} CACHE STRING "") -set(PThreads_windows_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "") -set(PThreads_VERSION "${PThreads4W_VERSION}") -if(PThreads4W_FOUND) - set(PThreads_windows_FOUND TRUE) -endif() - -#TARGETS if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_CXXEXC ) if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" ) add_library( PThreads4W::PThreads4W_CXXEXC SHARED IMPORTED ) @@ -194,34 +177,3 @@ if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W ) endif() endif() endif() - -#Compatibility targets, deprecated -if( PThreads4W_FOUND AND NOT TARGET PThreads_windows::PThreads_windows ) - if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) - add_library( PThreads_windows::PThreads_windows SHARED IMPORTED ) - set_target_properties( PThreads_windows::PThreads_windows PROPERTIES - IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" - IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS Release - IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) - if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) - set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) - set_target_properties( PThreads_windows::PThreads_windows PROPERTIES - IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" - IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) - endif() - else() - add_library( PThreads_windows::PThreads_windows UNKNOWN IMPORTED ) - set_target_properties( PThreads_windows::PThreads_windows PROPERTIES - IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" - INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS Release - IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) - if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) - set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) - set_target_properties( PThreads_windows::PThreads_windows PROPERTIES - IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) - endif() - endif() -endif() diff --git a/external_imported/vcpkg/ports/pthreads/portfile.cmake b/external_imported/vcpkg/ports/pthreads/portfile.cmake index 47493940e..1256e692d 100644 --- a/external_imported/vcpkg/ports/pthreads/portfile.cmake +++ b/external_imported/vcpkg/ports/pthreads/portfile.cmake @@ -12,6 +12,7 @@ if(VCPKG_TARGET_IS_UWP) # https://docs.microsoft.com/en-us/cpp/build/reference/linking#link-environment-variables set(ENV{LINK} "/APPCONTAINER") endif() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) list(APPEND PATCH_FILES use-md.patch) else() @@ -38,71 +39,77 @@ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) vcpkg_execute_required_process( COMMAND ${NMAKE} -f Makefile all install "DESTROOT=\"${INST_DIR_REL}\"" - WORKING_DIRECTORY ${SOURCE_PATH} + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME nmake-build-${TARGET_TRIPLET}-release ) -message(STATUS "Building ${TARGET_TRIPLET}-rel done") - -################ -# Debug build -################ -message(STATUS "Building ${TARGET_TRIPLET}-dbg") -file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) -vcpkg_execute_required_process( - COMMAND ${NMAKE} /G -f Makefile all install - "DESTROOT=\"${INST_DIR_DBG}\"" - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug -) -message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVC3d.dll") file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVCE3d.dll") file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVSE3d.dll") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3d.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3d.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVC3.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3d.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3d.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib" "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib" "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib" "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3.lib") +endif() + +message(STATUS "Building ${TARGET_TRIPLET}-rel done") + +if(NOT VCPKG_BUILD_TYPE) + ################ + # Debug build + ################ + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) + vcpkg_execute_required_process( + COMMAND ${NMAKE} /G -f Makefile all install + "DESTROOT=\"${INST_DIR_DBG}\"" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME nmake-build-${TARGET_TRIPLET}-debug + ) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3d.lib") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + message(STATUS "Building ${TARGET_TRIPLET}-dbg done") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/PThreads4WConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/PThreads4W") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper-pthread.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/pthread" RENAME vcpkg-cmake-wrapper.cmake) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper-pthreads.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/pthreads" RENAME vcpkg-cmake-wrapper.cmake) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper-pthreads-windows.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/PThreads_windows" RENAME vcpkg-cmake-wrapper.cmake) + +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) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) diff --git a/external_imported/vcpkg/ports/pthreads/usage b/external_imported/vcpkg/ports/pthreads/usage index 343c97f44..69dcfd08c 100644 --- a/external_imported/vcpkg/ports/pthreads/usage +++ b/external_imported/vcpkg/ports/pthreads/usage @@ -1,9 +1,4 @@ The package pthreads provides CMake targets: - find_package(pthreads REQUIRED) - + find_package(PThreads4W REQUIRED) target_link_libraries(main PRIVATE PThreads4W::PThreads4W) - #or - target_link_libraries(main PRIVATE PThreads4W::PThreads4W_CXXEXC) - #or - target_link_libraries(main PRIVATE PThreads4W::PThreads4W_STRUCTEXC) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthread.cmake b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthread.cmake new file mode 100644 index 000000000..0d0515ce5 --- /dev/null +++ b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthread.cmake @@ -0,0 +1,13 @@ +_find_package(PThreads4W) +set(PTHREAD_INCLUDE_DIR "${PThreads4W_INCLUDE_DIR}") +set(PTHREAD_LIBRARY "${PThreads4W_LIBRARY}") +set(PTHREAD_LIBRARIES "${PThreads4W_LIBRARY}") +set(PTHREAD_VERSION "${PThreads4W_VERSION}") +set(LIBPTHREAD "${PThreads4W_LIBRARY}") +set(LIBPTHREADS "${PThreads4W_LIBRARY}") + +if(PThreads4W_FOUND) + set(PTHREAD_FOUND TRUE) + set(LIBPTHREAD_FOUND TRUE) + set(LIBPTHREADS_FOUND TRUE) +endif() diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads-windows.cmake b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads-windows.cmake new file mode 100644 index 000000000..e648ecf64 --- /dev/null +++ b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads-windows.cmake @@ -0,0 +1,39 @@ +_find_package(PThreads4W) +set(PThreads_windows_INCLUDE_DIR "${PThreads4W_INCLUDE_DIR}") +set(PThreads_windows_LIBRARY "${PThreads4W_LIBRARY}") +set(PThreads_windows_LIBRARIES "${PThreads4W_LIBRARY}") +set(PThreads_windows_VERSION "${PThreads4W_VERSION}") + +if(PThreads4W_FOUND) + set(PThreads_windows_FOUND TRUE) + + if(NOT TARGET PThreads_windows::PThreads_windows) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads_windows::PThreads_windows SHARED IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads_windows::PThreads_windows UNKNOWN IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() + endif() +endif() diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads.cmake b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads.cmake new file mode 100644 index 000000000..453c5c24a --- /dev/null +++ b/external_imported/vcpkg/ports/pthreads/vcpkg-cmake-wrapper-pthreads.cmake @@ -0,0 +1,39 @@ +_find_package(PThreads4W) +set(pthreads_INCLUDE_DIR "${PThreads4W_INCLUDE_DIR}") +set(pthreads_LIBRARY "${PThreads4W_LIBRARY}") +set(pthreads_LIBRARIES "${PThreads4W_LIBRARY}") +set(pthreads_VERSION "${PThreads4W_VERSION}") + +if(PThreads4W_FOUND) + set(pthreads_FOUND TRUE) + + if(NOT TARGET PThreads_windows::PThreads_windows) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads_windows::PThreads_windows SHARED IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads_windows::PThreads_windows UNKNOWN IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() + endif() +endif() diff --git a/external_imported/vcpkg/ports/pthreads/vcpkg.json b/external_imported/vcpkg/ports/pthreads/vcpkg.json index db809649b..7fe191e79 100644 --- a/external_imported/vcpkg/ports/pthreads/vcpkg.json +++ b/external_imported/vcpkg/ports/pthreads/vcpkg.json @@ -1,7 +1,8 @@ { "name": "pthreads", "version": "3.0.0", - "port-version": 10, - "description": "pthreads for windows", - "homepage": "https://sourceware.org/pub/pthreads-win32/" + "port-version": 11, + "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/external_imported/vcpkg/ports/pugixml/dllexport.patch b/external_imported/vcpkg/ports/pugixml/dllexport.patch new file mode 100644 index 000000000..a3368ed9e --- /dev/null +++ b/external_imported/vcpkg/ports/pugixml/dllexport.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17f67d1f7..9acaf856f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,8 +110,12 @@ if (BUILD_SHARED_LIBS) + PUBLIC + ${PUGIXML_BUILD_DEFINES} + ${PUGIXML_PUBLIC_DEFINITIONS} ++ ) ++ if(WIN32) ++ target_compile_definitions(pugixml-shared + PRIVATE +- $<$:PUGIXML_API=__declspec\(dllexport\)>) ++ PUGIXML_API=__declspec\(dllexport\)) ++ endif() + target_compile_options(pugixml-shared + PRIVATE + ${msvc-rt-mtd-shared} diff --git a/external_imported/vcpkg/ports/pugixml/portfile.cmake b/external_imported/vcpkg/ports/pugixml/portfile.cmake index c27b1a89d..69afbc712 100644 --- a/external_imported/vcpkg/ports/pugixml/portfile.cmake +++ b/external_imported/vcpkg/ports/pugixml/portfile.cmake @@ -1,22 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF v1.11.4 - SHA512 a1fdf4cbd744318fd339362465472279767777b18a3c8c7e8618d5e637213c632bf9dd8144d16ae22a75cfbde007f383e2feb49084e681c930fc89a2e3f2bc4f + REF v1.12.1 + SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b HEAD_REF master + PATCHES + dllexport.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DUSE_POSTFIX=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPUGIXML_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pugixml) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/readme.txt 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/external_imported/vcpkg/ports/pugixml/vcpkg.json b/external_imported/vcpkg/ports/pugixml/vcpkg.json index 28158b325..629b800ba 100644 --- a/external_imported/vcpkg/ports/pugixml/vcpkg.json +++ b/external_imported/vcpkg/ports/pugixml/vcpkg.json @@ -1,7 +1,18 @@ { "name": "pugixml", - "version-string": "1.11.4", + "version": "1.12.1", "port-version": 1, "description": "Light-weight, simple and fast XML parser for C++ with XPath support", - "homepage": "https://github.com/zeux/pugixml" + "homepage": "https://github.com/zeux/pugixml", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/pybind11/fix-usage.patch b/external_imported/vcpkg/ports/pybind11/fix-usage.patch new file mode 100644 index 000000000..368c81973 --- /dev/null +++ b/external_imported/vcpkg/ports/pybind11/fix-usage.patch @@ -0,0 +1,24 @@ +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index 5535e87..6576b2e 100644 +--- a/tools/pybind11Tools.cmake ++++ b/tools/pybind11Tools.cmake +@@ -130,15 +130,16 @@ if(CMAKE_VERSION VERSION_LESS 3.11) + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $) + else() ++ add_library(pybind11::_ClassicPythonLibraries IMPORTED INTERFACE) ++ target_link_libraries(pybind11::_ClassicPythonLibraries INTERFACE ${PYTHON_LIBRARIES}) + target_link_libraries( + pybind11::module + INTERFACE + pybind11::python_link_helper +- "$<$,$>:$>" +- ) ++ "$<$,$>:pybind11::_ClassicPythonLibraries>") + + target_link_libraries(pybind11::embed INTERFACE pybind11::pybind11 +- $) ++ pybind11::_ClassicPythonLibraries) + + endif() + diff --git a/external_imported/vcpkg/ports/pybind11/portfile.cmake b/external_imported/vcpkg/ports/pybind11/portfile.cmake index 113a679c9..fa12f9e2a 100644 --- a/external_imported/vcpkg/ports/pybind11/portfile.cmake +++ b/external_imported/vcpkg/ports/pybind11/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.9.2 - SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272 + REF v2.10.0 + SHA512 93112ce530a0652b2b4458a137b4a35f2fd8607f82ad96698ef422128d0b53e16e1d06c239ee4643b821acafae09c74eb0f72bc4ee5584aa9fcdaff4d79980d9 HEAD_REF master + PATCHES fix-usage.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/pybind11/vcpkg.json b/external_imported/vcpkg/ports/pybind11/vcpkg.json index 6c9dcf63d..809d4a73c 100644 --- a/external_imported/vcpkg/ports/pybind11/vcpkg.json +++ b/external_imported/vcpkg/ports/pybind11/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pybind11", - "version": "2.9.2", + "version": "2.10.0", + "port-version": 1, "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/pystring/portfile.cmake b/external_imported/vcpkg/ports/pystring/portfile.cmake index 31143c5c9..bc370a0c2 100644 --- a/external_imported/vcpkg/ports/pystring/portfile.cmake +++ b/external_imported/vcpkg/ports/pystring/portfile.cmake @@ -8,11 +8,10 @@ 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_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) @@ -20,4 +19,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -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/external_imported/vcpkg/ports/pystring/vcpkg.json b/external_imported/vcpkg/ports/pystring/vcpkg.json index 4011f52e7..915b00604 100644 --- a/external_imported/vcpkg/ports/pystring/vcpkg.json +++ b/external_imported/vcpkg/ports/pystring/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pystring", "version-semver": "1.1.3", - "port-version": 4, + "port-version": 5, "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string", "homepage": "https://github.com/imageworks/pystring", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/python2/vcpkg.json b/external_imported/vcpkg/ports/python2/vcpkg.json index abe470eb5..ce26b439f 100644 --- a/external_imported/vcpkg/ports/python2/vcpkg.json +++ b/external_imported/vcpkg/ports/python2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "python2", "version": "2.7.18", - "port-version": 4, + "port-version": 5, "description": "The Python programming language as an embeddable library", "homepage": "https://www.python.org", - "license": "Python-2.0" + "license": "Python-2.0", + "supports": "!(arm & osx) & !(arm & windows) & !uwp" } diff --git a/external_imported/vcpkg/ports/python3/0011-dont-skip-rpath.patch b/external_imported/vcpkg/ports/python3/0011-dont-skip-rpath.patch new file mode 100644 index 000000000..82ce23b74 --- /dev/null +++ b/external_imported/vcpkg/ports/python3/0011-dont-skip-rpath.patch @@ -0,0 +1,158 @@ +diff --git a/setup.py b/setup.py +index 61b3266..4c2cfb4 100644 +--- a/setup.py ++++ b/setup.py +@@ -1153,6 +1153,7 @@ def detect_readline_curses(self): + self.add(Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, ++ runtime_library_dirs=self.lib_dirs, + libraries=readline_libs)) + else: + self.missing.append('readline') +@@ -1189,6 +1190,7 @@ def detect_readline_curses(self): + extra_compile_args=['-DPy_BUILD_CORE_MODULE'], + include_dirs=curses_includes, + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=curses_libs)) + elif curses_library == 'curses' and not MACOS: + # OSX has an old Berkeley curses, not good enough for +@@ -1203,6 +1205,7 @@ def detect_readline_curses(self): + self.add(Extension('_curses', ['_cursesmodule.c'], + extra_compile_args=['-DPy_BUILD_CORE_MODULE'], + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=curses_libs)) + else: + curses_enabled = False +@@ -1216,6 +1219,7 @@ def detect_readline_curses(self): + self.add(Extension('_curses_panel', ['_curses_panel.c'], + include_dirs=curses_includes, + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=[panel_library, *curses_libs])) + elif not skip_curses_panel: + self.missing.append('_curses_panel') +@@ -1234,7 +1238,7 @@ def detect_crypt(self): + else: + libs = [] + +- self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs)) ++ self.add(Extension('_crypt', ['_cryptmodule.c'], runtime_library_dirs=self.lib_dirs, libraries=libs)) + + def detect_socket(self): + # socket(2) +@@ -1525,6 +1529,7 @@ class db_found(Exception): pass + libraries=dblibs) + break + if dbmext is not None: ++ dbmext.runtime_library_dirs = self.lib_dirs + self.add(dbmext) + else: + self.missing.append('_dbm') +@@ -1533,6 +1538,7 @@ class db_found(Exception): pass + if ('gdbm' in dbm_order and + self.compiler.find_library_file(self.lib_dirs, 'gdbm')): + self.add(Extension('_gdbm', ['_gdbmmodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=['gdbm'])) + else: + self.missing.append('_gdbm') +@@ -1645,6 +1651,7 @@ def detect_sqlite(self): + define_macros=sqlite_defines, + include_dirs=include_dirs, + library_dirs=sqlite_libdir, ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=sqlite_extra_link_args, + libraries=["sqlite3",])) + else: +@@ -1710,6 +1717,7 @@ def detect_compress_exts(self): + zlib_extra_link_args = () + self.add(Extension('zlib', ['zlibmodule.c'], + libraries=['z'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=zlib_extra_link_args)) + have_zlib = True + else: +@@ -1732,6 +1740,7 @@ def detect_compress_exts(self): + self.add(Extension('binascii', ['binascii.c'], + extra_compile_args=extra_compile_args, + libraries=libraries, ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=extra_link_args)) + + # Gustavo Niemeyer's bz2 module. +@@ -1742,6 +1751,7 @@ def detect_compress_exts(self): + bz2_extra_link_args = () + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=bz2_extra_link_args)) + elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): + if MACOS: +@@ -1750,6 +1760,7 @@ def detect_compress_exts(self): + bz2_extra_link_args = () + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2d'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') +@@ -1757,6 +1768,7 @@ def detect_compress_exts(self): + # LZMA compression support. + if self.compiler.find_library_file(self.lib_dirs, 'lzma'): + self.add(Extension('_lzma', ['_lzmamodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=['lzma'])) + else: + self.missing.append('_lzma') +@@ -1819,6 +1831,7 @@ def detect_expat_elementtree(self): + extra_compile_args=extra_compile_args, + include_dirs=expat_inc, + libraries=expat_lib, ++ runtime_library_dirs=self.lib_dirs, + sources=['pyexpat.c'] + expat_sources, + depends=expat_depends)) + +@@ -1831,6 +1844,7 @@ def detect_expat_elementtree(self): + define_macros=define_macros, + include_dirs=expat_inc, + libraries=expat_lib, ++ runtime_library_dirs=self.lib_dirs, + sources=['_elementtree.c'], + depends=['pyexpat.c', *expat_sources, + *expat_depends])) +@@ -1883,6 +1897,7 @@ def detect_uuid(self): + else: + uuid_libs = [] + self.add(Extension('_uuid', ['_uuidmodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=uuid_libs)) + else: + self.missing.append('_uuid') +@@ -2319,6 +2334,7 @@ def detect_ctypes(self): + ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1") + + ext.include_dirs.append(ffi_inc) ++ ext.runtime_library_dirs = self.lib_dirs + ext.libraries.append(ffi_lib) + self.use_system_libffi = True + +@@ -2485,7 +2501,7 @@ def split_var(name, sep): + include_dirs=openssl_includes, + library_dirs=openssl_libdirs, + libraries=openssl_libs, +- runtime_library_dirs=runtime_library_dirs, ++ runtime_library_dirs=self.lib_dirs, + ) + + # This static linking is NOT OFFICIALLY SUPPORTED. +@@ -2639,6 +2655,7 @@ def detect_nis(self): + self.add(Extension('nis', ['nismodule.c'], + libraries=libs, + library_dirs=library_dirs, ++ runtime_library_dirs=self.lib_dirs, + include_dirs=includes_dirs)) + + diff --git a/external_imported/vcpkg/ports/python3/portfile.cmake b/external_imported/vcpkg/ports/python3/portfile.cmake index d99a0fd67..9cd25a3d3 100644 --- a/external_imported/vcpkg/ports/python3/portfile.cmake +++ b/external_imported/vcpkg/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 10) -set(PYTHON_VERSION_PATCH 2) +set(PYTHON_VERSION_PATCH 5) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -15,6 +15,7 @@ set(PATCHES 0005-only-build-required-projects.patch 0009-python.pc.patch 0010-bz2d.patch + 0011-dont-skip-rpath.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -29,8 +30,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") endif() -# The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PYTHON_ALLOW_EXTENSIONS) + # The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. vcpkg_get_windows_sdk(WINSDK_VERSION) if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") @@ -41,7 +43,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 + SHA512 7a736c6bf76735f66eba50bc055661c46fefce1496869c51e9b6b264bca456d2f2c6de293dfc3bc15a9d1df4b633d7f6f66ed86696e71a36e500354a75f4200f HEAD_REF master PATCHES ${PATCHES} ) @@ -70,7 +72,6 @@ endfunction() if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) # Due to the way Python handles C extension modules on Windows, a static python core cannot # load extension modules. - string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" PYTHON_ALLOW_EXTENSIONS) if(PYTHON_ALLOW_EXTENSIONS) find_library(BZ2_RELEASE NAMES bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DEBUG NAMES bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -171,15 +172,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe") file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS}) - # The generated python executable must match the host arch - if(PYTHON_ALLOW_EXTENSIONS AND NOT VCPKG_CROSSCOMPILING) - message(STATUS "Bootstrapping pip") - vcpkg_execute_required_process(COMMAND python -m ensurepip - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" - LOGNAME "ensurepip-${TARGET_TRIPLET}" - ) - endif() - # pkg-config files if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") make_python_pkgconfig(FILE python.pc INSTALL_ROOT ${CURRENT_PACKAGES_DIR} @@ -198,7 +190,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_fixup_pkgconfig() vcpkg_clean_msbuild() - + # Remove static library belonging to executable if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") @@ -213,9 +205,14 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() endif() else() + # The Python Stable ABI, `libpython3.so` is not produced by the upstream build system with --with-pydebug option + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND NOT VCPKG_BUILD_TYPE) + set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + endif() + set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" - "--with-ensurepip" + "--without-ensurepip" "--with-suffix=" "--with-system-expat" "--without-readline" @@ -253,9 +250,39 @@ else() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") vcpkg_fixup_pkgconfig() + + # Perform some post-build checks on modules + file(GLOB python_libs_dynload_debug LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/lib-dynload/*.so*") + file(GLOB python_libs_dynload_release LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/lib-dynload/*.so*") + set(python_libs_dynload_failed_debug ${python_libs_dynload_debug}) + set(python_libs_dynload_failed_release ${python_libs_dynload_release}) + list(FILTER python_libs_dynload_failed_debug INCLUDE REGEX ".*_failed\.so.*") + list(FILTER python_libs_dynload_failed_release INCLUDE REGEX ".*_failed\.so.*") + if(python_libs_dynload_failed_debug OR python_libs_dynload_failed_release) + list(JOIN python_libs_dynload_failed_debug "\n" python_libs_dynload_failed_debug_str) + list(JOIN python_libs_dynload_failed_release "\n" python_libs_dynload_failed_release_str) + message(FATAL_ERROR "There should be no modules with \"_failed\" suffix:\n${python_libs_dynload_failed_debug_str}\n${python_libs_dynload_failed_release_str}") + endif() + if(NOT VCPKG_BUILD_TYPE) + list(LENGTH python_libs_dynload_release python_libs_dynload_release_length) + list(LENGTH python_libs_dynload_debug python_libs_dynload_debug_length) + if(NOT python_libs_dynload_release_length STREQUAL python_libs_dynload_debug_length) + message(FATAL_ERROR "Mismatched number of modules: ${python_libs_dynload_debug_length} in debug, ${python_libs_dynload_release_length} in release") + endif() + endif() endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +if(VCPKG_TARGET_IS_WINDOWS) + if(PYTHON_ALLOW_EXTENSIONS) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.win" usage_extra) + else() + set(usage_extra "") + endif() +else() + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage.unix" usage_extra) +endif() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}\n${usage_extra}") function(_generate_finder) cmake_parse_arguments(PythonFinder "NO_OVERRIDE" "DIRECTORY;PREFIX" "" ${ARGN}) diff --git a/external_imported/vcpkg/ports/python3/usage.unix b/external_imported/vcpkg/ports/python3/usage.unix new file mode 100644 index 000000000..614292c2f --- /dev/null +++ b/external_imported/vcpkg/ports/python3/usage.unix @@ -0,0 +1,9 @@ +The package python3 provides a python interpreter that supports virtual environments: + + $ tools/python3/python3.10 -m venv /path/to/venv + $ export VIRTUAL_ENV=/path/to/venv + $ export PATH=/path/to/venv/bin:$PATH + $ export -n PYTHONHOME + $ unset PYTHONHOME + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/external_imported/vcpkg/ports/python3/usage.win b/external_imported/vcpkg/ports/python3/usage.win new file mode 100644 index 000000000..3fcc343ed --- /dev/null +++ b/external_imported/vcpkg/ports/python3/usage.win @@ -0,0 +1,8 @@ +The package python3 provides a python interpreter that supports virtual environments: + + >tools\python3\python3.10 -m venv c:\path\to\venv + >set VIRTUAL_ENV=c:\path\to\venv + >set PATH=c:\path\to\venv\bin;%PATH% + >set PYTHONHOME= + + See https://docs.python.org/3/library/venv.html for more details. diff --git a/external_imported/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake index 83c3fbd1c..1e13659b2 100644 --- a/external_imported/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/python3/vcpkg-cmake-wrapper.cmake @@ -89,6 +89,9 @@ if(_PythonFinder_WantLibs) find_dependency(Intl) if(TARGET @PythonFinder_PREFIX@::Python) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Python INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv @@ -99,6 +102,9 @@ if(_PythonFinder_WantLibs) endif() if(TARGET @PythonFinder_PREFIX@::Module) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Module INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv diff --git a/external_imported/vcpkg/ports/python3/vcpkg.json b/external_imported/vcpkg/ports/python3/vcpkg.json index 1a2ec9110..a6ff45067 100644 --- a/external_imported/vcpkg/ports/python3/vcpkg.json +++ b/external_imported/vcpkg/ports/python3/vcpkg.json @@ -1,11 +1,11 @@ { "name": "python3", - "version": "3.10.2", - "port-version": 1, + "version": "3.10.5", + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", - "supports": "!uwp", + "supports": "!uwp & !mingw", "dependencies": [ { "name": "bzip2", @@ -28,6 +28,10 @@ "name": "liblzma", "platform": "!(windows & static)" }, + { + "name": "libuuid", + "platform": "!osx & !windows" + }, { "name": "openssl", "platform": "!(windows & static)" diff --git a/external_imported/vcpkg/ports/qca/portfile.cmake b/external_imported/vcpkg/ports/qca/portfile.cmake index 54c137540..309d83b1d 100644 --- a/external_imported/vcpkg/ports/qca/portfile.cmake +++ b/external_imported/vcpkg/ports/qca/portfile.cmake @@ -45,9 +45,9 @@ vcpkg_execute_required_process( message(STATUS "Importing certstore done") if("botan" IN_LIST FEATURES) - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="yes") + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=yes) else() - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="no") + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=no) endif() # Configure and build diff --git a/external_imported/vcpkg/ports/qca/vcpkg.json b/external_imported/vcpkg/ports/qca/vcpkg.json index 723256ab9..417d002be 100644 --- a/external_imported/vcpkg/ports/qca/vcpkg.json +++ b/external_imported/vcpkg/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.4", - "port-version": 2, + "port-version": 3, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://cgit.kde.org/qca.git/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/qnnpack/fix-arm64-osx.patch b/external_imported/vcpkg/ports/qnnpack/fix-arm64-osx.patch new file mode 100644 index 000000000..2b13997e8 --- /dev/null +++ b/external_imported/vcpkg/ports/qnnpack/fix-arm64-osx.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,12 +32,15 @@ + IF(NOT IOS_ARCH MATCHES "^(i386|x86_64|armv7.*|arm64.*)$") + MESSAGE(FATAL_ERROR "Unrecognized IOS_ARCH = ${IOS_ARCH}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not defined") + ENDIF() ++ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ # on macOS, arm64 is called arm64 ++ SET(CMAKE_SYSTEM_PROCESSOR "aarch64") + ELSEIF(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(i[3-6]86|x86_64|armv[5-8].*|aarch64)$") + MESSAGE(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") + ENDIF() + + IF(NOT CMAKE_SYSTEM_NAME) + MESSAGE(FATAL_ERROR "CMAKE_SYSTEM_NAME not defined") diff --git a/external_imported/vcpkg/ports/qnnpack/portfile.cmake b/external_imported/vcpkg/ports/qnnpack/portfile.cmake index 673307bc4..157d47ec7 100644 --- a/external_imported/vcpkg/ports/qnnpack/portfile.cmake +++ b/external_imported/vcpkg/ports/qnnpack/portfile.cmake @@ -6,17 +6,18 @@ vcpkg_from_github( HEAD_REF master PATCHES use-packages.patch + fix-arm64-osx.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DQNNPACK_BUILD_TESTS=OFF -DQNNPACK_BUILD_BENCHMARKS=OFF ) vcpkg_cmake_install() -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/bin +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/bin" ) diff --git a/external_imported/vcpkg/ports/qnnpack/vcpkg.json b/external_imported/vcpkg/ports/qnnpack/vcpkg.json index ea8b98f7a..a22b2306e 100644 --- a/external_imported/vcpkg/ports/qnnpack/vcpkg.json +++ b/external_imported/vcpkg/ports/qnnpack/vcpkg.json @@ -1,11 +1,11 @@ { "name": "qnnpack", "version-date": "2021-02-26", - "port-version": 2, + "port-version": 3, "description": "Quantized Neural Network PACKage - mobile-optimized implementation of quantized neural network operators", "homepage": "https://github.com/pytorch/QNNPACK", "license": "BSD-3-Clause", - "supports": "linux | osx", + "supports": "!windows", "dependencies": [ "cpuinfo", "fp16", diff --git a/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch b/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch new file mode 100644 index 000000000..6828a3015 --- /dev/null +++ b/external_imported/vcpkg/ports/qpid-proton/fix-dependencies.patch @@ -0,0 +1,116 @@ +diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt +index 27b40e7..a3a5d38 100644 +--- a/c/CMakeLists.txt ++++ b/c/CMakeLists.txt +@@ -377,11 +377,15 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK)) + endif() + + if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK)) +- find_package(Libuv) ++ find_package(Libuv NAMES libuv CONFIG) + if (Libuv_FOUND) + set (PROACTOR_OK libuv) + set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common}) +- set (PROACTOR_LIBS Libuv::Libuv) ++ if (TARGET uv) ++ set (PROACTOR_LIBS uv) ++ else() ++ set (PROACTOR_LIBS uv_a) ++ endif() + endif() + endif() + +@@ -727,11 +731,6 @@ install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake + DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) +-install (FILES +- ../tools/cmake/Modules/FindCyrusSASL.cmake +- ../tools/cmake/Modules/FindOpenSSL.cmake +- ../tools/cmake/Modules/FindThreads.cmake +- DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) + + if (ENABLE_BENCHMARKS) + add_subdirectory(benchmarks) +diff --git a/c/src/ProtonConfig.cmake.in b/c/src/ProtonConfig.cmake.in +index 6bcc3c0..2f03dc4 100644 +--- a/c/src/ProtonConfig.cmake.in ++++ b/c/src/ProtonConfig.cmake.in +@@ -23,7 +23,8 @@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT Proton_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake") +@@ -32,24 +33,21 @@ endif() + set(Proton_VERSION @PN_VERSION@) + + # find dependencies, because static libs don't transitively pull them +-if (Proton_USE_STATIC_LIBS) +- set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) +- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") ++if (1) + + set(CyrusSASL_FOUND @CyrusSASL_FOUND@) + if (CyrusSASL_FOUND) +- find_package (CyrusSASL REQUIRED) ++ find_dependency (CyrusSASL) + endif() + + set(OPENSSL_FOUND @OPENSSL_FOUND@) + set(OpenSSL_FOUND @OpenSSL_FOUND@) + if (OPENSSL_FOUND OR OpenSSL_FOUND) +- find_package (OpenSSL REQUIRED) ++ find_dependency (OpenSSL) + endif() + +- find_package (Threads REQUIRED) ++ find_dependency (Threads) + +- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) + endif() + + set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 03fe80a..89c14ed 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -26,12 +26,15 @@ find_package(Threads) + include(versions.cmake) + + # Check for JSON-CPP support for connection configuration +-find_package(JsonCpp) +-option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND}) ++option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF) + if (ENABLE_JSONCPP) +- include_directories(${JsonCpp_INCLUDE_DIRS}) ++ find_package(jsoncpp CONFIG REQUIRED) + set(CONNECT_CONFIG_SRC src/connect_config.cpp) +- set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY}) ++ if (TARGET jsoncpp_lib) ++ set(CONNECT_CONFIG_LIBS jsoncpp_lib) ++ elseif (TARGET jsoncpp_static) ++ set(CONNECT_CONFIG_LIBS jsoncpp_static) ++ endif() + else() + set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp) + endif() +diff --git a/cpp/ProtonCppConfig.cmake.in b/cpp/ProtonCppConfig.cmake.in +index 74ddfaa..2fece73 100644 +--- a/cpp/ProtonCppConfig.cmake.in ++++ b/cpp/ProtonCppConfig.cmake.in +@@ -23,7 +23,9 @@ + # URL: http://qpid.apache.org/proton/ + + @PACKAGE_INIT@ +-if (NOT ProtonCpp_USE_STATIC_LIBS) ++include(CMakeFindDependencyMacro) ++find_dependency(Proton CONFIG) ++if (1) + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargets.cmake") + else() + include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargetsStatic.cmake") diff --git a/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch b/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch deleted file mode 100644 index bf33ee53d..000000000 --- a/external_imported/vcpkg/ports/qpid-proton/fix-openssl3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d75dfdb6..7089c406 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,7 +177,7 @@ if (CMAKE_COMPILER_IS_GNUCC) - endif (ENABLE_WARNING_ERROR) - set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors") - set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}") -- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") -+ set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") - - if (ENABLE_UNDEFINED_ERROR) - set (CATCH_UNDEFINED "-Wl,--no-undefined") -@@ -202,7 +202,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") - endif (ENABLE_WARNING_ERROR) - # TODO aconway 2016-01-06: we should be able to clean up the code and turn on - # some of these warnings. -- set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") -+ set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") - endif() - - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/external_imported/vcpkg/ports/qpid-proton/portfile.cmake b/external_imported/vcpkg/ports/qpid-proton/portfile.cmake index 4df813a93..686c1c089 100644 --- a/external_imported/vcpkg/ports/qpid-proton/portfile.cmake +++ b/external_imported/vcpkg/ports/qpid-proton/portfile.cmake @@ -1,54 +1,66 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_find_acquire_program(PYTHON3) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF dc244b1f7e886883a2bb416407f42ba55d0f5f42 # 0.32.0 - SHA512 19f191dd206fd43a8f5b8db95f6ada57bd60b93eb907cf32f463c23cfe8c5f4914c6f4750ebde50c970387fb62baf4451279803eeb000bc8bb5c200692e5d1d7 + REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0 + SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 HEAD_REF next - PATCHES - fix-openssl3.patch + PATCHES fix-dependencies.patch ) +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindPython.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindOpenSSL.cmake") +file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindJsonCpp.cmake") + +vcpkg_find_acquire_program(PYTHON3) + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - -DLIB_SUFFIX= -DBUILD_GO=no - -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON + -DENABLE_JSONCPP=ON + -DENABLE_LINKTIME_OPTIMIZATION=OFF + -DLIB_SUFFIX= + -DENABLE_WARNING_ERROR=OFF + -DENABLE_BENCHMARKS=OFF + -DENABLE_FUZZ_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF + -DCMAKE_INSTALL_RPATH=${rpath} + -DPython_EXECUTABLE=${PYTHON3} ) vcpkg_cmake_install() +# qpid-proton installs tests into share/proton; this is not desireable +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") + vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) -set(configFiles - "${CURRENT_PACKAGES_DIR}/share/${PORT}/Proton/ProtonConfig.cmake" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/ProtonCpp/ProtonCppConfig.cmake" +vcpkg_cmake_config_fixup( + PACKAGE_NAME Proton + CONFIG_PATH lib/cmake/Proton + DO_NOT_DELETE_PARENT_CONFIG_PATH +) +vcpkg_cmake_config_fixup( + PACKAGE_NAME ProtonCpp + CONFIG_PATH lib/cmake/ProtonCpp ) -foreach(configFile IN LISTS configFiles) - vcpkg_replace_string("${configFile}" - "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/lib" - "IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/debug/lib" - ) - vcpkg_replace_string("${configFile}" - "debug \${_IMPORT_PREFIX}/lib" - "debug \${_IMPORT_PREFIX}/debug/lib" - ) -endforeach() vcpkg_fixup_pkgconfig() -configure_file(${CMAKE_CURRENT_LIST_DIR}/qpid-protonConfig.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/qpid-protonConfig.cmake COPYONLY) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake b/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake deleted file mode 100644 index 3ad039bd6..000000000 --- a/external_imported/vcpkg/ports/qpid-proton/qpid-protonConfig.cmake +++ /dev/null @@ -1,4 +0,0 @@ -get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) -set(_IMPORT_PREFIX "${PACKAGE_PREFIX_DIR}") -include(${CMAKE_CURRENT_LIST_DIR}/Proton/ProtonConfig.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/ProtonCpp/ProtonCppConfig.cmake) diff --git a/external_imported/vcpkg/ports/qpid-proton/vcpkg.json b/external_imported/vcpkg/ports/qpid-proton/vcpkg.json index 3dd0dcff0..1de560fe8 100644 --- a/external_imported/vcpkg/ports/qpid-proton/vcpkg.json +++ b/external_imported/vcpkg/ports/qpid-proton/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qpid-proton", - "version": "0.32.0", - "port-version": 4, + "version": "0.37.0", + "port-version": 3, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", + "license": "Apache-2.0", "dependencies": [ "jsoncpp", { @@ -12,7 +13,7 @@ }, { "name": "openssl", - "platform": "!windows & !uwp" + "platform": "!windows" }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch b/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch index 3ee543de4..106ba1c8e 100644 --- a/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch +++ b/external_imported/vcpkg/ports/qt-advanced-docking-system/config_changes.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bd721d..4848c5f 100644 +index 49cd799..6535465 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ if (UNIX) +@@ -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() diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/hardcode_version.patch b/external_imported/vcpkg/ports/qt-advanced-docking-system/hardcode_version.patch deleted file mode 100644 index f5fc9caf8..000000000 --- a/external_imported/vcpkg/ports/qt-advanced-docking-system/hardcode_version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94fdb8d..6febea2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,11 +1,6 @@ - cmake_minimum_required(VERSION 3.5) - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) --include(GetGitRevisionDescription) --git_describe(GitTagVersion --tags) --string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}") --string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}") --string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}") --set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+ - project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) - option(BUILD_STATIC "Build the static library" OFF) - option(BUILD_EXAMPLES "Build the examples" ON) diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake b/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake index 668661cdb..a369b9a80 100644 --- a/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake +++ b/external_imported/vcpkg/ports/qt-advanced-docking-system/portfile.cmake @@ -1,26 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF ab4869a0e1c97fec1dfca29eeb84be67af182864 #v3.8.0 - SHA512 220ec4604eda8a39cd7ba8839cee2ab420e8c5a0b247749afb85a7b4ec3286f6debd53c910637e84023af79319f0600eb48a6c037c3e4877708677fee3c62ce7 + REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 #v3.8.2 + SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 HEAD_REF master PATCHES - hardcode_version.patch config_changes.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF - -DVERSION_SHORT=3.8.0 + -DADS_VERSION=3.8.2 ) vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_cmake_config_fixup(PACKAGE_NAME qtadvanceddocking CONFIG_PATH lib/cmake/qtadvanceddocking) + +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) diff --git a/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json b/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json index 75500cea7..f81487809 100644 --- a/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json +++ b/external_imported/vcpkg/ports/qt-advanced-docking-system/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt-advanced-docking-system", - "version": "3.8.0", + "version": "3.8.2", "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", "dependencies": [ "bzip2", { diff --git a/external_imported/vcpkg/ports/qt/vcpkg.json b/external_imported/vcpkg/ports/qt/vcpkg.json index 4e51339de..4cb2373d6 100644 --- a/external_imported/vcpkg/ports/qt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake index 5e37676c5..95815d671 100644 --- a/external_imported/vcpkg/ports/qt5-3d/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-3d/portfile.cmake @@ -28,13 +28,10 @@ find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_REL NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_DBG NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_REL NAMES polyclipping PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_DBG NAMES polyclipping polyclippingd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# poly2tri find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(BZ2_REL) @@ -50,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX) else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() -set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${POLYCLIPPING_REL} ${POLY2TRI_REL} ${IRRLICHT_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") -set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${POLYCLIPPING_DBG} ${POLY2TRI_DBG} ${IRRLICHT_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") +set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") +set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json index 282d07e0e..ed1c89976 100644 --- a/external_imported/vcpkg/ports/qt5-3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json index 8935f1e5e..9d4879fbb 100644 --- a/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", diff --git a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json index 15e043cd5..4c785713e 100644 --- a/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/configure_qt.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/configure_qt.cmake index ff2c8bc32..32aa35220 100644 --- a/external_imported/vcpkg/ports/qt5-base/cmake/configure_qt.cmake +++ b/external_imported/vcpkg/ports/qt5-base/cmake/configure_qt.cmake @@ -29,6 +29,46 @@ function(configure_qt) #Cleanup previous build folders file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_cmake_get_vars(detected_file) + include("${detected_file}") + function(qmake_append_program var qmake_var value) + get_filename_component(prog "${value}" NAME) + # QMake assumes everything is on PATH? + vcpkg_list(APPEND ${var} "${qmake_var}=${prog}") + find_program(${qmake_var} NAMES "${prog}") + cmake_path(COMPARE "${${qmake_var}}" EQUAL "${value}" correct_prog_on_path) + if(NOT correct_prog_on_path AND NOT "${value}" MATCHES "|:") + message(FATAL_ERROR "Detect path mismatch for '${qmake_var}'. '${value}' is not the same as '${${qmake_var}}'. Please correct your PATH!") + endif() + unset(${qmake_var}) + unset(${qmake_var} CACHE) + set(${var} "${${var}}" PARENT_SCOPE) + endfunction() + # Setup Build tools + set(qmake_build_tools "") + qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_AR" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_RANLIB" "${VCPKG_DETECTED_CMAKE_RANLIB}") + qmake_append_program(qmake_build_tools "QMAKE_STRIP" "${VCPKG_DETECTED_CMAKE_STRIP}") + qmake_append_program(qmake_build_tools "QMAKE_NM" "${VCPKG_DETECTED_CMAKE_NM}") + qmake_append_program(qmake_build_tools "QMAKE_RC" "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_MT" "${VCPKG_DETECTED_CMAKE_MT}") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_DETECTED_CMAKE_AR MATCHES "ar$") + # This is the reason why users should probably use a + # customized qt.conf with more domain knowledge. + vcpkg_list(APPEND qmake_build_tools "QMAKE_AR+=qc") + endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + qmake_append_program(qmake_build_tools "QMAKE_LIB" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_LINKER}") + else() + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_SHLIB" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C_SHLIB" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + endif() + #Find and ad Perl to PATH vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) @@ -39,7 +79,7 @@ function(configure_qt) else() #list(APPEND _csc_OPTIONS_DEBUG -separate-debug-info) endif() - + if(VCPKG_TARGET_IS_WINDOWS AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") list(APPEND _csc_OPTIONS -static-runtime) endif() @@ -69,7 +109,7 @@ function(configure_qt) set(ENV{PKG_CONFIG} "${PKGCONFIG}") get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") - + foreach(_buildname ${BUILDTYPES}) set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") @@ -86,6 +126,25 @@ function(configure_qt) message(STATUS "Configuring ${_build_triplet}") set(_build_dir "${CURRENT_BUILDTREES_DIR}/${_build_triplet}") file(MAKE_DIRECTORY ${_build_dir}) + + set(qmake_comp_flags "") + # Note sure about these. VCPKG_QMAKE_OPTIONS offers a way to opt out of these. (earlier values being overwritten by later values; = set +=append *=append unique -=remove) + macro(qmake_add_flags qmake_var operation flags) + string(STRIP "${flags}" striped_flags) + if(striped_flags) + vcpkg_list(APPEND qmake_comp_flags "${qmake_var}${operation}${striped_flags}") + endif() + endmacro() + + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_COMBINED_RC_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_CFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_C_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_CXXFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_CXX_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_COMBINED_MODULE_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LIBFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${_buildname}}") + # These paths get hardcoded into qmake. So point them into the CURRENT_INSTALLED_DIR instead of CURRENT_PACKAGES_DIR # makefiles will be fixed to install into CURRENT_PACKAGES_DIR in install_qt set(BUILD_OPTIONS ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildname}} @@ -113,19 +172,19 @@ function(configure_qt) -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/manual-link -platform ${_csc_TARGET_PLATFORM} ) - + if(DEFINED _csc_HOST_TOOLS_ROOT) #use qmake if(WIN32) set(INVOKE_OPTIONS "QMAKE_CXX.QMAKE_MSC_VER=1911" "QMAKE_MSC_VER=1911") endif() vcpkg_execute_required_process( - COMMAND ${INVOKE} "${_csc_SOURCE_PATH}" "${INVOKE_OPTIONS}" -- ${BUILD_OPTIONS} + COMMAND ${INVOKE} "${_csc_SOURCE_PATH}" "${INVOKE_OPTIONS}" -- ${BUILD_OPTIONS} ${qmake_build_tools} ${qmake_comp_flags} WORKING_DIRECTORY ${_build_dir} LOGNAME config-${_build_triplet} ) else()# call configure (builds qmake for triplet and calls it like above) vcpkg_execute_required_process( - COMMAND "${INVOKE}" ${BUILD_OPTIONS} + COMMAND "${INVOKE}" ${BUILD_OPTIONS} ${qmake_build_tools} ${qmake_comp_flags} WORKING_DIRECTORY ${_build_dir} LOGNAME config-${_build_triplet} ) @@ -145,7 +204,7 @@ function(configure_qt) string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents}) string(REPLACE "Sysroot=\n" "" _contents ${_contents}) string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents}) - file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") - endforeach() + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") + endforeach() endfunction() diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake index e2e390cec..24e6385cf 100644 --- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -1,8 +1,5 @@ function(qt_build_submodule SOURCE_PATH) - # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings - set(ENV{_CL_} "/utf-8") - if(NOT PORT STREQUAL "qt5-webengine") vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake index 921f194a5..19f53f98b 100644 --- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake +++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_functions.cmake @@ -2,11 +2,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") #Basic setup include(qt_port_hashes) -if(QT_BUILD_LATEST) # only set in qt5-base - include(qt_port_hashes_latest) -elseif(NOT PORT STREQUAL "qt5-base") - include(qt_port_hashes_latest OPTIONAL) # will only be available for the other qt ports if qt5-base was build with latest -endif() #Fixup scripts include(qt_fix_makefile_install) include(qt_fix_cmake) diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake index c7d0cba8c..a7720ab80 100644 --- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,61 +1,60 @@ -#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 +# 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 3) +set(QT_PATCH_VER 6) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) -set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) -set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) -set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) -set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) -set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) -set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) -set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) -set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) -set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) -set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) -set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) -set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) -set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) -set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) -set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) -set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) -set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) -set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) -set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) -set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) -set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) -set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) -set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) -set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) -set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) -set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) -set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) -set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) -set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) -set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) -set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) -set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) -set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) -set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) -set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) -set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) -set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) -set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) -set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) - +set(QT_HASH_qt5-3d 33fe30bd08d352b1e80fa62b344bfb3d69b1d3220a65ffbdb0b92fd4aa134ad7f923bc827753bb8f6c42f51ea1ef723acb8655b19b0b42f9bb450dda42937527) +set(QT_HASH_qt5-activeqt 95f701bed16f7d5c6152a95dd725e7143538ec6e08af54715aba4f45d364dfbfa2f2b2599132fa5d979a509dc4378404867ca0bb068a6a23d90c4041ced427f6) +set(QT_HASH_qt5-androidextras b818c5894134812eed976a6b8b5b5aa94bdd8baaeda90820dacf85af9d2093ce9619c8990436afb5ce261e7b6f45c4ccbbd38b2473bf2bde851338cd299f5d05) +set(QT_HASH_qt5-base 4fc6973b9250cd78c4797ed9bb58bec949243cc5e8c3a546b5fbe8c6e6480d5e0745d273fac812f9f5f1fcd675cd8b867d47f57563bf6d23118b58032550103f) +set(QT_HASH_qt5-charts b3f3594a1fd648a6afd459c8165d74690902240ef826a8bd87245ea49464aabcf5c0d4094ce1035de1d40e7e49d95dc381db37f8f4c4735265cb60241666715e) +set(QT_HASH_qt5-connectivity 8d6b634b46aca9a54a391cad9be056d5bac70401dc4d94426fb7a6038c12608ba2cb94cdafe3e8786d2f0a00aa7e60dc92fcca7ef09d136e1bd9763e2868d20a) +set(QT_HASH_qt5-datavis3d 921f2d050b6b61824e308f9d8dd095da002914b28568403214ed727055eb9fdd43d8b71190bf0b1dc82df4333d6d65b2d5ac61f3646f711c693dec2a46967a96) +set(QT_HASH_qt5-declarative a4824b6ec2de5e78819b726850767db6d4280208d6cc985219f4c33b6b0dcd6194557f32b577df97b0596d157190aa9c00e99bf6879554936a356fa7afe8a7d5) +set(QT_HASH_qt5-doc 9f510d2bfa4174b66547b5ab3bfd08c2b04a2267f926066a006058b97de6722d5c15b147ffda9f726f4c634639df7e29452b2a91820e08d235c7a58cbb39102e) +set(QT_HASH_qt5-gamepad 6faa59ea92d8046e6b377fd18f7049dbe4b230ab591f0513c2de974df723a77b0845339cf7d7507bb4415f005d21754dd8dc35a1082c7b86f63a0a5fdbdb8126) +set(QT_HASH_qt5-graphicaleffects 2de1f6a0a980949d02baaaa7576e628faf34bea10fa7e11e9ad7da5ae0511449f8edf98558f77ecf7727d26f0d2f13c5389f73d128cceef71cdef6788050d689) +set(QT_HASH_qt5-imageformats a1b86db145d73933295b355156b401177e2c61e39beb6114ce9e7cfef693697e019c1a1299e18153542d7c229fa95e1b122812d2058ad66da28b78e521da9d30) +set(QT_HASH_qt5-location 25ea53bfc5dd8569931eaa5bba7e0021377f747d0304d1320cbfa5a87d052fbee86330d23dc0516be618cd6380216212a0b2e981a2ce4e1b6cb571995d3b0684) +set(QT_HASH_qt5-macextras 679f752dfa53a4fbfd9e950407da7d1f2ce505e4bf58083a99812d339cc1163c5be5b0ace4a81fee7a58a8a9322fbf8d04ac5835dcfcf1570396dc01ffb25cdc) +set(QT_HASH_qt5-mqtt ef4891cff6388f515e70a3d1eea05b5ac0251e0fa2e258b91b3d03e9a565438153068b0949870348acbb0e781dd85b2ef649a6833af2a68bdcf2d4c472ffb172) +set(QT_HASH_qt5-multimedia abf07c26e4aba1442c506e06d91cb584c4a3d04c8e572b7d3aaa5a2341cd5609af2604e352557bda9f6bbe015793d24c43b1d580f60568cd1051515f541e342d) +set(QT_HASH_qt5-networkauth 04d5f07f5076dbd8e5bd435e7e91605819574dcab16217e9b49e60b3932db09d9c0f8088cd705fba5da7eddf98df1a61f2fcf7640f942ba6ee87576994268445) +set(QT_HASH_qt5-purchasing 39325482c97fd5ec0cfcf6bde14e0bedfd7b61902493d15916644010802220b5188b130a6cd011b906c8da9f4993a62be579f94df659f9eddde3fd97e9897afe) +set(QT_HASH_qt5-quickcontrols 43aa77ee50f95c8546abea2cd307cdcc3810cc20c8a373e7941675d62702bf8294078cf5cec89d8d26dd9eec5c025b712db1bdc1b1acb264f38368f0662e9829) +set(QT_HASH_qt5-quickcontrols2 5de1ae719c394a315dc019bdaa876b6b735ca5eed4455b6c4da5e2150c0bc85a6c691ad9124b76e26704aaf799b6067d47fe48d98926ea000407d163441d4114) +set(QT_HASH_qt5-remoteobjects 7cad6d7b03267a566044ae97ef23bcf66fa6ae7da7b4e6fc3c8e5082518ae1ec9ab00ceb935ced857696fafc5d3346df3f2b083793f2f520bb146fdbf6c54242) +set(QT_HASH_qt5-script 1ea055d5ee8a80ac1919fe1e0e59e011654ccf5e1392f49933b104c8ff390755b3677c34981c168a8e492600d0243fd2d8f3c0f87bf44a61a55c763149a1ccc8) +set(QT_HASH_qt5-scxml 6ba6edcb69dc43be58a150cfa21537251c6944051a9d01ec68272f91ce64399ad5a9c37dd0cccc8903dd76de0e04369d79e38bbe96ec55bdc9f970ede137b3e3) +set(QT_HASH_qt5-sensors 1937e7fc466bf0ad679fa1ec9f876015791d42a9a89f17449a2585451c5b3fc13c523930416da535c88babc016f52d35537d837a62cdb4e1de1c7d81a5d0e511) +set(QT_HASH_qt5-serialbus b972d312be8bc822282fff48c20d2330edf14aa5e7ebd6b5b9a03b61b21fc637ad4d969d55e35b145a7bddc967a9e9dda17e2df14df3ab0151d08898468c1230) +set(QT_HASH_qt5-serialport 8161b4aba2c7410b878482035b5bc141083953dcaf466361ff3d30b6e397ab78e84f698dcbc14f4218e2c175efcb8c9ee494f75d6099a1215b5be6a378c8a322) +set(QT_HASH_qt5-speech e20e3d59804bc6ee8ce65cd10e61aabc3771ebd7d20c853b8c6358b08bfbe0796905b50efcdc755857388bcb8528d18ec2bd8e5840bd2500f5f5ee5e043ea47d) +set(QT_HASH_qt5-svg 8e6e35a098baaae03043c1c177c2e93bc6c8bec1094b3becd797cddc1b62d24f51956b84a4e6bbe0565069f862243a791285232f78d4a0c2281344308071ef17) +set(QT_HASH_qt5-tools 8539930c3facb4a2b43ce7f76f461181489952d79c4d9e11c8acf6b342c3466f5868adcef1a1bfdfa9c142217c0e43853c3297fc0701030c63d0b349e0767297) +set(QT_HASH_qt5-translations 36baebb9a5b34d9965d087b5f0a509a8a83086db61eed54a9cad63f4a548d32c4809007b2f6dad7c983fa0cbaf5fe7ab016ec244546feb824cdd2c78347aee16) +set(QT_HASH_qt5-virtualkeyboard e0aed691a381067c9a5d7f76bdafc15c6df4b5f04f86b09f0dc6d4fced4181dcc676792efd2718bc530d3c50759b0d2666261a9cf6bc522ff75907e2bb717de6) +set(QT_HASH_qt5-wayland 824cb4dfd2bd9d858f38430332a359cf6cd2b256c91b0bafcbe49c8847cb41a7ced79ef8abd5469170837525639df26fcbcdfb49ffefc4fc4cde0830d9afe98c) +set(QT_HASH_qt5-webchannel 8c82f040f9aa5cb5c8a927fc770123bbc5dfffd4d6ab243da86a53eb2aee1ab9b7f14d8f7e9b2dbd42728f203158d1ad46b488c6221e589777fed150b2e467d7) +set(QT_HASH_qt5-webengine 775d44612a81314c914bf03e8d368d6426516cdd9ce15e50513b346a85f94da603a5c65343d3ed6aecd442ac38a2273f38deae161916cd0c008e473b2606962b) +set(QT_HASH_qt5-webglplugin 665dcd971f1995567f4a8f2ca8ed4201f2aa0829e091c30e5e5420a99c76ef5882429197fb852f2d4a3fbb62cae0e072ab82233804b7f98aa342a179de5c1124) +set(QT_HASH_qt5-websockets b2ab319bfd9b0839ee2aa23d508b96a4e86e02a3cab1fec7a1282cfc018e5baf7aa5340d3749f237562f8f74e562e49cd31432e5bed8db781f158aaba914068b) +set(QT_HASH_qt5-webview bb6e70a95899cb129dc11d565587cfd9f5d0ca09b40357ab404d1f74e77d7cb3c420362c5cbb4b74fa864449c1d8cd3cef2b4b50caad242f1941378e877cee7a) +set(QT_HASH_qt5-winextras d2ff6b4b0831d78e44a7434ac43fd9174f08a904fdb3c076ef829379b06ea499c8962daaa450fa2c320224aad00c0aa567ab4d6f789de7a7ded952d159b3adc8) +set(QT_HASH_qt5-x11extras 6c651cdfd5c3420877e8d9e5a90119401f516beb42d814255520c8223b34dbaca40da23f8d8e218ce933a76fd415e62a2aa0334359594053ce6becaf08150cd6) +set(QT_HASH_qt5-xmlpatterns b4070f33d4b590af6dcb40decd4fdcc44f53897eacc7af65ac0e718b9e4c8f8ebbf6e5700ca4b293a6c0a41fc49c4f540b918749e8f3493f0a290e567dc2a95b) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qt5-base") - foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") + function(update_qt_version_in_manifest _port_name) + set(_current_control "${VCPKG_ROOT_DIR}/ports/${_port_name}/vcpkg.json") file(READ ${_current_control} _control_contents) #message(STATUS "Before: \n${_control_contents}") string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") @@ -63,6 +62,11 @@ if(QT_UPDATE_VERSION) #message(STATUS "After: \n${_control_contents}") file(WRITE ${_current_control} "${_control_contents}") configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) + endfunction() + + update_qt_version_in_manifest("qt5") + foreach(_current_qt_port_basename ${QT_PORT_LIST}) + update_qt_version_in_manifest("qt5-${_current_qt_port_basename}") endforeach() endif() endif() diff --git a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes_latest.cmake b/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes_latest.cmake deleted file mode 100644 index 61d8e0ac8..000000000 --- a/external_imported/vcpkg/ports/qt5-base/cmake/qt_port_hashes_latest.cmake +++ /dev/null @@ -1,67 +0,0 @@ -#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 3) -set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. - -set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth - purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets - webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) - -set(QT_HASH_qt5-base 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079) -set(QT_HASH_qt5-3d 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c) -set(QT_HASH_qt5-activeqt 5a5fc0a98c4928e6cd27105e47288fe62713c0097a0c4fc555b3607b24f22eb0b9e5546944c7c8e6279d2a241a2935f9b7c64a2e2b5c635f0f35061227fee37a) -set(QT_HASH_qt5-androidextras 45957b9afccf147dfe75c210e77e7b12cd3d1c34855052773a8ccce62020acd06e9e8f5b848f32f1fdbdb8fa614877909b9a1517530aad643b8954200ec030ca) -set(QT_HASH_qt5-charts 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48) -set(QT_HASH_qt5-connectivity 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534) -set(QT_HASH_qt5-datavis3d d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3) -set(QT_HASH_qt5-declarative c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597) -set(QT_HASH_qt5-doc bb23d6d65a7c39ed9119e0bf30810a94ad937cc3f9ab0004d0c3fda712a6fbe009fdef74f5fe1212bc68ad0851ada37592c11f6ef754b81eff2d9c453b3a995b) -set(QT_HASH_qt5-gamepad 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa) -set(QT_HASH_qt5-graphicaleffects 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98) -set(QT_HASH_qt5-imageformats f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e) -set(QT_HASH_qt5-location 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886) -set(QT_HASH_qt5-macextras 26ff64206d6b491271a2db8a6932b30fc8df6ff121ef272edca5e2ec61d98668e326102d529f9335eab98bb3e5e3261cb50db2b2f78f751226bb9d4aa84e499b) -set(QT_HASH_qt5-mqtt df91daf1accdf93d05bad33b9abb4a69f2b3fcd91f6dbcd71d6c74c21b0f0b2aeabc83f64aa5c149321b1a700cde3d81a4cbfc8fad7cdd8b0d8c0cc073299f82) -set(QT_HASH_qt5-multimedia 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668) -set(QT_HASH_qt5-networkauth 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654) -set(QT_HASH_qt5-purchasing 33ce166c6f4e626fef4cc17e902a5117225fa87799687e6c0956898bf80e04df4f3fa447b466e43c9fac58e879a7c9fd0e8c18006e8aa69f0e8762b258c81674) -set(QT_HASH_qt5-quickcontrols 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e) -set(QT_HASH_qt5-quickcontrols2 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb) -set(QT_HASH_qt5-remoteobjects a20699353269dd1d61ea9a45191aa6c438d597783c7461ee41c1bbde0d6043f2be138dd0f46744c1a3081c4098e66e78543f0397eb18b72aab99808de7855bd9) -set(QT_HASH_qt5-script ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9) -set(QT_HASH_qt5-scxml 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1) -set(QT_HASH_qt5-sensors c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2) -set(QT_HASH_qt5-serialbus af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87) -set(QT_HASH_qt5-serialport 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a) -set(QT_HASH_qt5-speech 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a) -set(QT_HASH_qt5-svg 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527) -set(QT_HASH_qt5-tools 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47) -set(QT_HASH_qt5-translations d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc) -set(QT_HASH_qt5-virtualkeyboard f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2) -set(QT_HASH_qt5-webchannel 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415) -set(QT_HASH_qt5-webengine d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c) -set(QT_HASH_qt5-webglplugin 01860ca3ce27630ca1a92eb6deb933959a3679fb579d4cb8a06884f51a672c355f6929355aa6d45f4c5d8ac026b4cecdc7a26d5b2e897ca75bb7a9331e2d3e0d) -set(QT_HASH_qt5-websockets a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea) -set(QT_HASH_qt5-webview 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030) -set(QT_HASH_qt5-x11extras eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133) -set(QT_HASH_qt5-xmlpatterns 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4) -set(QT_HASH_qt5-wayland 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89) -set(QT_HASH_qt5-winextras d0707f865552645e82a493265b142171f14c126bd99325471b5d94593c95763d606be89fcc72f74f3192446e024c9be904c7d95816b2dd8e8cc7cf9f34a02f77) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qt5-base") - foreach(_current_qt_port ${QT_PORT_LIST}) - set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/vcpkg.json") - file(READ ${_current_control} _control_contents) - #message(STATUS "Before: \n${_control_contents}") - string(REGEX REPLACE "\"version.*\": \"[0-9]+\.[0-9]+\.[0-9]+\",\n" "\"version\": \"${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\n \"port-version\": [0-9]+," "" _control_contents "${_control_contents}") - #message(STATUS "After: \n${_control_contents}") - file(WRITE ${_current_control} "${_control_contents}") - configure_file("${_current_control}" "${_current_control}" @ONLY NEWLINE_STYLE LF) - endforeach() - endif() -endif() diff --git a/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch b/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch deleted file mode 100644 index 4fe495281..000000000 --- a/external_imported/vcpkg/ports/qt5-base/patches/limits_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -index 0eedfc1d20..f5f9bef7b8 100644 ---- a/src/corelib/text/qbytearraymatcher.h -+++ b/src/corelib/text/qbytearraymatcher.h -@@ -42,6 +42,8 @@ - - #include - -+#include -+ - QT_BEGIN_NAMESPACE - - diff --git a/external_imported/vcpkg/ports/qt5-base/portfile.cmake b/external_imported/vcpkg/ports/qt5-base/portfile.cmake index 80c5996e5..4ce376a6f 100644 --- a/external_imported/vcpkg/ports/qt5-base/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-base/portfile.cmake @@ -1,12 +1,5 @@ vcpkg_buildpath_length_warning(37) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(QT_OPENSSL_LINK_DEFAULT ON) -else() - set(QT_OPENSSL_LINK_DEFAULT OFF) -endif() -option(QT_OPENSSL_LINK "Link against OpenSSL at compile-time." ${QT_OPENSSL_LINK_DEFAULT}) - 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 @@ -21,21 +14,6 @@ endif() list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) -if("latest" IN_LIST FEATURES) # latest = core currently - set(QT_BUILD_LATEST ON) - set(PATCHES - patches/Qt5BasicConfig.patch - patches/Qt5PluginTarget.patch - patches/create_cmake.patch - ) -else() - set(PATCHES - patches/Qt5BasicConfig.patch - patches/Qt5PluginTarget.patch - patches/create_cmake.patch - ) -endif() - set(WITH_PGSQL_PLUGIN OFF) if("postgresqlplugin" IN_LIST FEATURES) set(WITH_PGSQL_PLUGIN ON) @@ -84,10 +62,11 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. - #CMake fixes - ${PATCHES} - patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt - patches/limits_include.patch # Add missing includes to build with gcc 11 + # CMake fixes + patches/Qt5BasicConfig.patch + patches/Qt5PluginTarget.patch + patches/create_cmake.patch + patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt ) # Remove vendored dependencies to ensure they are not picked up by the build @@ -101,9 +80,6 @@ endforeach() ######################### ## Setup Configure options -# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings -set(ENV{_CL_} "/utf-8") - set(CORE_OPTIONS -confirm-license -opensource @@ -129,12 +105,9 @@ list(APPEND CORE_OPTIONS -icu -no-angle # Qt does not need to build angle. VCPKG will build angle! -no-glib + -openssl-linked ) -if(QT_OPENSSL_LINK) - list(APPEND CORE_OPTIONS -openssl-linked) -endif() - if(WITH_PGSQL_PLUGIN) list(APPEND CORE_OPTIONS -sql-psql) else() @@ -279,8 +252,8 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif() if (WITH_MYSQL_PLUGIN) - list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE}") - list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG}") + list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") + list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib") endif(WITH_MYSQL_PLUGIN) elseif(VCPKG_TARGET_IS_LINUX) @@ -494,14 +467,6 @@ if(VCPKG_TARGET_IS_LINUX) file(WRITE "${_file}" "${_contents}") endif() -if(QT_BUILD_LATEST) - file(COPY - ${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_hashes_latest.cmake - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/qt5 - ) -endif() - vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_OSX) diff --git a/external_imported/vcpkg/ports/qt5-base/qtdeploy.ps1 b/external_imported/vcpkg/ports/qt5-base/qtdeploy.ps1 index 4973cfc38..ff1747d69 100644 --- a/external_imported/vcpkg/ports/qt5-base/qtdeploy.ps1 +++ b/external_imported/vcpkg/ports/qt5-base/qtdeploy.ps1 @@ -44,15 +44,15 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str deployPlugins "styles" } elseif ($targetBinaryName -match "Qt5Networkd?.dll") { deployPlugins "bearer" - if (Test-Path "$binDir\libcrypto-1_1-x64.dll") + if (Test-Path "$binDir\libcrypto-*-x64.dll") { - deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1-x64.dll" - deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1-x64.dll" + deployBinary "$targetBinaryDir" "$binDir" "libcrypto-*-x64.dll" + deployBinary "$targetBinaryDir" "$binDir" "libssl-*-x64.dll" } - if (Test-Path "$binDir\libcrypto-1_1.dll") + if (Test-Path "$binDir\libcrypto-*.dll") { - deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1.dll" - deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1.dll" + deployBinary "$targetBinaryDir" "$binDir" "libcrypto-*.dll" + deployBinary "$targetBinaryDir" "$binDir" "libssl-*.dll" } } elseif ($targetBinaryName -match "Qt5Sqld?.dll") { deployPlugins "sqldrivers" diff --git a/external_imported/vcpkg/ports/qt5-base/vcpkg.json b/external_imported/vcpkg/ports/qt5-base/vcpkg.json index c4b5d854b..21902bc92 100644 --- a/external_imported/vcpkg/ports/qt5-base/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", - "version": "5.15.3", - "port-version": 2, + "version": "5.15.6", + "port-version": 1, "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, @@ -32,6 +32,10 @@ "default-features": false }, "sqlite3", + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, { "name": "vcpkg-pkgconfig-get-modules", "host": true @@ -41,7 +45,7 @@ ], "features": { "latest": { - "description": "Build latest qt version (5.15.2) instead of LTS (latest and LTS are currently the same)" + "description": "(deprecated)" }, "mysqlplugin": { "description": "Build the sql plugin for connecting to mysql databases", diff --git a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json index adbd87010..291edce5a 100644 --- a/external_imported/vcpkg/ports/qt5-charts/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json index 79a85b47a..3c0a98e0e 100644 --- a/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json index 1d551e375..2e0cb4bf9 100644 --- a/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-declarative/limits_include.patch b/external_imported/vcpkg/ports/qt5-declarative/limits_include.patch deleted file mode 100644 index b4580dd21..000000000 --- a/external_imported/vcpkg/ports/qt5-declarative/limits_include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2dfb893c130a9f9195805fcc81d7e5e242bc558d Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Wed, 11 Aug 2021 17:03:06 +0200 -Subject: [PATCH] Add missing limits include - ---- - src/qmldebug/qqmlprofilerevent_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -index a7e37d1964..01b2f58f16 100644 ---- a/src/qmldebug/qqmlprofilerevent_p.h -+++ b/src/qmldebug/qqmlprofilerevent_p.h -@@ -48,6 +48,7 @@ - #include - - #include -+#include - #include - - // --- -2.32.0 - diff --git a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake index 7432d0f28..b813567f9 100644 --- a/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-declarative/portfile.cmake @@ -1,6 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH PATCHES limits_include.patch) +qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH) if(NOT QT_UPDATE_VERSION) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/5.15.3/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "") endif() diff --git a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json index 2b0b4abcd..d64668c9a 100644 --- a/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json index a4f655ca1..6c6a43541 100644 --- a/external_imported/vcpkg/ports/qt5-doc/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json index a1de0a3dd..7a4db1bce 100644 --- a/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json index 8f6bc2d3f..eecd0e1e5 100644 --- a/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake index a3cd9f92a..4d99e45ac 100644 --- a/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-imageformats/portfile.cmake @@ -18,19 +18,24 @@ find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/de 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) -if(NOT VCPKG_TARGET_IS_OSX) + +if(NOT VCPKG_TARGET_IS_OSX AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(FREEGLUT_NEEDED ON) +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) endif() find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBP_DEBUG NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDEMUX_DEBUG NAMES webpdemuxd webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_RELEASE NAMES webpmux libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_DEBUG NAMES webpmuxd webpmux libwebpmuxd libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_RELEASE NAMES webpdecoder libwebpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd libwebpdecoderd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDEMUX_DEBUG NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_RELEASE NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_DEBUG NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_RELEASE NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_DEBUG NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) # Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) # which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked @@ -45,10 +50,16 @@ endif() set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}" "WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}" - "JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies + "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_DEBUG} ${LZMA_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}" "WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}" - "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") + "JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") + +if(FREEGLUT_NEEDED) + set(OPT_REL "${OPT_REL} ${FREEGLUT_RELEASE}") + set(OPT_DBG "${OPT_DBG} ${FREEGLUT_DEBUG}") +endif() + list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json index da6422d1e..7eb03cf21 100644 --- a/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-location/vcpkg.json b/external_imported/vcpkg/ports/qt5-location/vcpkg.json index fd0b1e891..c219c65c8 100644 --- a/external_imported/vcpkg/ports/qt5-location/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json index fd4552617..c2d32f402 100644 --- a/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json index 438929f9b..dd65b83ab 100644 --- a/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json index 6b2e45a2c..09f636f1f 100644 --- a/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json index 4ecdeb150..2de9ac085 100644 --- a/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json index f2e59ed21..5a5dc742d 100644 --- a/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json index 711c17785..72d274f55 100644 --- a/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json index a87e806c9..a8adf551f 100644 --- a/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json index 6b8738ff0..83246a766 100644 --- a/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.3", + "version": "5.15.6", "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/external_imported/vcpkg/ports/qt5-script/vcpkg.json b/external_imported/vcpkg/ports/qt5-script/vcpkg.json index 260a2c152..5d93bf461 100644 --- a/external_imported/vcpkg/ports/qt5-script/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json index 5c7c53072..e2f3e51e8 100644 --- a/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.3", + "version": "5.15.6", "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/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json index 1c7ef5d77..f696e7d8d 100644 --- a/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json index 9d0d3f388..0aa77711f 100644 --- a/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json index 5d9108573..640a21f3e 100644 --- a/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json index f9898c0f6..851346bbe 100644 --- a/external_imported/vcpkg/ports/qt5-speech/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json index f32761483..a25b6600f 100644 --- a/external_imported/vcpkg/ports/qt5-svg/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch b/external_imported/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch deleted file mode 100644 index 9d9d8bb39..000000000 --- a/external_imported/vcpkg/ports/qt5-tools/icudt-debug-suffix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp -index 4e480bb..e15f076 100644 ---- a/src/windeployqt/main.cpp -+++ b/src/windeployqt/main.cpp -@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options, - const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength()); - if (optVerboseLevel > 1) - std::wcout << "Adding ICU version " << icuVersion << '\n'; -- icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); -+ icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); - } - for (const QString &icuLib : qAsConst(icuLibs)) { - const QString icuPath = findInPath(icuLib); diff --git a/external_imported/vcpkg/ports/qt5-tools/portfile.cmake b/external_imported/vcpkg/ports/qt5-tools/portfile.cmake index c166ed7f5..ecc14c6e0 100644 --- a/external_imported/vcpkg/ports/qt5-tools/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-tools/portfile.cmake @@ -1,8 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES - icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 -) +qt_submodule_installation() if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") diff --git a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json index df212fc04..a9772603e 100644 --- a/external_imported/vcpkg/ports/qt5-tools/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json index cfc49dc2c..df8a1c3a5 100644 --- a/external_imported/vcpkg/ports/qt5-translations/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json index 07cd620af..96ac9c30b 100644 --- a/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json index 76eb17309..6049b0a23 100644 --- a/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json index 1ba421639..a927e053e 100644 --- a/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.3", + "version": "5.15.6", "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/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake index 080b21b3c..842b7ae46 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake +++ b/external_imported/vcpkg/ports/qt5-webengine/portfile.cmake @@ -2,12 +2,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) if(buildtrees_path_length GREATER 35 AND CMAKE_HOST_WIN32) vcpkg_buildpath_length_warning(35) - message(FATAL_ERROR "terminating due to source length.") + message(WARNING "The ${PORT} source was will be extracted to ${CURRENT_BUILDTREES_DIR} , which has more then 35 characters in length.") + message(FATAL_ERROR "terminating due to ${CURRENT_BUILDTREES_DIR} being too long.") endif() #set(VCPKG_BUILD_TYPE release) #You probably want to set this to reduce build type and space requirements message(STATUS "${PORT} requires a lot of free disk space (>100GB), ram (>8 GB) and time (>2h per configuration) to be successfully build.\n\ -- As such ${PORT} is currently experimental.\n\ --- If ${PORT} fails post build validation please open up an issue. \n\ +-- If ${PORT} fails post build validation please try manually reducing VCPKG_MAX_CONCURRENCY and open up an issue if it still cannot build. \n\ -- If it fails due to post validation the successfully installed files can be found in ${CURRENT_PACKAGES_DIR} \n\ -- and just need to be copied into ${CURRENT_INSTALLED_DIR}") if(NOT VCPKG_TARGET_IS_WINDOWS) @@ -20,11 +21,13 @@ vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(GPERF) vcpkg_find_acquire_program(PYTHON2) vcpkg_find_acquire_program(NINJA) +set(NODEJS "${CURRENT_HOST_INSTALLED_DIR}/tools/node/node${VCPKG_HOST_EXECUTABLE_SUFFIX}") get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY ) +get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -40,11 +43,13 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}") vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") +vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") -set(PATCHES common.pri.patch +set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch) + build_2.patch + workaround-msvc2022-ice.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json index f6349b28b..27cce1623 100644 --- a/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.3", + "version": "5.15.6", "port-version": 1, "description": "Qt5 webengine Module;", "license": null, @@ -24,7 +24,11 @@ "qt5-quickcontrols", "qt5-quickcontrols2", "qt5-tools", - "qt5-webchannel" + "qt5-webchannel", + { + "name": "vcpkg-tool-nodejs", + "host": true + } ], "features": { "proprietary-codecs": { diff --git a/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch b/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch new file mode 100644 index 000000000..59cc004b6 --- /dev/null +++ b/external_imported/vcpkg/ports/qt5-webengine/workaround-msvc2022-ice.patch @@ -0,0 +1,101 @@ +--- a/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h ++++ b/src/3rdparty/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ struct MD5CE { + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + +--- a/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h ++++ b/src/3rdparty/chromium/net/third_party/quiche/src/quic/core/quic_versions.h +@@ -26,6 +26,7 @@ + #include + #include + ++#include "absl/base/macros.h" + #include "net/third_party/quiche/src/quic/core/quic_tag.h" + #include "net/third_party/quiche/src/quic/core/quic_types.h" + #include "net/third_party/quiche/src/quic/platform/api/quic_export.h" +@@ -181,8 +182,14 @@ QUIC_EXPORT_PRIVATE constexpr bool ParsedQuicVersionIsValid( + transport_version == QUIC_VERSION_RESERVED_FOR_NEGOTIATION; + if (!transport_version_is_valid) { + // Iterators are not constexpr in C++14 which Chrome uses. +- constexpr auto supported_transport_versions = SupportedTransportVersions(); +- for (size_t i = 0; i < supported_transport_versions.size(); ++i) { ++ constexpr QuicTransportVersion supported_transport_versions[] = { ++ QUIC_VERSION_IETF_DRAFT_29, ++ QUIC_VERSION_IETF_DRAFT_27, ++ QUIC_VERSION_51, ++ QUIC_VERSION_50, ++ QUIC_VERSION_46, ++ QUIC_VERSION_43}; ++ for (size_t i = 0; i < ABSL_ARRAYSIZE(supported_transport_versions); ++i) { + const QuicTransportVersion& trans_vers = supported_transport_versions[i]; + if (trans_vers == transport_version) { + transport_version_is_valid = true; + diff --git a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json index 518136852..03852ff6f 100644 --- a/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 webglplugin Module;", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json index 69e6af408..970accb00 100644 --- a/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json index 8b8c4dbd4..681b7dacc 100644 --- a/external_imported/vcpkg/ports/qt5-webview/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.3", + "version": "5.15.6", "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/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json index 3ed0e5fdf..bd0316ac1 100644 --- a/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-winextras/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.6", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json index 7660c0c15..2e6fe2f1c 100644 --- a/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 x11extras Module;", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json index 2ceb26459..b373fd86f 100644 --- a/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.3", + "version": "5.15.6", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/external_imported/vcpkg/ports/qt5/vcpkg.json b/external_imported/vcpkg/ports/qt5/vcpkg.json index fdffcde2e..614401e05 100644 --- a/external_imported/vcpkg/ports/qt5/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5", - "version": "5.15.3", - "port-version": 1, + "version": "5.15.6", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, @@ -193,16 +192,7 @@ ] }, "latest": { - "description": "Build latest qt version (5.15.2) instead of LTS (Currently latest==LTS)", - "dependencies": [ - { - "name": "qt5-base", - "default-features": false, - "features": [ - "latest" - ] - } - ] + "description": "(deprecated)" }, "location": { "description": [], diff --git a/external_imported/vcpkg/ports/qt5compat/vcpkg.json b/external_imported/vcpkg/ports/qt5compat/vcpkg.json index 43291a052..66374a8a8 100644 --- a/external_imported/vcpkg/ports/qt5compat/vcpkg.json +++ b/external_imported/vcpkg/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.2.4", + "version": "6.3.2", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json index bd9b6055c..56ecfc6a1 100644 --- a/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json +++ b/external_imported/vcpkg/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.2.4", + "version": "6.3.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake index 8e190a55e..2193463a9 100644 --- a/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake +++ b/external_imported/vcpkg/ports/qtapplicationmanager/portfile.cmake @@ -4,6 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES bump-cmake-version.patch wrapper-fixes.patch + stack-walker-arm64.patch ) set(TOOL_NAMES appman diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch b/external_imported/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch new file mode 100644 index 000000000..4dd674ede --- /dev/null +++ b/external_imported/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch @@ -0,0 +1,19 @@ +diff --git a/src/3rdparty/stackwalker/stackwalker.cpp b/src/3rdparty/stackwalker/stackwalker.cpp +index 7008ac6..cfa0d0e 100644 +--- a/src/3rdparty/stackwalker/stackwalker.cpp ++++ b/src/3rdparty/stackwalker/stackwalker.cpp +@@ -1121,6 +1121,14 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, + s.AddrBStore.Mode = AddrModeFlat; + s.AddrStack.Offset = c.IntSp; + s.AddrStack.Mode = AddrModeFlat; ++#elif _M_ARM64 ++ imageType = IMAGE_FILE_MACHINE_ARM64; ++ s.AddrPC.Offset = c.Pc; ++ s.AddrPC.Mode = AddrModeFlat; ++ s.AddrFrame.Offset = c.Fp; ++ s.AddrFrame.Mode = AddrModeFlat; ++ s.AddrStack.Offset = c.Sp; ++ s.AddrStack.Mode = AddrModeFlat; + #else + #error "Platform not supported!" + #endif diff --git a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json index 4727a1328..929401f5b 100644 --- a/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json +++ b/external_imported/vcpkg/ports/qtapplicationmanager/vcpkg.json @@ -1,10 +1,9 @@ { "name": "qtapplicationmanager", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, - "supports": "!(windows & arm)", "dependencies": [ "libarchive", "libyaml", diff --git a/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff b/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff new file mode 100644 index 000000000..709aa9cab --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff @@ -0,0 +1,37 @@ +diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h +index e40cd85..ba68a01 100644 +--- a/src/corelib/kernel/qmetatype.h ++++ b/src/corelib/kernel/qmetatype.h +@@ -18,5 +18,6 @@ + #endif + ++#include + #include + #include + #include +@@ -826,7 +829,13 @@ + struct IsGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; + + template ++#if defined(__clang__) && (__clang_major__ > 11) ++ // Clang does not reject T::QtGadgetHelper as ambiguous if a class inherits from two QGADGETS ++ // but is not a QGADGET itself ++ struct IsGadgetHelper> ++#else + struct IsGadgetHelper ++#endif + { + template + static char checkType(void (X::*)()); +@@ -841,7 +850,11 @@ + struct IsPointerToGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; + + template ++#if defined(__clang__) && (__clang_major__ > 11) ++ struct IsPointerToGadgetHelper> ++#else + struct IsPointerToGadgetHelper ++#endif + { + using BaseType = T; + template diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake index 5215f9675..18db16c89 100644 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake @@ -1,3 +1,5 @@ +include_guard(GLOBAL) + #Could probably be the beginning of a vcpkg_install_copyright? function(qt_install_copyright SOURCE_PATH) #Find the relevant license file and install it diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake index f235d367e..d5bd93f84 100644 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake @@ -1,50 +1,53 @@ +include_guard(GLOBAL) + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") include("${CMAKE_CURRENT_LIST_DIR}/qt_install_copyright.cmake") -if(QT_IS_LATEST AND PORT STREQUAL "qtbase") - include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details-latest.cmake") -else() - include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") -endif() -#set(PORT_DEBUG ON) - if(NOT DEFINED QT6_DIRECTORY_PREFIX) set(QT6_DIRECTORY_PREFIX "Qt6/") endif() -macro(qt_stop_on_update) - if(QT_UPDATE_VERSION) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") - return() +function(qt_download_submodule_impl) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES") + + if("${_qarg_SUBMODULE}" IN_LIST QT_FROM_QT_GIT) + # qtinterfaceframework is not available in the release, so we fall back to a `git clone`. + vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git" + REF "${${_qarg_SUBMODULE}_REF}" + PATCHES ${_qarg_PATCHES} + ) + else() + if(VCPKG_USE_HEAD_VERSION) + set(sha512 SKIP_SHA512) + elseif(NOT DEFINED "${_qarg_SUBMODULE}_HASH") + message(FATAL_ERROR "No information for ${_qarg_SUBMODULE} -- add it to QT_PORTS and run qtbase in QT_UPDATE_VERSION mode first") + else() + set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}") + endif() + + qt_get_url_filename("${_qarg_SUBMODULE}" url filename) + vcpkg_download_distfile(archive + URLS "${url}" + FILENAME "${filename}" + ${sha512} + ) + vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${archive}" + PATCHES ${_qarg_PATCHES} + ) endif() -endmacro() + set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() function(qt_download_submodule) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" - "" - "PATCHES") + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "" "PATCHES") - if(QT_UPDATE_VERSION) - set(VCPKG_USE_HEAD_VERSION ON) - set(UPDATE_PORT_GIT_OPTIONS - HEAD_REF "${QT_GIT_TAG}") - endif() + qt_download_submodule_impl(SUBMODULE "${PORT}" PATCHES ${_qarg_PATCHES}) - vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL "https://code.qt.io/qt/${PORT}.git" - REF "${${PORT}_REF}" - ${UPDATE_PORT_GIT_OPTIONS} - ${QT_FETCH_REF} - PATCHES ${_qarg_PATCHES} - ) - - if(QT_UPDATE_VERSION) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") - message(STATUS "VCPKG_HEAD_VERSION:${VCPKG_HEAD_VERSION}") - file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${VCPKG_HEAD_VERSION})\n") - endif() set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) endfunction() @@ -57,7 +60,7 @@ function(qt_cmake_configure) vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_PATH}) - if(NOT PORT STREQUAL "qtwebengine") # qtwebengine requires python2 + if(NOT PORT STREQUAL "qtwebengine" OR QT_IS_LATEST) # qtwebengine requires python2; since 6.3 python3 vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_PATH}) @@ -81,9 +84,6 @@ function(qt_cmake_configure) if(VCPKG_CROSSCOMPILING) list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}") list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged - list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) - endif() endif() # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ @@ -99,6 +99,12 @@ function(qt_cmake_configure) list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) + list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") + + if(NOT PORT MATCHES "qtbase") + list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs") + endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${ninja_option} @@ -144,6 +150,7 @@ function(qt_cmake_configure) INSTALL_INCLUDEDIR HOST_PERL QT_SYNCQT + QT_NO_FORCE_SET_CMAKE_BUILD_TYPE ${_qarg_OPTIONS_MAYBE_UNUSED} ) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) @@ -256,12 +263,14 @@ function(qt_fixup_and_cleanup) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/lib/cmake/" + "${CURRENT_PACKAGES_DIR}/debug/include" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") - debug_message("Files in bin: '${_bin_files}'") - if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. + if(NOT _bin_files STREQUAL "") + message(STATUS "Remaining files in bin: '${_bin_files}'") + else() # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() endif() @@ -277,9 +286,6 @@ function(qt_install_submodule) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_download_submodule(PATCHES ${_qis_PATCHES}) - if(QT_UPDATE_VERSION) - return() - endif() if(_qis_DISABLE_NINJA) set(_opt DISABLE_NINJA) @@ -298,3 +304,5 @@ function(qt_install_submodule) qt_install_copyright("${SOURCE_PATH}") set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) endfunction() + +include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake new file mode 100644 index 000000000..db4547483 --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_data.cmake @@ -0,0 +1,38 @@ +set(qtbase_HASH "e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822") +set(qttools_HASH "ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1") +set(qtdeclarative_HASH "4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af") +set(qtsvg_HASH "2238f1eb3d325b2e17b7e64de5c7f55d1f6129fab7b123ff4c3290307b586d1e894d07a71faaa7f4cb30c1d28e2cc11b11705e03fa5e83c6baebe056a6b3c751") +set(qt5compat_HASH "12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e") +set(qtshadertools_HASH "8394b5467a391fb2b87d22a4b4a2b5b8c0b5d6eb9ea4273aa115fd9b3cab6d955473ed0dc66858390df3d9b6655977baa47b52762cef5c6e95e44330f9040b8a") +set(qtquicktimeline_HASH "fb1807c80bf0af34514aa8db76f167fec75e0e9604c266dba6bf1a560a61ee1395d440fee25457a2a3913708e6fca6b708ccf6a62002b03a0880e5256fba2bed") +set(qtquick3d_HASH "ffe2ff5f64278640c1cc543737cf4fe3d814630fef24602ffd1d166e32dee5d5e929d029abb7573cb28502bd00e1b6217998dc54a3ab4606d053809ff12acf20") +set(qttranslations_HASH "81d0273a99a025b62b1995c2ddbc8cf3b82361ba27ba090c7de1185f6d6a00ead7de0f4f97c34a49bd75b778c0ef8e052a2bf69e67a8513f2bbba575809a720b") +set(qtwayland_HASH "475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03") +set(qtdoc_HASH "6a6881df8f79ec722ca1c70ff32e586dc1821aa7df969fecd0125cd935fa0d7e88fff0fa65f769c222d72f42da677855710e892b414aa705d92b83b7338f76b4") +set(qtcoap_HASH "0689e1315fe2fa37c26a3f67ae8b30cbe9c9a4ea80c74cfa10cf5b5dbd58b123efdc5487ef7d9cfef56fbf3e3036a2b2b0010471e140f3778cdd4bc04bcc25ba") +set(qtopcua_HASH "4203c1504bf9566452698d30acab474586498dec03546644dea292bd1b266de065592d0651c1953dff7a60d19f87792cbdcf6aa1bd01c3e4c6ce56164a7e178c") +set(qtimageformats_HASH "5964c1f0e5fc4032495641268881f2288f90f361cb5a7e4953e05005ea907033ef634192ef26e1b0343e09c1a0306f83bef88ad4a5dba4665387001290dccc77") +set(qtmqtt_HASH "2d74f0dfde99f2263c8ac61aa787c80afb62c3db0694b37c15d526273bda4c0519b8c06a7f0f66e37eae0df307c4b65d2b0486112dc7e887a40ac32f60e885c4") +set(qtnetworkauth_HASH "dfe52c4ce02d07181293f80ebffe9ff7060f5f63f7c9a6d38c7e13aa131ab5ef4d51e07a16303458f85b04bd6b1bfe3878614d05d1936877c1ce1f6b34da2fe0") +set(qtactiveqt_HASH "ec8590ada67df9e2db280713b1a1b6832f610882f9a2eaffe924efaddade184f380ff6caeeda6ee807fc74635bd4f4f57a7530bb1a9dd08aae57b049d6b1332b") +set(qtdatavis3d_HASH "58a68c27f08cceb735309c018398b8ea6b6805e2ad78604fd445ea44749809f7f41209257d59ea211446328ceb216470b6c4159ea7434d19f4b635da80606ffa") +set(qtdeviceutilities_HASH "392b6a08cbcbe6494c6497e3028d3b62467156b293b4db50cd1e3fc1b57e699cf43052fd8937e27ba61736ef5693b55077c8ba40b69fc1eb733db2364f772bf1") +set(qtlottie_HASH "973ecf403cb1944e24176f4b021b17e0eb7d06a188b92d71e3ae41cd59a668f57e7fd135607b428a9822af0daa7f18bf84b4f8436d0e1c4587797d3735ae2088") +set(qtscxml_HASH "64f8cf91ac14364ed52ff032071b21f5f905693e6e66451751981bbd50e209246c6e3ce29c26e1dbb6559146e7ba867896f0a92f8936c4a124882bee42cd7f45") +set(qtvirtualkeyboard_HASH "be2974a22637c757b500246aff76037fea47b00c5a1fabf0811c2b752868cfd16c9e23457043457cde4354343e583b67984cdf27349e1de031721a0ddbb9642a") +set(qtcharts_HASH "7e04a4cbce66ddb1055d8e399bbb06b6a7ab5b8a0f80de315f20c4c0f2971911128ec386752818c7a07cd6dfe326e62e4c2e6a0e92e2bc97498e49babed2af50") +set(qtconnectivity_HASH "fae73921e8f8573e98d189f22cc07368300cfb509b3f3f49ffa8f35c52f0a986102c8d5705a112dab51c6d4c209d893f2ec641de74f861f1cd5b3390d66d0c09") +set(qtpositioning_HASH "0b65ca2157bf38f5a5b716c921f13cafadb4b98ba30d34893ea587b82dff9fbead2dd03af6ef6d1c75fd57dce85f8bae2b2b0b79f66ff2abb6b660f45a039df7") +set(qtmultimedia_HASH "d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27") +set(qtremoteobjects_HASH "59b32ca733de3d10aa98f5d0304ce30acb6911434ef24e43de357e66310707180c596cf5a2af3c746c69ff9f4de98cccb46a94d1e5f0ed65e990e11addcdcac5") +set(qtsensors_HASH "f6cb6b523bba0fb928a1fe12b149c6a5aeeeae55bfcf95baf33d4aff68e197e01ced8de6da5c7dc313c4f75ce1bd201587c4cb0fefd9eaed1c47805c56b8e41b") +set(qtserialbus_HASH "4507944f39f3060742d26bec153929e933abd38803eeac95f317ba94aa14e1a555b5d3b4158591ec113b51f56451ba8cb133be0301ffec9df09408e245b7ac59") +set(qtserialport_HASH "d71ca3b004133eb86fbfc4e8e22daa1d6317b4dab8a7b8bf252509a226477b28647c20ad01368fb7b5b4d2fc1007606a287a3d38ca904e722efda7dfb7cec2ab") +set(qtwebchannel_HASH "83de9a61d25bcf8346ff46417173ecffe15cff9802db524def1afbce4367f3d414b10e8042d45db36555945544dfe1c1d081e4ec33756250afca7ad58975c9d9") +set(qtwebengine_HASH "deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a") +set(qtwebsockets_HASH "b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00c5ca6b203ed01323728d8de61b2dee7c905a20be3c31baf73780afe1cce4d5f0308483d") +set(qtwebview_HASH "39cb4bf67818e4d462fbdd180a802052b3637578a8b99a943359749f15b721f2e0b0354d90ceaaff99a57eba1c57c1ee271e4fd0a553d42c8093c665b9192688") +set(qtinterfaceframework_REF a83bc81486891170750a3048e6b58d15903e6f9c) +set(qtapplicationmanager_HASH "79a8e7588ec168d6cbccd921bc46b48a25512591b65e1602dd7cf461a7692472498301eea299808a08b7ed7f5efaa69f9a0b9ab86f9ea8f18cb4421c562c3f20") + +set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake deleted file mode 100644 index e89df6b96..000000000 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details-latest.cmake +++ /dev/null @@ -1,112 +0,0 @@ -set(QT_VERSION 6.2.0) - -if(PORT MATCHES "qtquickcontrols2") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") - return() -endif() -set(QT_GIT_TAG v${QT_VERSION}) - -#set(QT_UPDATE_VERSION TRUE) -if(QT_UPDATE_VERSION) - function(vcpkg_extract_source_archive) - endfunction() -endif() -set(QT_IS_LATEST 1) - -set(QT_PORTS qt - qtbase - qttools - qtdeclarative - qtsvg - qt5compat - qtshadertools - qtquicktimeline - qtquick3d - qttranslations - qtwayland - qtdoc - qtcoap - qtopcua - qtimageformats - qtmqtt - qtnetworkauth - # qtquickcontrols2 -> moved into qtdeclarative - ## New in 6.1 - qtactiveqt - qtdatavis3d - #qtdeviceutils - qtlottie - qtscxml - qtvirtualkeyboard - qtcharts - ## New in 6.2 - qtconnectivity - qtlocation - qtmultimedia - qtremoteobjects - qtsensors - qtserialbus - qtserialport - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ) - -foreach(_port IN LISTS QT_PORTS) - set(${_port}_TAG ${QT_GIT_TAG}) -endforeach() -set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792) -set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e) -set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3) -set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d) -set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule -set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1) -set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069) -set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686) -set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823) -set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4) -set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c) -set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7) -set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b) -set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba) -set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8) -set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f) -# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 -### New in 6.1 -set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d) -set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca) -set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8) -#set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288) -set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344) -set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f) -### New in 6.2 -set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30) -set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6) -set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487) -set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc) -set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db) -set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847) -set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047) -set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52) -set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule -set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542) -set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qtbase") - file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") - foreach(_current_qt_port IN LISTS QT_PORTS) - set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") - file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") - file(WRITE "${_current_control}" "${_control_contents}") - #need to run a vcpkg format-manifest --all after update once - endforeach() - endif() -endif() diff --git a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake index a33f93b4a..c9036cab5 100644 --- a/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake +++ b/external_imported/vcpkg/ports/qtbase/cmake/qt_port_details.cmake @@ -1,132 +1,139 @@ -set(QT_VERSION 6.2.4) - -if(PORT MATCHES "qtquickcontrols2") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") - return() -endif() - -### Setting up the git tag. -set(QT_FETCH_REF "") -set(QT_GIT_TAG "v${QT_VERSION}") -if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager") - # So much for consistency .... - set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") - set(QT_GIT_TAG "${QT_VERSION}") -endif() - -#set(QT_UPDATE_VERSION TRUE) -if(QT_UPDATE_VERSION) - function(vcpkg_extract_source_archive) - endfunction() -endif() - -set(QT_PORTS qt - qtbase - qttools - qtdeclarative - qtsvg - qt5compat - qtshadertools - qtquicktimeline - qtquick3d - qttranslations - qtwayland - qtdoc - qtcoap - qtopcua - qtimageformats - qtmqtt - qtnetworkauth - # qtquickcontrols2 -> moved into qtdeclarative - ## New in 6.1 - qtactiveqt - qtdatavis3d - qtdeviceutilities - qtlottie - qtscxml - qtvirtualkeyboard - qtcharts - ## New in 6.2 - qtconnectivity - qtpositioning - qtlocation - qtmultimedia - qtremoteobjects - qtsensors - qtserialbus - qtserialport - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ## New in 6.2.2 - qtinterfaceframework - qtapplicationmanager - ) - -foreach(_port IN LISTS QT_PORTS) - set(${_port}_TAG ${QT_GIT_TAG}) -endforeach() -set(qtbase_REF 597359f7d0736917123842dee63a7ae45522eb8e ) -set(qtshadertools_REF d954aeb073375ee1edda4d6b2956c3c79b26b386 ) -set(qtdeclarative_REF 614d85d460fa46e947eeb4281609ce5453a29e5c ) -set(qt5compat_REF c5dab10ba77dd2701dbd2d7b69998fbee90557f2 ) -set(qttools_REF a60e0e5dfb2af83ffb1adda28028b24e21fe9131 ) # Additional refs below -set(qtcoap_REF 29df645fc165087e74b603e7ad20033381006fb5 ) -set(qtdoc_REF 5c70158a15f23224a76b6919ab06eefee6ed187e ) -set(qtimageformats_REF 356fb7846b5bc002b2d34e23253fda1dffed7932 ) -set(qtmqtt_REF 9ad6c48474c2b94c62a518dc3dc7e65d30a6309e ) -set(qtnetworkauth_REF d5ffb7549dd1e6139b746021c4d40053d0f15950 ) -set(qtopcua_REF 4a0dd4334d98bea48acda1e203ab2c31f207bad3 ) -set(qtquicktimeline_REF 6a06bdbaa55d1c165e992732f2e3dc923846b921 ) -set(qtquick3d_REF d126dea81f48386ef24e8b30e1328c40e72c4861 ) -set(qtsvg_REF 77ea18adfb91c591f249f442e0ffc0079023e431 ) -set(qttranslations_REF 87f95df09b1fc388ea15ce208a349d6b1deac2a4 ) -set(qtwayland_REF 6bdaed8301336750dda95823ed0dfac4828ebab6 ) -### New in 6.1 -set(qtactiveqt_REF 5dd7acd1395627e6bd0d87beb148957059c1a3c6 ) -set(qtcharts_REF 7184ea521d04ec13587562c3275ae698fa9a722e ) -set(qtdatavis3d_REF 74c469d4926f59264c5cbc47fe301fe4713aa358 ) -set(qtdeviceutilities_REF f7333510b4dcfe32eb9065a63c434704750d4fb6 ) -set(qtlottie_REF fd61d8e92cfacbd3d10f31b176a7cde911525632 ) -set(qtscxml_REF 63455c888e012fdc682c32fd3d0de96127721bd4 ) -set(qtvirtualkeyboard_REF ffe9bba23ae45662d25ac3d90167d794e0d6c828 ) -### New in 6.2 -set(qtconnectivity_REF f0ac95d1685f4f0f2e72fb42800b17d7738ccefb ) -set(qtmultimedia_REF 3423c7172f948f27ff0512d1d2db4ea97fc0e9c0 ) -set(qtremoteobjects_REF 2d0f27e736211e2a6b9d08345f65c736a17a67eb ) -set(qtserialport_REF c7dc6737a2e98af81900f55f814cf79a6d579779 ) -set(qtsensors_REF 32dda47f507e74ef7ed33290545b762a0c20e532 ) -set(qtserialbus_REF 1ebbf87cbc90c22817785bffc563d4bb86525abc ) -set(qtlocation_REF 0 ) # Currently empty port -set(qtwebchannel_REF e1014dcf9a924d3b8fd3450a3360381a0a8fc6ab ) -set(qtwebengine_REF cc7181c12d1d1605ecab6c448df4a684278d01d8 ) # Additional refs below -set(qtwebsockets_REF fd509016da201ed63122c5ec79355930f2489ee8 ) -set(qtwebview_REF aade84c30fbbc85fe5a8c5e49172a02a7522623d ) -set(qtpositioning_REF 3a68165bc88f9ddd165567d30887147d2d71915b ) -### New in Qt 6.2.2 -set(qtapplicationmanager_REF 2626ae6e9ce84aebd88a163153719c07d7f65b7d ) -set(qtinterfaceframework_REF 71512be8758c75b4b6b0130d6b623f564c6bf227 ) - -#Submodule stuff: -set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) -set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) -set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) -set(qtwebengine_chromium_REF b33b4266df8c333d3d273ae4665d6b322eee33c6) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qtbase") - file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") - foreach(_current_qt_port IN LISTS QT_PORTS) - set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") - file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") - file(WRITE "${_current_control}" "${_control_contents}") - #need to run a vcpkg format-manifest --all after update once - endforeach() - endif() -endif() +### Steps to update the qt6 ports +## 1. Change QT_VERSION below to the new version +## 2. Set QT_UPDATE_VERSION to 1 +## 3. Add any new Qt modules to QT_PORTS +## 4. Run a build of `qtbase` +## 5. Fix any intermediate failures by adding the module into QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, or QT_FROM_QT_GIT as appropriate +## 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.3.2) +set(QT_UPDATE_VERSION 0) + +if(PORT MATCHES "(qtquickcontrols2)") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + 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 + qtbase + qttools + qtdeclarative + qtsvg + qt5compat + qtshadertools + qtquicktimeline + qtquick3d + qttranslations + qtwayland + qtdoc + qtcoap + qtopcua + qtimageformats + qtmqtt + qtnetworkauth) + # qtquickcontrols2 -> moved into qtdeclarative +if(QT_VERSION VERSION_GREATER_EQUAL 6.1) + list(APPEND QT_PORTS + ## New in 6.1 + qtactiveqt + qtdatavis3d + qtdeviceutilities + qtlottie + qtscxml + qtvirtualkeyboard + qtcharts) +endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.2) + list(APPEND QT_PORTS + ## New in 6.2 + qtconnectivity + qtpositioning + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview) +endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2) + list(APPEND QT_PORTS + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager) +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) +# 3. These modules are mirrored to github and have branches matching the release +set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation) +# 4. These modules are not mirrored to github and not part of the release +set(QT_FROM_QT_GIT qtinterfaceframework) + +function(qt_get_url_filename qt_port out_url out_filename) + if("${qt_port}" IN_LIST QT_FROM_GITHUB) + set(url "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz") + set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz") + elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH) + set(url "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz") + set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz") + else() + string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor) + set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + endif() + set(${out_url} "${url}" PARENT_SCOPE) + set(${out_filename} "${filename}" PARENT_SCOPE) +endfunction() + +if(QT_UPDATE_VERSION) + if(NOT PORT STREQUAL "qtbase") + message(FATAL_ERROR "QT_UPDATE_VERSION must be used from the root 'qtbase' package") + endif() + set(VCPKG_USE_HEAD_VERSION 1) + set(msg "" CACHE INTERNAL "") + foreach(qt_port IN LISTS QT_PORTS) + set(port_json "${CMAKE_CURRENT_LIST_DIR}/../../${qt_port}/vcpkg.json") + file(READ "${port_json}" _control_contents) + string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") + file(WRITE "${port_json}" "${_control_contents}") + if(qt_port STREQUAL "qt") + continue() + endif() + if("${qt_port}" IN_LIST QT_FROM_QT_GIT) + vcpkg_find_acquire_program(GIT) + execute_process( + COMMAND "${GIT}" ls-remote -t "https://code.qt.io/cgit/qt/${qt_port}.git" "v${QT_VERSION}" + OUTPUT_VARIABLE out + ) + string(SUBSTRING "${out}" 0 40 tag_sha) + string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n") + else() + qt_get_url_filename("${qt_port}" url filename) + vcpkg_download_distfile(archive + URLS "${url}" + FILENAME "${filename}" + SKIP_SHA512 + ) + file(SHA512 "${archive}" hash) + string(APPEND msg "set(${qt_port}_HASH \"${hash}\")\n") + endif() + endforeach() + message("${msg}") + file(WRITE "${CMAKE_CURRENT_LIST_DIR}/qt_port_data_new.cmake" "${msg}") + message(FATAL_ERROR "Done downloading version and emitting hashes.") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/qt_port_data.cmake") diff --git a/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch b/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch deleted file mode 100644 index fc5423425..000000000 --- a/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake -index 4f8106dfa..bec5c402e 100644 ---- a/cmake/QtPostProcessHelpers.cmake -+++ b/cmake/QtPostProcessHelpers.cmake -@@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var) - - foreach(var ${vars}) - get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) -- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") -+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") - endforeach() - - set(${out_var} "${content}" PARENT_SCOPE) -@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( - endif() - if(CMAKE_CONFIGURATION_TYPES) - string(APPEND multi_config_specific -- " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\" FORCE)\n") -+ " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\")\n") - endif() - if(CMAKE_TRY_COMPILE_CONFIGURATION) - string(APPEND multi_config_specific -@@ -655,7 +655,7 @@ endif()\n") - # find_package(Qt6Core) is called in case if the feature was disabled. - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " - if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE) -- set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE) -+ set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\") - endif()\n") - - # The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can -diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in -index cadf3847c..6ec51fd63 100644 ---- a/cmake/QtBuildInternalsExtra.cmake.in -+++ b/cmake/QtBuildInternalsExtra.cmake.in -@@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND - AND "${CMAKE_STAGING_PREFIX}" STREQUAL "" - AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) - set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH -- "Staging path prefix, prepended onto install directories on the host machine." FORCE) -+ "Staging path prefix, prepended onto install directories on the host machine." ) - set(qtbi_new_prefix "${qtbi_orig_prefix}") - endif() - set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH -- "Install path prefix, prepended onto install directories." FORCE) -+ "Install path prefix, prepended onto install directories." ) - unset(qtbi_orig_prefix) - unset(qtbi_real_orig_prefix) - unset(qtbi_new_prefix) -@@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) - AND NOT __qt_toolchain_cmake_build_type_before_project_call - AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE - AND NOT __qt_internal_extras_is_multi_config) -- set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE) -+ set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.") - endif() - endfunction() - diff --git a/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch b/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch new file mode 100644 index 000000000..752cefe6d --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake +index 4f8106dfa..bec5c402e 100644 +--- a/cmake/QtPostProcessHelpers.cmake ++++ b/cmake/QtPostProcessHelpers.cmake +@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var) + + foreach(var ${vars}) + get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) +- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n") + endforeach() + + set(${out_var} "${content}" PARENT_SCOPE) diff --git a/external_imported/vcpkg/ports/qtbase/installed_dir.patch b/external_imported/vcpkg/ports/qtbase/installed_dir.patch new file mode 100644 index 000000000..918673141 --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/installed_dir.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in +index 6e37ae02..e7e84468 100644 +--- a/cmake/qt.toolchain.cmake.in ++++ b/cmake/qt.toolchain.cmake.in +@@ -65,6 +65,10 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX + # one level higher is what we're looking for. + get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) + ++get_filename_component(vcpkg_installed_dir ++ ${CMAKE_CURRENT_LIST_DIR}/../../../ ++ ABSOLUTE) ++ + # REROOT_PATH_ISSUE_MARKER + # There's a subdirectory check in cmake's cmFindCommon::RerootPaths() function, that doesn't handle + # the case of CMAKE_PREFIX_PATH == CMAKE_FIND_ROOT_PATH for a particular pair of entries. diff --git a/external_imported/vcpkg/ports/qtbase/portfile.cmake b/external_imported/vcpkg/ports/qtbase/portfile.cmake index 9d90b9233..0c923dab3 100644 --- a/external_imported/vcpkg/ports/qtbase/portfile.cmake +++ b/external_imported/vcpkg/ports/qtbase/portfile.cmake @@ -3,8 +3,7 @@ # Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets # Often enough certain (bigger) dependencies are only used to build examples and/or tests. # As such getting the correct dependency information relevant for vcpkg requires a manual search/check - -#set(QT_IS_LATEST ON) +set(QT_IS_LATEST ON) ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") @@ -13,20 +12,20 @@ set(${PORT}_PATCHES allow_outside_prefix.patch clang-cl_source_location.patch config_install.patch - dont_force_cmakecache.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch + clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. + installed_dir.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) list(APPEND ${PORT}_PATCHES env.patch) endif() -if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) - list(APPEND ${PORT}_PATCHES - ) -endif() +list(APPEND ${PORT}_PATCHES + dont_force_cmakecache_latest.patch + ) if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) @@ -67,9 +66,9 @@ FEATURES "framework" FEATURE_framework "concurrent" FEATURE_concurrent "concurrent" FEATURE_future - "concurrent" FEATURE_thread "dbus" FEATURE_dbus "gui" FEATURE_gui + "thread" FEATURE_thread "network" FEATURE_network "sql" FEATURE_sql "widgets" FEATURE_widgets @@ -201,19 +200,20 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS FEATURES "sql-sqlite" FEATURE_system_sqlite + "sql-odbc" FEATURE_sql_odbc #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 INVERTED_FEATURES "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 + "sql-odbc" CMAKE_DISABLE_FIND_PACKAGE_ODBC # "sql-db2" FEATURE_sql-db2 # "sql-ibase" FEATURE_sql-ibase # "sql-mysql" FEATURE_sql-mysql # "sql-oci" FEATURE_sql-oci - # "sql-odbc" FEATURE_sql-odbc ) -set(DB_LIST DB2 MySQL Oracle ODBC) +set(DB_LIST DB2 MySQL Oracle) foreach(_db IN LISTS DB_LIST) list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) endforeach() @@ -246,6 +246,8 @@ set(TOOL_NAMES uic qtpaths qtpaths6 + windeployqt + macdeployqt ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} @@ -275,41 +277,35 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} ) # Install CMake helper scripts -if(QT_IS_LATEST) - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") -else() - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") -endif() -file(INSTALL - "${port_details}" - DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME - "qt_port_details.cmake" - ) file(COPY - "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_copyright.cmake" - "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -qt_stop_on_update() - -set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests) +set(other_files qt-cmake + qt-cmake-private + qt-cmake-standalone-test + qt-configure-module + qt-internal-configure-tests + ) if(CMAKE_HOST_WIN32) set(script_suffix .bat) else() set(script_suffix) endif() -set(other_files - target_qt.conf - qt-cmake-private-install.cmake - syncqt.pl - android_cmakelist_patcher.sh - android_emulator_launcher.sh - ensure_pro_file.cmake - ) +list(TRANSFORM other_files APPEND "${script_suffix}") + +list(APPEND other_files + android_cmakelist_patcher.sh + android_emulator_launcher.sh + ensure_pro_file.cmake + syncqt.pl + target_qt.conf + qt-cmake-private-install.cmake + qt-testrunner.py + ) + foreach(_config debug release) if(_config MATCHES "debug") set(path_suffix debug/) @@ -320,33 +316,44 @@ foreach(_config debug release) continue() endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}") - foreach(script IN LISTS script_files) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}") - set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}") - file(READ "${target_script}" _contents) + foreach(other_file IN LISTS other_files) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}") + set(target_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other_file}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}" "${target_file}") + file(READ "${target_file}" _contents) if(_config MATCHES "debug") - string(REPLACE "\\..\\share\\" "\\..\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "..\\share\\" "..\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "../share/" "../../../../share/" _contents "${_contents}") else() - string(REPLACE "\\..\\share\\" "\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "..\\share\\" "..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "../share/" "../../../share/" _contents "${_contents}") endif() - file(WRITE "${target_script}" "${_contents}") - endif() - endforeach() - foreach(other IN LISTS other_files) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}") + string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}") + file(WRITE "${target_file}" "${_contents}") endif() endforeach() endforeach() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +# Fixup qt.toolchain.cmake +set(qttoolchain "${CURRENT_PACKAGES_DIR}/share/Qt6/qt.toolchain.cmake") +file(READ "${qttoolchain}" toolchain_contents) +string(REGEX REPLACE "set\\\(__qt_initially_configured_toolchain_file [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__qt_chainload_toolchain_file \"\${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\")" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REPLACE "${CURRENT_HOST_INSTALLED_DIR}" "\${vcpkg_installed_dir}/${HOST_TRIPLET}" toolchain_contents "${toolchain_contents}") +file(WRITE "${qttoolchain}" "${toolchain_contents}") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script endif() file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") + else() + message(STATUS "Files in '/bin':${_bin_files}") endif() endif() @@ -387,7 +394,7 @@ configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONL if(VCPKG_TARGET_IS_WINDOWS) set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) - set(DLLS_TO_COPY) + set(DLLS_TO_COPY "") foreach(_file IN LISTS _DLL_FILES) if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") @@ -396,16 +403,27 @@ if(VCPKG_TARGET_IS_WINDOWS) file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake") file(READ "${hostinfofile}" _contents) string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}") string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") -set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") -if(EXISTS "${coretools}") - file(READ "${coretools}" _contents) - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") - file(WRITE "${coretools}" "${_contents}") +set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") +if(EXISTS "${configfile}") + file(READ "${configfile}" _contents) + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") + endif() + file(WRITE "${configfile}" "${_contents}") endif() + diff --git a/external_imported/vcpkg/ports/qtbase/qmake.debug.bat b/external_imported/vcpkg/ports/qtbase/qmake.debug.bat index 1b7440b3e..a7ed903a3 100644 --- a/external_imported/vcpkg/ports/qtbase/qmake.debug.bat +++ b/external_imported/vcpkg/ports/qtbase/qmake.debug.bat @@ -1,2 +1,2 @@ @echo off -"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* \ No newline at end of file +"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* diff --git a/external_imported/vcpkg/ports/qtbase/qtpaths.debug.bat b/external_imported/vcpkg/ports/qtbase/qtpaths.debug.bat new file mode 100644 index 000000000..4fef8e754 --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/qtpaths.debug.bat @@ -0,0 +1,2 @@ +@echo off +"%0\..\qtpaths.exe" --qtconf "%0\..\qt.debug.conf" %* diff --git a/external_imported/vcpkg/ports/qtbase/vcpkg.json b/external_imported/vcpkg/ports/qtbase/vcpkg.json index df7b84068..388b3fb94 100644 --- a/external_imported/vcpkg/ports/qtbase/vcpkg.json +++ b/external_imported/vcpkg/ports/qtbase/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qtbase", - "version": "6.2.4", + "version": "6.3.2", "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, + "supports": "!uwp", "dependencies": [ "freetype", { @@ -61,6 +62,7 @@ "sql-psql", "sql-sqlite", "testlib", + "thread", "widgets", "zstd" ], @@ -82,7 +84,16 @@ ] }, "concurrent": { - "description": "Provides a high-level multi-threading API. Qt Concurrent" + "description": "Provides a high-level multi-threading API. Qt Concurrent", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ] + } + ] }, "dbus": { "description": "Qt D-Bus" @@ -165,6 +176,14 @@ "features": [ "freetype" ] + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ], + "platform": "windows" } ] }, @@ -247,6 +266,19 @@ } ] }, + "sql-odbc": { + "description": "Enable SQL Driver odbc", + "supports": "windows", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + } + ] + }, "sql-psql": { "description": "Enable SQL Driver psql", "dependencies": [ @@ -276,6 +308,9 @@ "testlib": { "description": "Qt Testlib" }, + "thread": { + "description": "Thread support; provides QThread and related classes." + }, "vulkan": { "description": "Enable Vulkan support" }, diff --git a/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat b/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat new file mode 100644 index 000000000..99e5e79e7 --- /dev/null +++ b/external_imported/vcpkg/ports/qtbase/windeployqt.debug.bat @@ -0,0 +1,10 @@ +@echo off +setlocal enabledelayedexpansion +set mypath=%~dp0 +set mypath=%mypath:~0,-1% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% +"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +cd %BAKCD% +endlocal diff --git a/external_imported/vcpkg/ports/qtcharts/vcpkg.json b/external_imported/vcpkg/ports/qtcharts/vcpkg.json index 5b5bba705..3e700962b 100644 --- a/external_imported/vcpkg/ports/qtcharts/vcpkg.json +++ b/external_imported/vcpkg/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.2.4", + "version": "6.3.2", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtcoap/vcpkg.json b/external_imported/vcpkg/ports/qtcoap/vcpkg.json index 933dd17eb..4985db892 100644 --- a/external_imported/vcpkg/ports/qtcoap/vcpkg.json +++ b/external_imported/vcpkg/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json index 9939d0560..dcb9ddb1b 100644 --- a/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json +++ b/external_imported/vcpkg/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json index 7c6ef9986..283e597c0 100644 --- a/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake index bf1d42cf3..9589d6284 100644 --- a/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake +++ b/external_imported/vcpkg/ports/qtdeclarative/portfile.cmake @@ -16,6 +16,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") qmltime qmltyperegistrar qmldom + qmltc ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json index a28b939d9..94126999e 100644 --- a/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json index 40887e480..81793c82e 100644 --- a/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.2.4", + "version": "6.3.2", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtdoc/vcpkg.json b/external_imported/vcpkg/ports/qtdoc/vcpkg.json index 9ed06dbe9..9b571c6e9 100644 --- a/external_imported/vcpkg/ports/qtdoc/vcpkg.json +++ b/external_imported/vcpkg/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtimageformats/no_target_promotion.patch b/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch similarity index 68% rename from external_imported/vcpkg/ports/qtimageformats/no_target_promotion.patch rename to external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch index 73e5f7d4e..1b76e36b5 100644 --- a/external_imported/vcpkg/ports/qtimageformats/no_target_promotion.patch +++ b/external_imported/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fdd7ddbd..f189c472c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,7 +9,16 @@ project(QtImageFormats # special case +@@ -9,6 +9,15 @@ project(QtImageFormats # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) @@ -17,6 +17,5 @@ index 7fdd7ddbd..f189c472c 100644 +if(TARGET JPEG::JPEG) + set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) +endif() - # special case begin - # Make sure we only use latest private CMake API, aka no compatibility wrappers. - set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case diff --git a/external_imported/vcpkg/ports/qtimageformats/portfile.cmake b/external_imported/vcpkg/ports/qtimageformats/portfile.cmake index 275b927af..135bd9d8a 100644 --- a/external_imported/vcpkg/ports/qtimageformats/portfile.cmake +++ b/external_imported/vcpkg/ports/qtimageformats/portfile.cmake @@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES no_target_promotion.patch) +set(${PORT}_PATCHES no_target_promotion_latest.patch) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json index 8d0bca44a..7da325a23 100644 --- a/external_imported/vcpkg/ports/qtimageformats/vcpkg.json +++ b/external_imported/vcpkg/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.2.4", + "version": "6.3.2", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake index ff9ca6ccb..3d927c311 100644 --- a/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake +++ b/external_imported/vcpkg/ports/qtinterfaceframework/portfile.cmake @@ -1,59 +1,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -function(vcpkg_get_python_package PYTHON_DIR ) # From mesa - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) - endif() - else() # outside vcpkg - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) - if(HAS_ERROR) - message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") - endif() - endforeach() - endif() -endfunction() - -set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off. +set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. + ) set(TOOL_NAMES ifmedia-simulation-server ifvehiclefunctions-simulation-server @@ -69,11 +18,11 @@ if(_qis_DISABLE_NINJA) endif() vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") -vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts") -vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface) + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" + REQUIREMENTS_FILE "${CURRENT_PORT_DIR}/requirements_minimal.txt" + PACKAGES qface==2.0.5 + OUT_PYTHON_VAR "PYTHON3") if(VCPKG_CROSSCOMPILING) list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt b/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt new file mode 100644 index 000000000..3c62c19ee --- /dev/null +++ b/external_imported/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt @@ -0,0 +1,14 @@ +antlr4-python3-runtime==4.7.1 +argh==0.26.2 +click==6.7 +coloredlogs==10.0 +humanfriendly==4.15.1 +Jinja2==2.11.3 +MarkupSafe==1.1 +path.py==11.0.1 +pathtools==0.1.2 +PyYAML==5.4 +six==1.11.0 +watchdog==2.1.7 +pytest==5.3.5 +pytest-cov==2.8.1 diff --git a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json index 302b085e3..c3c11ca8b 100644 --- a/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json +++ b/external_imported/vcpkg/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, @@ -30,6 +30,11 @@ "name": "qttools", "default-features": false }, - "taglib" + "taglib", + { + "name": "vcpkg-get-python-packages", + "host": true, + "default-features": false + } ] } diff --git a/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake b/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake index 674d02685..875ae642a 100644 --- a/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake +++ b/external_imported/vcpkg/ports/qtkeychain-qt6/portfile.cmake @@ -3,8 +3,9 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - REF v0.13.2 - SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json b/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json index df4c0591c..3df8b0829 100644 --- a/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json +++ b/external_imported/vcpkg/ports/qtkeychain-qt6/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtkeychain-qt6", "version": "0.13.2", + "port-version": 1, "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/qtkeychain/portfile.cmake b/external_imported/vcpkg/ports/qtkeychain/portfile.cmake index f63123228..53b7683d8 100644 --- a/external_imported/vcpkg/ports/qtkeychain/portfile.cmake +++ b/external_imported/vcpkg/ports/qtkeychain/portfile.cmake @@ -3,8 +3,9 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - REF v0.13.2 - SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb + # 0.13.2 plus three commits, for a CMake export target fix + REF cd4d73299b144d11c310f6ca9a6ab1ef50c45431 + SHA512 a1af668bec23df5d696ad49129ec2aa6d332f043b43bb9875c2b025007452571bfd9431fd37c72189e957329491c04703e8c6d1104c7a117ebf28cb91249b639 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/qtkeychain/vcpkg.json b/external_imported/vcpkg/ports/qtkeychain/vcpkg.json index af15c2679..6f1e1e257 100644 --- a/external_imported/vcpkg/ports/qtkeychain/vcpkg.json +++ b/external_imported/vcpkg/ports/qtkeychain/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtkeychain", "version": "0.13.2", - "port-version": 1, + "port-version": 3, "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/qtlocation/vcpkg.json b/external_imported/vcpkg/ports/qtlocation/vcpkg.json index 9fde64ebe..840d18836 100644 --- a/external_imported/vcpkg/ports/qtlocation/vcpkg.json +++ b/external_imported/vcpkg/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtlottie/vcpkg.json b/external_imported/vcpkg/ports/qtlottie/vcpkg.json index f5b37860e..c297a2c6b 100644 --- a/external_imported/vcpkg/ports/qtlottie/vcpkg.json +++ b/external_imported/vcpkg/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.2.4", + "version": "6.3.2", "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/external_imported/vcpkg/ports/qtmqtt/vcpkg.json b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json index 1457f1ebf..48177144e 100644 --- a/external_imported/vcpkg/ports/qtmqtt/vcpkg.json +++ b/external_imported/vcpkg/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.2.4", + "version": "6.3.2", "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/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake index 67a771a9b..913526f78 100644 --- a/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake +++ b/external_imported/vcpkg/ports/qtmultimedia/portfile.cmake @@ -3,7 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES fix_windows_header_include.patch remove_unistd.patch - ) +) #Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added @@ -38,12 +38,8 @@ else() list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") endif() -if(VCPKG_TARGET_IS_LINUX) - list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") - list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON") -else() - list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON") -endif() +# alsa is not ready +list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF") qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} diff --git a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json index b93a864ba..74584b33e 100644 --- a/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json +++ b/external_imported/vcpkg/ports/qtmultimedia/vcpkg.json @@ -1,14 +1,10 @@ { "name": "qtmultimedia", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ - { - "name": "alsa", - "platform": "linux" - }, { "name": "qtbase", "default-features": false, diff --git a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json index 03ab652c4..657286be1 100644 --- a/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json +++ b/external_imported/vcpkg/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtopcua/vcpkg.json b/external_imported/vcpkg/ports/qtopcua/vcpkg.json index 87038f227..5fcb03377 100644 --- a/external_imported/vcpkg/ports/qtopcua/vcpkg.json +++ b/external_imported/vcpkg/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, @@ -40,6 +40,7 @@ "default-features": false, "features": [ "amalgamation", + "historizing", "openssl" ] } diff --git a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json index 7858af023..185544c21 100644 --- a/external_imported/vcpkg/ports/qtpositioning/vcpkg.json +++ b/external_imported/vcpkg/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake index af7915a09..43449146f 100644 --- a/external_imported/vcpkg/ports/qtquick3d/portfile.cmake +++ b/external_imported/vcpkg/ports/qtquick3d/portfile.cmake @@ -16,7 +16,7 @@ else() list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) endif() -set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer) +set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} diff --git a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json index 26d691f98..330341f42 100644 --- a/external_imported/vcpkg/ports/qtquick3d/vcpkg.json +++ b/external_imported/vcpkg/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.2.4", + "version": "6.3.2", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, @@ -26,7 +26,6 @@ ], "features": { "assimp": { - "$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay", "description": "assimp", "dependencies": [ "assimp" diff --git a/external_imported/vcpkg/ports/qtquickcontrols2/vcpkg.json b/external_imported/vcpkg/ports/qtquickcontrols2/vcpkg.json index cdc422ec3..786eedf22 100644 --- a/external_imported/vcpkg/ports/qtquickcontrols2/vcpkg.json +++ b/external_imported/vcpkg/ports/qtquickcontrols2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquickcontrols2", - "version-semver": "6.2.0", + "version-string": "deprecated", "description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ "qtdeclarative" ] diff --git a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json index 2bcaea990..042940e4f 100644 --- a/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json +++ b/external_imported/vcpkg/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.2.4", + "version": "6.3.2", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json index b9f5c19b1..8e610414a 100644 --- a/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json +++ b/external_imported/vcpkg/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtscxml/vcpkg.json b/external_imported/vcpkg/ports/qtscxml/vcpkg.json index b32abdee6..ad42ddbae 100644 --- a/external_imported/vcpkg/ports/qtscxml/vcpkg.json +++ b/external_imported/vcpkg/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.2.4", + "version": "6.3.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtsensors/vcpkg.json b/external_imported/vcpkg/ports/qtsensors/vcpkg.json index 558c07d25..14359d2ea 100644 --- a/external_imported/vcpkg/ports/qtsensors/vcpkg.json +++ b/external_imported/vcpkg/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json index 060fe04e8..ceceb6578 100644 --- a/external_imported/vcpkg/ports/qtserialbus/vcpkg.json +++ b/external_imported/vcpkg/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.2.4", + "version": "6.3.2", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtserialport/vcpkg.json b/external_imported/vcpkg/ports/qtserialport/vcpkg.json index af1875ab8..957c59b1a 100644 --- a/external_imported/vcpkg/ports/qtserialport/vcpkg.json +++ b/external_imported/vcpkg/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json index c66a073f4..fe7cfc7a1 100644 --- a/external_imported/vcpkg/ports/qtshadertools/vcpkg.json +++ b/external_imported/vcpkg/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.2.4", + "version": "6.3.2", "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/external_imported/vcpkg/ports/qtsvg/vcpkg.json b/external_imported/vcpkg/ports/qtsvg/vcpkg.json index f540f8038..8c3cb4e52 100644 --- a/external_imported/vcpkg/ports/qtsvg/vcpkg.json +++ b/external_imported/vcpkg/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qttools/no_src_changes.patch b/external_imported/vcpkg/ports/qttools/no_src_changes.patch deleted file mode 100644 index 8b948c26a..000000000 --- a/external_imported/vcpkg/ports/qttools/no_src_changes.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20bd474..7b69743 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -187,13 +187,13 @@ endif() - if(WIN32) - file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE) -- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc -+ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - else() -- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc -+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - endif() --set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) -+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) - - # Tests - -@@ -218,7 +218,7 @@ if (BUILD_TESTING) - add_executable( - ${TEST_NAME} - ${TEST_LITEHTML} -- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -+ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc - ) - - set_target_properties(${TEST_NAME} PROPERTIES -@@ -243,7 +243,7 @@ if (BUILD_TESTING) - endif() - - # set(TEST_NAME ${PROJECT_NAME}_tests) --# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - # set_target_properties(${TEST_NAME} PROPERTIES - # CXX_STANDARD 11 - # C_STANDARD 99 diff --git a/external_imported/vcpkg/ports/qttools/portfile.cmake b/external_imported/vcpkg/ports/qttools/portfile.cmake index d0bf4c9de..b13766cef 100644 --- a/external_imported/vcpkg/ports/qttools/portfile.cmake +++ b/external_imported/vcpkg/ports/qttools/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES )#fix_static_build.patch) +set(${PORT}_PATCHES) #TODO check features and setup: (means force features!) @@ -77,52 +77,14 @@ elseif(VCPKG_TARGET_IS_OSX) list(APPEND TOOL_NAMES macdeployqt) endif() -### Download third_party modules -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML - URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF "${${PORT}_qlitehtml_REF}" - FETCH_REF master - HEAD_REF master -) -# port 'litehtml' is not in vcpkg! -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_LITEHTML - REPO litehtml/litehtml - REF "${${PORT}_litehtml_REF}" - SHA512 "${${PORT}_litehtml_HASH}" - HEAD_REF master - PATCHES no_src_changes.patch -) - -##### qt_install_submodule -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() -file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") -file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") - - -if(_qis_DISABLE_NINJA) - set(_opt DISABLE_NINJA) -endif() -qt_cmake_configure(${_opt} - OPTIONS ${FEATURE_OPTIONS} +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -qt_install_copyright("${SOURCE_PATH}") - -##### qt_install_submodule + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) if(VCPKG_TARGET_IS_OSX) set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app) @@ -134,14 +96,6 @@ if(VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6ToolsTools/Qt6ToolsToolsTargets-debug.cmake") -if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - file(READ "${configfile}" _contents) - string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") - file(WRITE "${configfile}" "${_contents}") -endif() - file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") list(LENGTH debug_dir debug_dir_elements) if(debug_dir_elements EQUAL 0) diff --git a/external_imported/vcpkg/ports/qttools/vcpkg.json b/external_imported/vcpkg/ports/qttools/vcpkg.json index 3532d7259..f19f23a42 100644 --- a/external_imported/vcpkg/ports/qttools/vcpkg.json +++ b/external_imported/vcpkg/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qttools/windeployqt.debug.bat b/external_imported/vcpkg/ports/qttools/windeployqt.debug.bat index d004e23f1..c0c41e34d 100644 --- a/external_imported/vcpkg/ports/qttools/windeployqt.debug.bat +++ b/external_imported/vcpkg/ports/qttools/windeployqt.debug.bat @@ -1,10 +1,10 @@ @echo off -setlocal +setlocal enabledelayedexpansion set mypath=%~dp0 set mypath=%mypath:~0,-1% -cd %mypath%\..\..\..\debug\bin -set BAKCD=%CD% -set PATH=%CD%;%PATH% +set BAKCD=!CD! +cd /D %mypath%\..\..\..\debug\bin +set PATH=!CD!;%PATH% "%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %* cd %BAKCD% -endlocal \ No newline at end of file +endlocal diff --git a/external_imported/vcpkg/ports/qttranslations/vcpkg.json b/external_imported/vcpkg/ports/qttranslations/vcpkg.json index c6fa365d6..4699899d0 100644 --- a/external_imported/vcpkg/ports/qttranslations/vcpkg.json +++ b/external_imported/vcpkg/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json index db0a9deb3..f898bf172 100644 --- a/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json +++ b/external_imported/vcpkg/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.2.4", + "version": "6.3.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtwayland/vcpkg.json b/external_imported/vcpkg/ports/qtwayland/vcpkg.json index d201b62b7..f9ae6ee2e 100644 --- a/external_imported/vcpkg/ports/qtwayland/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.2.4", + "version": "6.3.2", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json index 3dbef769a..e7cc923d5 100644 --- a/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtwebengine/0ce5e91.diff b/external_imported/vcpkg/ports/qtwebengine/0ce5e91.diff new file mode 100644 index 000000000..cf26bade1 --- /dev/null +++ b/external_imported/vcpkg/ports/qtwebengine/0ce5e91.diff @@ -0,0 +1,94 @@ +From 0ce5e91bdfa2cd7cac247911b9e8c4404c114937 Mon Sep 17 00:00:00 2001 +From: Peter Varga +Date: Thu, 21 Apr 2022 08:49:53 +0200 +Subject: [PATCH] Workaround MSVC2022 ICE in constexpr functions + +It happens around initialization of STL containers in a constexpr +function. In this case, aggregate initialization of std::array with +double braces seems to cause the crash. + +For some reason it doesn't seem to happen in 98-based. This workaround +can be reverted after Microsoft fixes the issue: +https://developercommunity.visualstudio.com/t/fatal-error-C1001:-Internal-compiler-err/1669485 + +Change-Id: I6bc2c71d328691cc74bc53c6d62f3d5df519b81e +Pick-to: 90-based +Fixes: QTBUG-101917 +Reviewed-by: Allan Sandfeld Jensen +--- + +diff --git a/chromium/base/hash/md5_constexpr_internal.h b/chromium/base/hash/md5_constexpr_internal.h +index b705bc8..5c9c004 100644 +--- a/chromium/base/hash/md5_constexpr_internal.h ++++ b/chromium/base/hash/md5_constexpr_internal.h +@@ -281,15 +281,63 @@ + return IntermediateDataToMD5Digest(ProcessMessage(data, n)); + } + +- static constexpr uint64_t Hash64(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return (static_cast(SwapEndian(intermediate.a)) << 32) | +- static_cast(SwapEndian(intermediate.b)); ++ static constexpr uint64_t Hash64(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return (static_cast(SwapEndian(intermediate0.a)) << 32) | ++ static_cast(SwapEndian(intermediate0.b)); + } + +- static constexpr uint32_t Hash32(const char* data, uint32_t n) { +- IntermediateData intermediate = ProcessMessage(data, n); +- return SwapEndian(intermediate.a); ++ static constexpr uint32_t Hash32(const char* message, uint32_t n) { ++ const uint32_t m = GetPaddedMessageLength(n); ++ IntermediateData intermediate0 = kInitialIntermediateData; ++ for (uint32_t offset = 0; offset < m; offset += 64) { ++ RoundData data = { ++ GetPaddedMessageWord(message, n, m, offset), ++ GetPaddedMessageWord(message, n, m, offset + 4), ++ GetPaddedMessageWord(message, n, m, offset + 8), ++ GetPaddedMessageWord(message, n, m, offset + 12), ++ GetPaddedMessageWord(message, n, m, offset + 16), ++ GetPaddedMessageWord(message, n, m, offset + 20), ++ GetPaddedMessageWord(message, n, m, offset + 24), ++ GetPaddedMessageWord(message, n, m, offset + 28), ++ GetPaddedMessageWord(message, n, m, offset + 32), ++ GetPaddedMessageWord(message, n, m, offset + 36), ++ GetPaddedMessageWord(message, n, m, offset + 40), ++ GetPaddedMessageWord(message, n, m, offset + 44), ++ GetPaddedMessageWord(message, n, m, offset + 48), ++ GetPaddedMessageWord(message, n, m, offset + 52), ++ GetPaddedMessageWord(message, n, m, offset + 56), ++ GetPaddedMessageWord(message, n, m, offset + 60)}; ++ IntermediateData intermediate1 = intermediate0; ++ for (uint32_t i = 0; i < 64; ++i) ++ intermediate1 = ApplyStep(i, data, intermediate1); ++ intermediate0 = Add(intermediate0, intermediate1); ++ } ++ return SwapEndian(intermediate0.a); + } + }; + diff --git a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake index 8b44f726a..0fcb8ab97 100644 --- a/external_imported/vcpkg/ports/qtwebengine/portfile.cmake +++ b/external_imported/vcpkg/ports/qtwebengine/portfile.cmake @@ -1,6 +1,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +#set(${PORT}_PATCHES 0ce5e91.diff) # ICE Workaround; Needs path adjustments + set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -44,8 +46,6 @@ endif() vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) -vcpkg_find_acquire_program(GPERF) -vcpkg_find_acquire_program(PYTHON2) #vcpkg_find_acquire_program(GN) # Qt builds its own internal version @@ -55,16 +55,18 @@ if(NOT NODEJS) message(FATAL_ERROR "node not found! Please install it via your system package manager!") endif() -get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${GPERF_DIR}") get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${BISON_DIR}") -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + +vcpkg_find_acquire_program(PYTHON3) +x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) + +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") +set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(WIN32) # WIN32 HOST probably has win_flex and win_bison! if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -75,12 +77,18 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison! endif() endif() -### Download third_party modules -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE - URL git://code.qt.io/qt/qtwebengine-chromium.git - REF "${${PORT}_chromium_REF}" -) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) +# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. +if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") + set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs + cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) + string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length_new) + if(buildtree_length_new GREATER 22) + message(FATAL_ERROR "Buildtree path is too long. Build will fail! Pass --x-buildtrees-root= to vcpkg!") + endif() + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") +endif() ##### qt_install_submodule set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) @@ -90,20 +98,12 @@ qt_download_submodule(PATCHES ${${PORT}_PATCHES}) if(QT_UPDATE_VERSION) return() endif() -if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") - file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") -endif() -if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") - file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") -endif() qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. OPTIONS ${FEATURE_OPTIONS} -DGPerf_EXECUTABLE=${GPERF} -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} - #-DGn_EXECUTABLE=${GN} - -DPython2_EXECUTABLE=${PYTHON2} -DNodejs_EXECUTABLE=${NODEJS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json index 6365ebc0f..7b7a621e0 100644 --- a/external_imported/vcpkg/ports/qtwebengine/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebengine/vcpkg.json @@ -1,11 +1,11 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, - "supports": "!static & !((arm | x86) & windows)", + "supports": "!static & !(x86 & windows)", "dependencies": [ { "name": "ffmpeg", @@ -23,6 +23,10 @@ "name": "glib", "platform": "!windows" }, + { + "name": "gperf", + "host": true + }, { "name": "harfbuzz", "platform": "!windows" @@ -103,6 +107,10 @@ "name": "snappy", "platform": "!windows" }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-nodejs", "host": true diff --git a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json index 953e5ebf4..33c774c35 100644 --- a/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/qtwebview/vcpkg.json b/external_imported/vcpkg/ports/qtwebview/vcpkg.json index bc94b7435..92468d439 100644 --- a/external_imported/vcpkg/ports/qtwebview/vcpkg.json +++ b/external_imported/vcpkg/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.2.4", + "version": "6.3.2", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/external_imported/vcpkg/ports/quantlib/portfile.cmake b/external_imported/vcpkg/ports/quantlib/portfile.cmake index 158dd4813..5599b6f77 100644 --- a/external_imported/vcpkg/ports/quantlib/portfile.cmake +++ b/external_imported/vcpkg/ports/quantlib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.25 - SHA512 9a08c3d825f85c93e7db74b31dc93d03d7ec487b7a09f86b6f3efb0404791e1b3e1ea19e06cea19fd04ab190d2e8eb7bad889660d47eb9988c36609967646aa3 + REF QuantLib-v1.27 + SHA512 c763e7083e1e832d39adb507cc6b34b1ad0a0b7f2b7ffe390428f93fb1df84fcbbf43bcb31dd2f2381da2ac563c88a10fbd932ea5155bd43c604025960039b58 HEAD_REF master ) @@ -22,9 +22,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME QuantLib CONFIG_PATH lib/cmake/QuantLib) vcpkg_copy_pdbs() -# Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + # Handle copyright -configure_file("${SOURCE_PATH}/LICENSE.TXT" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/quantlib/vcpkg.json b/external_imported/vcpkg/ports/quantlib/vcpkg.json index b30208740..b668af29f 100644 --- a/external_imported/vcpkg/ports/quantlib/vcpkg.json +++ b/external_imported/vcpkg/ports/quantlib/vcpkg.json @@ -1,9 +1,10 @@ { "name": "quantlib", - "version": "1.25", + "version": "1.27", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", - "supports": "!(windows & !static)", + "license": "BSD-3-Clause", + "supports": "!(windows & !staticcrt)", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/external_imported/vcpkg/ports/quazip/portfile.cmake b/external_imported/vcpkg/ports/quazip/portfile.cmake index 12a51a218..1f805f5dc 100644 --- a/external_imported/vcpkg/ports/quazip/portfile.cmake +++ b/external_imported/vcpkg/ports/quazip/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stachenov/quazip - REF v1.1 - SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c + REF v1.3 + SHA512 3861a9084059576ff2690e8b911394b0286a60542ab021a4cc588537a60ea3a186ed7903c76544698001fa383dfd0de96bdfed433abaefc44158d3b30ab16fe2 ) vcpkg_cmake_configure( @@ -10,7 +10,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.1) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.3) vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") diff --git a/external_imported/vcpkg/ports/quazip/vcpkg.json b/external_imported/vcpkg/ports/quazip/vcpkg.json index 0815c748d..61cd5cd68 100644 --- a/external_imported/vcpkg/ports/quazip/vcpkg.json +++ b/external_imported/vcpkg/ports/quazip/vcpkg.json @@ -1,9 +1,10 @@ { "name": "quazip", - "version": "1.1", + "version": "1.3", "port-version": 1, "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", + "license": "LGPL-2.1-or-later", "dependencies": [ "qt5-base", { diff --git a/external_imported/vcpkg/ports/quill/fix-c4189-warning.patch b/external_imported/vcpkg/ports/quill/fix-c4189-warning.patch deleted file mode 100644 index 55ae52fc3..000000000 --- a/external_imported/vcpkg/ports/quill/fix-c4189-warning.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/quill/CMakeLists.txt b/quill/CMakeLists.txt -index 76872c2..c173804 100644 ---- a/quill/CMakeLists.txt -+++ b/quill/CMakeLists.txt -@@ -148,6 +148,10 @@ if (QUILL_NO_EXCEPTIONS) - endif () - endif () - -+if (MSVC) -+ add_definitions(/wd4189) -+endif() -+ - # Add target sources - target_sources(${TARGET_NAME} PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) - diff --git a/external_imported/vcpkg/ports/quill/portfile.cmake b/external_imported/vcpkg/ports/quill/portfile.cmake index 3c5470d48..2d5208e5f 100644 --- a/external_imported/vcpkg/ports/quill/portfile.cmake +++ b/external_imported/vcpkg/ports/quill/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.6.3 - SHA512 e75aca827fe0833422da0d38df482cbc39db0e43dcc3cb791f3e2649f7022dcc448831a5ede85daf6feada60a2d5eaf312a3411abbba92fb9d76466336a7244d + REF v2.1.0 + SHA512 377e765d455cff729e8b5df6a1fcb28335c20259d8ff1b4ef3327f8640a7c69467147e39a9eab1c92097e04db3f732b9906e55167d5c9fd334e054b5eb5d320c HEAD_REF master - PATCHES - fix-c4189-warning.patch ) vcpkg_cmake_configure( @@ -19,6 +17,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/quill/bundled") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() diff --git a/external_imported/vcpkg/ports/quill/vcpkg.json b/external_imported/vcpkg/ports/quill/vcpkg.json index 350321f5c..88453614b 100644 --- a/external_imported/vcpkg/ports/quill/vcpkg.json +++ b/external_imported/vcpkg/ports/quill/vcpkg.json @@ -1,9 +1,9 @@ { "name": "quill", - "version-semver": "1.6.3", - "port-version": 4, + "version": "2.1.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", + "license": "MIT", "supports": "!(uwp | android)", "dependencies": [ "fmt", diff --git a/external_imported/vcpkg/ports/quirc/portfile.cmake b/external_imported/vcpkg/ports/quirc/portfile.cmake index 225479cd4..329856d51 100644 --- a/external_imported/vcpkg/ports/quirc/portfile.cmake +++ b/external_imported/vcpkg/ports/quirc/portfile.cmake @@ -8,19 +8,18 @@ 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() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/quirc/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/quirc/vcpkg.json b/external_imported/vcpkg/ports/quirc/vcpkg.json index 9297f7366..dbe9377df 100644 --- a/external_imported/vcpkg/ports/quirc/vcpkg.json +++ b/external_imported/vcpkg/ports/quirc/vcpkg.json @@ -1,6 +1,18 @@ { "name": "quirc", "version": "1.1", - "port-version": 2, - "description": "quirc is one of the C library available for scanning QR Codes" + "port-version": 3, + "description": "quirc is one of the C library available for scanning QR Codes", + "homepage": "https://github.com/dlbeer/quirc", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/random123/portfile.cmake b/external_imported/vcpkg/ports/random123/portfile.cmake new file mode 100644 index 000000000..31e0049ad --- /dev/null +++ b/external_imported/vcpkg/ports/random123/portfile.cmake @@ -0,0 +1,23 @@ +# Random123 - Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "DEShawResearch/random123" + REF "v1.14.0" + SHA512 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e + HEAD_REF "main" + ) + +# Copy the headers that define this package to the install location. +file(GLOB header_files + "${SOURCE_PATH}/include/Random123/*.h" + "${SOURCE_PATH}/include/Random123/*.hpp") +file(COPY ${header_files} + "${SOURCE_PATH}/include/Random123/features" + "${SOURCE_PATH}/include/Random123/conventional" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/Random123") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/external_imported/vcpkg/ports/random123/vcpkg.json b/external_imported/vcpkg/ports/random123/vcpkg.json new file mode 100644 index 000000000..dd5bf9db5 --- /dev/null +++ b/external_imported/vcpkg/ports/random123/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "random123", + "version": "1.14.0", + "description": "Random123 is a library of 'counter-based' random number generators (CBRNGs), in which the Nth random number can be obtained by applying a stateless mixing function to N instead of the conventional approach of using N iterations of a stateful transformation.", + "homepage": "http://www.deshawresearch.com/resources_random123.html", + "license": "BSD-3-Clause" +} diff --git a/external_imported/vcpkg/ports/range-v3/portfile.cmake b/external_imported/vcpkg/ports/range-v3/portfile.cmake index 86b0340ab..909b704a4 100644 --- a/external_imported/vcpkg/ports/range-v3/portfile.cmake +++ b/external_imported/vcpkg/ports/range-v3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 83783f578e0e6666d68a3bf17b0038a80e62530e # 2021-11-2 - SHA512 f0953e3c4e25ddf2f94b583080b8966faf1973243e01f77d23f8c04c2e0352003e4bd12490a46176472ad46c80dec99a1a8880a9bde8006eb01e3c3d8eee2fb4 + REF a81477931a8aa2ad025c6bda0609f38e09e4d7ec # Dude, where's my bored ape? (0.12.0) + SHA512 e58030bc7c281e90298025dc21fed9bdabda358cd847b59e5b58feb3e0b93fcf6398e3b8e2912e45deeed67f454c08d4fc4df7f8d0dc378b437612f15c0832fe HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/range-v3/vcpkg.json b/external_imported/vcpkg/ports/range-v3/vcpkg.json index f29c55497..c56f142ed 100644 --- a/external_imported/vcpkg/ports/range-v3/vcpkg.json +++ b/external_imported/vcpkg/ports/range-v3/vcpkg.json @@ -1,8 +1,9 @@ { "name": "range-v3", - "version-date": "2021-11-02", + "version": "0.12.0", "description": "Range library for C++11/14/17/20.", "homepage": "https://github.com/ericniebler/range-v3", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/rapidcsv/portfile.cmake b/external_imported/vcpkg/ports/rapidcsv/portfile.cmake index 94ebf914a..a2e34640c 100644 --- a/external_imported/vcpkg/ports/rapidcsv/portfile.cmake +++ b/external_imported/vcpkg/ports/rapidcsv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO d99kris/rapidcsv - REF v8.53 - SHA512 64a6100f1adf90eeaa4a513fbcf4ffd611a40b1f41b6e88eeda6c73c360e26c5a7cc6fc68a65bb2dff5f72ba663a976d2922e3114468dbd8c291c7eef211ae1f + REF v8.64 + SHA512 37424fda3b706a1ba3c29d836f240b0a2c3335095da629cfe79bb58a78fc7d8b172e0309447e9ec75f7dd21925a55b5ca96b673a9fff36f0078b948330a42801 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/rapidcsv/vcpkg.json b/external_imported/vcpkg/ports/rapidcsv/vcpkg.json index 79268aa98..5e12b08f4 100644 --- a/external_imported/vcpkg/ports/rapidcsv/vcpkg.json +++ b/external_imported/vcpkg/ports/rapidcsv/vcpkg.json @@ -1,8 +1,9 @@ { "name": "rapidcsv", - "version": "8.53", + "version": "8.64", "description": "Rapidcsv is a C++ header-only library for CSV parsing.", "homepage": "https://github.com/d99kris/rapidcsv/", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/rapidjson/portfile.cmake b/external_imported/vcpkg/ports/rapidjson/portfile.cmake index 9a3ed57f8..232fe2203 100644 --- a/external_imported/vcpkg/ports/rapidjson/portfile.cmake +++ b/external_imported/vcpkg/ports/rapidjson/portfile.cmake @@ -2,8 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson - REF ce81bc9edfe773667a7a4454ba81dac72ed4364c # accessed on 2020-09-14 - SHA512 a1bbc5668fca9ee34b05ae424a5177b66beaf7b3b4cdfbb3cb067fc58ce91717b4030e2c268ad32e4aa4a7ef59ab5e3aae05ff71d0d91d463eafa7d2e077df07 + REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28 + SHA512 0d7d751179abdaa6ebf6167d522651a2d13bc024d20c7e3f775c7397a8aab4cd866a6c91a55521ad7847e910822fcf982625c7308c74f5df663e6fd81336c9fc + FILE_DISAMBIGUATOR 2 HEAD_REF master ) @@ -11,21 +12,32 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DRAPIDJSON_BUILD_DOC:BOOL=OFF - -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF - -DRAPIDJSON_BUILD_TESTS:BOOL=OFF - -DCMAKE_INSTALL_DIR:STRING=cmake + -DRAPIDJSON_BUILD_DOC=OFF + -DRAPIDJSON_BUILD_EXAMPLES=OFF + -DRAPIDJSON_BUILD_TESTS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RapidJSON) +endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") +vcpkg_fixup_pkgconfig() -file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" _contents) string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}") string(REPLACE "set( RapidJSON_SOURCE_DIR \"${SOURCE_PATH}\")" "" _contents "${_contents}") string(REPLACE "set( RapidJSON_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\")" "" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") +string(REPLACE "\${RapidJSON_CMAKE_DIR}/../../../include" "\${RapidJSON_CMAKE_DIR}/../../include" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/rapidjson/vcpkg.json b/external_imported/vcpkg/ports/rapidjson/vcpkg.json index 9c0f7d6dc..c62de944b 100644 --- a/external_imported/vcpkg/ports/rapidjson/vcpkg.json +++ b/external_imported/vcpkg/ports/rapidjson/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rapidjson", - "version-date": "2020-09-14", - "port-version": 2, + "version-date": "2022-06-28", + "port-version": 3, "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/raylib/portfile.cmake b/external_imported/vcpkg/ports/raylib/portfile.cmake index 96a0298d4..4b7eed067 100644 --- a/external_imported/vcpkg/ports/raylib/portfile.cmake +++ b/external_imported/vcpkg/ports/raylib/portfile.cmake @@ -17,8 +17,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib - REF 4.0.0 - SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 + REF bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa #v4.2.0 + SHA512 f6b1738d96fef89059062f570f67aaa8b143ccfbee78abfe5fbb25083371a4c432f3d1d0d357e4b475b4b72a6db7823c2341b70ac947759603b033c2b0acec47 HEAD_REF master PATCHES ${patches} ) @@ -42,7 +42,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF - -DBUILD_GAMES=OFF -DSHARED=${SHARED} -DSTATIC=${STATIC} -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows diff --git a/external_imported/vcpkg/ports/raylib/vcpkg.json b/external_imported/vcpkg/ports/raylib/vcpkg.json index 348eb943e..467dbf5ef 100644 --- a/external_imported/vcpkg/ports/raylib/vcpkg.json +++ b/external_imported/vcpkg/ports/raylib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "raylib", - "version-semver": "4.0.0", - "port-version": 3, + "version-semver": "4.2.0", "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", diff --git a/external_imported/vcpkg/ports/rbdl-orb/portfile.cmake b/external_imported/vcpkg/ports/rbdl-orb/portfile.cmake index 17c841268..9aefc8241 100644 --- a/external_imported/vcpkg/ports/rbdl-orb/portfile.cmake +++ b/external_imported/vcpkg/ports/rbdl-orb/portfile.cmake @@ -1,45 +1 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright") - message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.") -endif() - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ORB-HD/rbdl-orb - REF a2e5428729b636c6232c3b90e4ddac80f7d42b1a - SHA512 2a10b3a7ac4e49b0ac5e7204f419a132bef7431c3ba55a72a8d10f9fea1972419682367bda32506b8daf58fc65405c7f3b7fe11fe661fc3dc6c98a3206cf1253 - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH PARSER_SOURCE_PATH - REPO ORB-HD/URDF_Parser - REF 8fcc3174743cf3e7561ffb6625524f8133161df4 - SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f -) -if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") - file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") - file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DRBDL_BUILD_STATIC=${RBDL_STATIC} - -DRBDL_BUILD_ADDON_LUAMODEL=ON - -DRBDL_BUILD_ADDON_GEOMETRY=ON - -DRBDL_BUILD_ADDON_URDFREADER=ON - -DRBDL_BUILD_EXECUTABLES=OFF - -DRBDL_VCPKG_BUILD=ON -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/rbdl-orb/vcpkg.json b/external_imported/vcpkg/ports/rbdl-orb/vcpkg.json index 0b96b7d6f..acbe19c1d 100644 --- a/external_imported/vcpkg/ports/rbdl-orb/vcpkg.json +++ b/external_imported/vcpkg/ports/rbdl-orb/vcpkg.json @@ -1,20 +1,10 @@ { "name": "rbdl-orb", - "version": "3.1.2", - "port-version": 1, + "version": "3.2.0", + "port-version": 2, "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ - "boost", - "eigen3", - "lua", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "rbdl" ] } diff --git a/external_imported/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff b/external_imported/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff deleted file mode 100644 index 8aaf4d384..000000000 --- a/external_imported/vcpkg/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2db532da..42c004380 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,6 +112,10 @@ SET ( RBDL_SOURCES - src/Kinematics.cc - ) - -+IF (MSVC) -+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") -+ENDIF (MSVC) -+ - IF (MSVC AND NOT RBDL_BUILD_STATIC) - MESSAGE (FATAL_ERROR, "Compiling RBDL as a DLL currently not supported. Please enable RBDL_BUILD_STATIC.") - ENDIF (MSVC AND NOT RBDL_BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/rbdl/portfile.cmake b/external_imported/vcpkg/ports/rbdl/portfile.cmake index be6a63c81..946c4873d 100644 --- a/external_imported/vcpkg/ports/rbdl/portfile.cmake +++ b/external_imported/vcpkg/ports/rbdl/portfile.cmake @@ -1,23 +1,33 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl-orb/copyright") - message(FATAL_ERROR "${PORT} conflict with rbdl-orb, please remove rbdl-orb before install ${PORT}.") -endif() - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) -vcpkg_from_github(ARCHIVE - OUT_SOURCE_PATH SOURCE_PATH - REPO rbdl/rbdl - REF v2.6.0 - SHA512 7b5fd03c0090277f295a28a1ff0542cd8cff76dda4379b3edc61ca3d868bf77d8b4882f81865fdffd0cf756c613fe55238b29a83bc163fc32aa94aa9d5781480 - HEAD_REF master - PATCHES 001_x64_number_of_sections_exceeded_in_object_file_patch.diff +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rbdl/rbdl + REF 6e92742d469efaf59ec2503882693b621f41eca8 + SHA512 d266732fe50a4cd5c55f9ff838649157e48994744f39d9eda9feee640dd400a5bb35ca620386ca65c9f1cdcb1adc923c34809dcb025bd6fc052baa9df57a4a6f + HEAD_REF master ) +vcpkg_from_github( + OUT_SOURCE_PATH PARSER_SOURCE_PATH + REPO ORB-HD/URDF_Parser + REF 8fcc3174743cf3e7561ffb6625524f8133161df4 + SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f +) +if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") + file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} + -DRBDL_BUILD_ADDON_LUAMODEL=ON + -DRBDL_BUILD_ADDON_GEOMETRY=ON + -DRBDL_BUILD_ADDON_URDFREADER=ON + -DRBDL_BUILD_EXECUTABLES=OFF + -DRBDL_VCPKG_BUILD=ON ) vcpkg_cmake_install() @@ -25,7 +35,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/rbdl/vcpkg.json b/external_imported/vcpkg/ports/rbdl/vcpkg.json index 96a3389ae..600968792 100644 --- a/external_imported/vcpkg/ports/rbdl/vcpkg.json +++ b/external_imported/vcpkg/ports/rbdl/vcpkg.json @@ -1,14 +1,20 @@ { "name": "rbdl", - "version": "2.6.0", - "port-version": 2, + "version": "3.2.0", + "port-version": 4, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ + "boost", "eigen3", + "lua", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/readline-unix/portfile.cmake b/external_imported/vcpkg/ports/readline-unix/portfile.cmake index b7422e53a..8951f96ed 100644 --- a/external_imported/vcpkg/ports/readline-unix/portfile.cmake +++ b/external_imported/vcpkg/ports/readline-unix/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_configure_make( vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/readline-unix/bin" "${CURRENT_PACKAGES_DIR}/tools/readline-unix/debug/bin") vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/readline-unix/vcpkg.json b/external_imported/vcpkg/ports/readline-unix/vcpkg.json index 6d3b9382b..721acc13b 100644 --- a/external_imported/vcpkg/ports/readline-unix/vcpkg.json +++ b/external_imported/vcpkg/ports/readline-unix/vcpkg.json @@ -1,8 +1,9 @@ { "name": "readline-unix", "version": "8.1", - "port-version": 1, + "port-version": 2, "description": "Implementation of readline for unix", + "license": "GPL-3.0-or-later", "supports": "!windows", "dependencies": [ "ncurses" diff --git a/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt b/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt index ac062d0dc..ae560029d 100644 --- a/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt +++ b/external_imported/vcpkg/ports/readline-win32/CMakeLists.txt @@ -50,7 +50,17 @@ add_library(readline mbutil.c support/wcwidth.c) +file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") +install(FILES ${headers} DESTINATION include/readline) + +target_include_directories(readline PUBLIC $ $) + install(TARGETS readline - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + EXPORT unofficial-readline-win32-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(EXPORT unofficial-readline-win32-config + NAMESPACE unofficial::readline-win32:: + DESTINATION share/unofficial-readline-win32) diff --git a/external_imported/vcpkg/ports/readline-win32/portfile.cmake b/external_imported/vcpkg/ports/readline-win32/portfile.cmake index c6fa9435f..a3641df86 100644 --- a/external_imported/vcpkg/ports/readline-win32/portfile.cmake +++ b/external_imported/vcpkg/ports/readline-win32/portfile.cmake @@ -6,21 +6,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -# Copy headers -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/readline) -file(GLOB headers "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/*.h") -file(COPY ${headers} DESTINATION ${CURRENT_PACKAGES_DIR}/include/readline) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-readline-win32) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/readline-win32/vcpkg.json b/external_imported/vcpkg/ports/readline-win32/vcpkg.json index 79e3a7f7d..61bf5f62a 100644 --- a/external_imported/vcpkg/ports/readline-win32/vcpkg.json +++ b/external_imported/vcpkg/ports/readline-win32/vcpkg.json @@ -1,8 +1,19 @@ { "name": "readline-win32", "version": "5.0", - "port-version": 4, + "port-version": 5, "description": "Implementation of readline for Windows Desktop", - "homepage": "https://github.com/lltcggie", - "supports": "windows & !uwp" + "homepage": "https://github.com/lltcggie/readline", + "license": null, + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/readosm/vcpkg.json b/external_imported/vcpkg/ports/readosm/vcpkg.json index f93c64336..e2b35c6b9 100644 --- a/external_imported/vcpkg/ports/readosm/vcpkg.json +++ b/external_imported/vcpkg/ports/readosm/vcpkg.json @@ -1,9 +1,11 @@ { "name": "readosm", "version-string": "1.1.0a", - "port-version": 2, + "port-version": 3, "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", + "license": "MPL-1.1", + "supports": "!uwp", "dependencies": [ "expat", { diff --git a/external_imported/vcpkg/ports/realsense2/portfile.cmake b/external_imported/vcpkg/ports/realsense2/portfile.cmake index e9ab6c89b..30c26ff17 100644 --- a/external_imported/vcpkg/ports/realsense2/portfile.cmake +++ b/external_imported/vcpkg/ports/realsense2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.50.0 - SHA512 ede964a5d5d7c70ff69b9d19e72ed2572f6d28c922cccae6d805ce72115b9d09d3b57d83163192aacc45856fe145d745472df4ca0053a41c65c175434709e3f0 + REF v2.51.1 + SHA512 e03a0188f11634ba645f321f190758807670fcaeaa2695c1d1ddc4585e43c2b00ca42b4e820b07f5e0c1ee7c026347b3802d4a86717a3d0500c359c08494aa32 HEAD_REF master PATCHES fix_openni2.patch diff --git a/external_imported/vcpkg/ports/realsense2/vcpkg.json b/external_imported/vcpkg/ports/realsense2/vcpkg.json index 4414ef1af..61336816b 100644 --- a/external_imported/vcpkg/ports/realsense2/vcpkg.json +++ b/external_imported/vcpkg/ports/realsense2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "realsense2", - "version": "2.50.0", - "port-version": 1, + "version": "2.51.1", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/recast/portfile.cmake b/external_imported/vcpkg/ports/recast/portfile.cmake index 11484caa1..ebace1d11 100644 --- a/external_imported/vcpkg/ports/recast/portfile.cmake +++ b/external_imported/vcpkg/ports/recast/portfile.cmake @@ -11,8 +11,7 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() @@ -20,6 +19,6 @@ 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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/recast/vcpkg.json b/external_imported/vcpkg/ports/recast/vcpkg.json index 5abe9f93b..7163e255a 100644 --- a/external_imported/vcpkg/ports/recast/vcpkg.json +++ b/external_imported/vcpkg/ports/recast/vcpkg.json @@ -1,9 +1,10 @@ { "name": "recast", "version": "1.5.1", - "port-version": 4, + "port-version": 5, "description": "Navigation-mesh Toolset for Games", "homepage": "https://github.com/recastnavigation/recastnavigation", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch b/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch new file mode 100644 index 000000000..0990debe9 --- /dev/null +++ b/external_imported/vcpkg/ports/redis-plus-plus/fix-dependency-libuv.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e85a158..e67681c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,8 +30,8 @@ if(REDIS_PLUS_PLUS_BUILD_ASYNC) + message(STATUS "redis-plus-plus build async interface with libuv") + + # libuv dependency +- find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h) +- find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv) ++ find_package(unofficial-libuv CONFIG REQUIRED) ++ set(REDIS_PLUS_PLUS_ASYNC_LIB unofficial::libuv::libuv) + else() + message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC") + endif() +@@ -150,7 +150,6 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) + + if(REDIS_PLUS_PLUS_BUILD_ASYNC) + target_include_directories(${STATIC_LIB} PUBLIC $) +- target_include_directories(${STATIC_LIB} PUBLIC $) + if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost") + target_include_directories(${STATIC_LIB} SYSTEM PUBLIC $) + endif() diff --git a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake index 93ee71b58..0853be1a9 100644 --- a/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake +++ b/external_imported/vcpkg/ports/redis-plus-plus/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-ws2-linking-windows.patch fix-conversion.patch + fix-dependency-libuv.patch ) if("cxx17" IN_LIST FEATURES) @@ -15,6 +16,14 @@ else() set(REDIS_PLUS_PLUS_CXX_STANDARD 11) endif() +set(EXTRA_OPT "") +if ("async" IN_LIST FEATURES) + list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_BUILD_ASYNC="libuv") +endif() +if ("async-std" IN_LIST FEATURES) + list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_ASYNC_FUTURE="std") +endif() + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_SHARED) @@ -26,6 +35,7 @@ vcpkg_cmake_configure( -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED} -DREDIS_PLUS_PLUS_BUILD_TEST=OFF -DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD} + ${EXTRA_OPT} ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json index 769edb78d..649fc686a 100644 --- a/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json +++ b/external_imported/vcpkg/ports/redis-plus-plus/vcpkg.json @@ -1,8 +1,10 @@ { "name": "redis-plus-plus", "version-semver": "1.3.2", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", + "license": "Apache-2.0", "dependencies": [ "hiredis", { @@ -15,6 +17,24 @@ } ], "features": { + "async": { + "description": "Build with async", + "dependencies": [ + "libuv" + ] + }, + "async-std": { + "description": "Build async with std::future", + "dependencies": [ + { + "name": "redis-plus-plus", + "default-features": false, + "features": [ + "async" + ] + } + ] + }, "cxx17": { "description": "Build redis-plus-plus with cxx 17 standard" } diff --git a/external_imported/vcpkg/ports/refl-cpp/portfile.cmake b/external_imported/vcpkg/ports/refl-cpp/portfile.cmake index ab90b3e5b..3ef302408 100644 --- a/external_imported/vcpkg/ports/refl-cpp/portfile.cmake +++ b/external_imported/vcpkg/ports/refl-cpp/portfile.cmake @@ -1,10 +1,9 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF v0.12.2 - SHA512 a124f12f2a491b3f2ea74bcf3b8cd3e14f1a4aa5ede105edbed90c3329af7d7fffa5c7a287f2e1e6079d9f0fad34190887700ae20a7d15f00299526317b41137 + REF ce47c1355219f3b9af56ae91d997daf2b1555d97 #v0.12.3 + SHA512 f73e542a9ee00d677e2445c148b732cbdf6247adc1f4f412ad8e9587c5971b3cb02b39b15cdb9b0788f53e9efea6c5a485367505ecb569a367be012f6246ea92 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/refl-cpp/vcpkg.json b/external_imported/vcpkg/ports/refl-cpp/vcpkg.json index 591cab09b..88defcfdd 100644 --- a/external_imported/vcpkg/ports/refl-cpp/vcpkg.json +++ b/external_imported/vcpkg/ports/refl-cpp/vcpkg.json @@ -1,6 +1,8 @@ { "name": "refl-cpp", - "version": "0.12.2", + "version": "0.12.3", + "port-version": 1, "description": "Static reflection for C++17 (compile-time enumeration, attributes, proxies, overloads, template functions, metaprogramming).", - "homepage": "https://github.com/veselink1/refl-cpp" + "homepage": "https://github.com/veselink1/refl-cpp", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/rendergraph/portfile.cmake b/external_imported/vcpkg/ports/rendergraph/portfile.cmake index c94a69591..2869a1f69 100644 --- a/external_imported/vcpkg/ports/rendergraph/portfile.cmake +++ b/external_imported/vcpkg/ports/rendergraph/portfile.cmake @@ -1,24 +1,24 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/RenderGraph - REF 602d8b6f1f027cea2173be16de6ff30d5d8f79e5 + REF 13a196fc91df174290c88b2d3ddca93974abd004 HEAD_REF master - SHA512 4c57983febad7188a69c8fd214e185e62fbab04b926f3efee97bbf3e70387ab6f742b6f62b0a8bf3dde63c174415ab5a793abf775cd4eee37864efd6f1e06d2b + SHA512 cd3b2ce33d799488ce5beacad37ef36bcbe8e597e39f5656e1e54c7c1c634b77e1ce43b64ea6598beb942d78afb1a4ca286bcc7052dac0ba62385fe274ae4393 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + REF 9fbaae40ccdc92f86989dc6875f362e7943b6a94 HEAD_REF master - SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 + SHA512 dada8ac1f9676c60f1ff5a09a9f788eb8d85eaca450407e4bf0100fbec87228f99cf66cb23de9c9358dda72c426655814cbd1ea90360ca0c63e7660c15aff22b ) -get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) -if (EXISTS ${SRC_PATH}/CMake) - file(REMOVE_RECURSE ${SRC_PATH}/CMake) +get_filename_component(SRC_PATH "${CMAKE_SOURCE_PATH}" DIRECTORY) +if (EXISTS "${SRC_PATH}/CMake") + file(REMOVE_RECURSE "${SRC_PATH}/CMake") endif() -file(RENAME ${CMAKE_SOURCE_PATH} ${SRC_PATH}/CMake) -set(CMAKE_SOURCE_PATH ${SRC_PATH}/CMake) -file(COPY ${CMAKE_SOURCE_PATH} DESTINATION ${SOURCE_PATH}) +file(RENAME "${CMAKE_SOURCE_PATH}" "${SRC_PATH}/CMake") +set(CMAKE_SOURCE_PATH "${SRC_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}" DESTINATION "${SOURCE_PATH}") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/external_imported/vcpkg/ports/rendergraph/vcpkg.json b/external_imported/vcpkg/ports/rendergraph/vcpkg.json index 8a6094b01..e588873aa 100644 --- a/external_imported/vcpkg/ports/rendergraph/vcpkg.json +++ b/external_imported/vcpkg/ports/rendergraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rendergraph", - "version": "1.0.0", + "version": "1.1.0", "description": "Vulkan render graph implementation.", "homepage": "https://github.com/DragonJoker/RenderGraph", "license": "MIT", diff --git a/external_imported/vcpkg/ports/restinio/portfile.cmake b/external_imported/vcpkg/ports/restinio/portfile.cmake index 2b13c4834..5b8feba26 100644 --- a/external_imported/vcpkg/ports/restinio/portfile.cmake +++ b/external_imported/vcpkg/ports/restinio/portfile.cmake @@ -1,18 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio - REF 20140bcecaec6f44ad5a8f68efcd8b44e1375604 # v.0.6.14 - SHA512 e4654342831cb5c9086b60b22a7a15dd68a6769e28936576a1ff61352ea204f8e171bd446d002cefb514fd0cc4842878f23d5d51bc0da48c6224b96e4a0f3b14 + REF a5b668560138da42158511880470b19988566568 # v.0.6.17 + SHA512 fc3cdab9c240ba30b5f4b800ec452442a38db93936d3f7557255e6e7e3176217413fa421afec8b155cfb498df5ca9fc48a74a8e9bf1903aa31c9824d26d9618c ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/vcpkg - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}/vcpkg" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") # 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/external_imported/vcpkg/ports/restinio/vcpkg.json b/external_imported/vcpkg/ports/restinio/vcpkg.json index 5cf1ad298..41353f5e2 100644 --- a/external_imported/vcpkg/ports/restinio/vcpkg.json +++ b/external_imported/vcpkg/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version": "0.6.14", + "version": "0.6.17", "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/rhash/CMakeLists.txt b/external_imported/vcpkg/ports/rhash/CMakeLists.txt index e3a088170..3d4dd189b 100644 --- a/external_imported/vcpkg/ports/rhash/CMakeLists.txt +++ b/external_imported/vcpkg/ports/rhash/CMakeLists.txt @@ -8,7 +8,19 @@ add_definitions(-DRHASH_XVERSION="${RHASH_XVERSION}") add_library(rhash ${RHASH_SOURCES}) set_target_properties(rhash PROPERTIES COMPILE_DEFINITIONS "IN_RHASH" DEFINE_SYMBOL "RHASH_EXPORTS") -install(TARGETS rhash RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) +target_include_directories(rhash INTERFACE $) + +install(TARGETS rhash EXPORT unofficial-rhash-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-rhash-config + FILE unofficial-rhash-config.cmake + NAMESPACE unofficial::rhash:: + DESTINATION share/unofficial-rhash +) if(NOT RHASH_SKIP_HEADERS) install(FILES rhash.h rhash_torrent.h DESTINATION include) diff --git a/external_imported/vcpkg/ports/rhash/portfile.cmake b/external_imported/vcpkg/ports/rhash/portfile.cmake index d80f7fce6..fe40f0e84 100644 --- a/external_imported/vcpkg/ports/rhash/portfile.cmake +++ b/external_imported/vcpkg/ports/rhash/portfile.cmake @@ -1,22 +1,22 @@ -set(RHASH_XVERSION 1.4.0) +set(RHASH_XVERSION 1.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF df0c969966b5da10f2db5060cf329790db95080e # v1.4.0 - SHA512 eebd5872f5d40d5ef5b7fe857ff3099c3b60e37cedaacf7ae8da63bd18790a16546de1809fa9f8e4fa7eef178121051b267fedd5d237135b80201f8609d613b6 + REF 02c8b1dbae01c8d56613b6a3034c3698f94a52be # v1.4.2 + SHA512 4c1d0a91a758ba85bc9ea194cf148834d6a0ebd849ed5384444798c522723ad78c3eedf65e7460fba61989a69b2c0f9a0f12bd6583381c544778c4b1c199a4ba HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/librhash") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/librhash - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/librhash" OPTIONS_DEBUG -DRHASH_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-rhash) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/rhash/vcpkg.json b/external_imported/vcpkg/ports/rhash/vcpkg.json index 252e0b0cf..0e489e903 100644 --- a/external_imported/vcpkg/ports/rhash/vcpkg.json +++ b/external_imported/vcpkg/ports/rhash/vcpkg.json @@ -1,8 +1,19 @@ { "name": "rhash", - "version": "1.4.0", - "port-version": 2, + "version": "1.4.2", + "port-version": 1, "description": "C library for computing a wide variety of hash sums", "homepage": "https://github.com/rhash/RHash", - "supports": "!uwp" + "license": "0BSD", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/rioki-glow/portfile.cmake b/external_imported/vcpkg/ports/rioki-glow/portfile.cmake new file mode 100644 index 000000000..c7332260d --- /dev/null +++ b/external_imported/vcpkg/ports/rioki-glow/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/glow + REF v0.2.0 + SHA512 ff81b56ce8bbceb5119c5cf48764cc1978bb0d3c4cddccc85ef0d3f7c85188c1dab53e083e09509d6ca96e4ac30ba277fc6915ba9ae388422c35cc8cd08c3978 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "rioki_glow") +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/external_imported/vcpkg/ports/rioki-glow/vcpkg.json b/external_imported/vcpkg/ports/rioki-glow/vcpkg.json new file mode 100644 index 000000000..d72dc4351 --- /dev/null +++ b/external_imported/vcpkg/ports/rioki-glow/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rioki-glow", + "version-semver": "0.2.0", + "description": "OpenGL Object Wrapper", + "homepage": "https://github.com/rioki/glow", + "license": "MIT", + "dependencies": [ + "glew", + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/rmlui/portfile.cmake b/external_imported/vcpkg/ports/rmlui/portfile.cmake index e90a48cc9..551393904 100644 --- a/external_imported/vcpkg/ports/rmlui/portfile.cmake +++ b/external_imported/vcpkg/ports/rmlui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mikke89/RmlUi - REF 4.3 - SHA512 70ceefb8ff9a62ef2be2271a3625d0d3ea411c097776fdfd8f469d462eb3a04514cb320c1f1296e7f1e49e7a89562498255976d3bb7d2317c0ad080dbb8ce542 + REF 4.4 + SHA512 b0c0a4c6cbc6892fe2ae5bbed21b672b7ec842de04347341925bd34712a37c84da4589578c6fbf1ab4ce8137b5530244f545d7c5bc1fbbd7ffa54eb83a6952d4 HEAD_REF master PATCHES add-robin-hood.patch diff --git a/external_imported/vcpkg/ports/rmlui/vcpkg.json b/external_imported/vcpkg/ports/rmlui/vcpkg.json index 03cbc9960..6396b098b 100644 --- a/external_imported/vcpkg/ports/rmlui/vcpkg.json +++ b/external_imported/vcpkg/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "4.3", + "version": "4.4", "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/external_imported/vcpkg/ports/roaring/portfile.cmake b/external_imported/vcpkg/ports/roaring/portfile.cmake index 820e6f5db..e058a246b 100644 --- a/external_imported/vcpkg/ports/roaring/portfile.cmake +++ b/external_imported/vcpkg/ports/roaring/portfile.cmake @@ -5,27 +5,26 @@ endif () vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RoaringBitmap/CRoaring - REF ac3eaf56af8691374b63e53e842feff0322169f0 - SHA512 db10331559df1503bcd25f7f5cab1fdf6b29984634dbfd54289cd7750032a1dd25cd0b57b490cac3d0d3fd5bc785730617536a7162c6e59f66fadb77f972b1c4 + REF v0.7.1 + SHA512 1d49da4e5b5ed0726feaf3608488e24f13c31358d1a72c7d0086fb6210313f73164745e0d1b616e8930073bbe259f7e1ac09fc97473b659694248f627c762f02 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC} -DENABLE_ROARING_TESTS=OFF ) -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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/external_imported/vcpkg/ports/roaring/vcpkg.json b/external_imported/vcpkg/ports/roaring/vcpkg.json index 598893916..dfbe9bed3 100644 --- a/external_imported/vcpkg/ports/roaring/vcpkg.json +++ b/external_imported/vcpkg/ports/roaring/vcpkg.json @@ -1,6 +1,17 @@ { "name": "roaring", - "version-string": "2019-03-05", - "port-version": 3, - "description": "A better compressed bitset in C (and C++)" + "version": "0.7.1", + "description": "A better compressed bitset in C (and C++)", + "homepage": "https://github.com/RoaringBitmap/CRoaring", + "license": "Apache-2.0 OR MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/robin-map/portfile.cmake b/external_imported/vcpkg/ports/robin-map/portfile.cmake index 209bda9fc..ed436d29b 100644 --- a/external_imported/vcpkg/ports/robin-map/portfile.cmake +++ b/external_imported/vcpkg/ports/robin-map/portfile.cmake @@ -1,18 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map - REF v0.6.3 - SHA512 485557f300d33bda62bb8accdf246819ee8ffe956bc022e7ddca54ff6ad1a9fdb8db8d80690add3ef238e834d1eb8e2905920cb0a0674e7df010f6946d01297b + REF v1.0.1 + SHA512 5741049287fdb9c3316e1eb84b99343efc7b35f492e1db8166d65c2d16c7905f51b11cf164bedae9e44d4b6000bbea3c49012acf725a977e665a8dc23e89b1fb HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tsl-robin-map) +vcpkg_cmake_config_fixup(PACKAGE_NAME tsl-robin-map CONFIG_PATH share/cmake/tsl-robin-map) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -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/external_imported/vcpkg/ports/robin-map/vcpkg.json b/external_imported/vcpkg/ports/robin-map/vcpkg.json index b200ae5c4..6e6b2c585 100644 --- a/external_imported/vcpkg/ports/robin-map/vcpkg.json +++ b/external_imported/vcpkg/ports/robin-map/vcpkg.json @@ -1,9 +1,10 @@ { "name": "robin-map", - "version-semver": "0.6.3", + "version-semver": "1.0.1", "port-version": 1, "description": "A C++ implementation of a fast hash map and hash set using robin hood hashing", "homepage": "https://github.com/Tessil/robin-map", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/rsig/portfile.cmake b/external_imported/vcpkg/ports/rsig/portfile.cmake new file mode 100644 index 000000000..bee4230d4 --- /dev/null +++ b/external_imported/vcpkg/ports/rsig/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/rsig + REF v0.1.1 + SHA512 1b14a543d55086da5cb678b1654267b4e7c54c7b6ef1d3b65a19ee72c362b62ecdf456c2bea8f19aaec1bee8c30b32d5d79e7ed19725d7fe26204874d063175c + ) + +file(INSTALL ${SOURCE_PATH}/rsig/rsig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/rsig) + +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/external_imported/vcpkg/ports/rsig/usage b/external_imported/vcpkg/ports/rsig/usage new file mode 100644 index 000000000..918026fa1 --- /dev/null +++ b/external_imported/vcpkg/ports/rsig/usage @@ -0,0 +1,4 @@ +The package rsig is header only and can be used from CMake via: + + find_path(RSIG_INCLUDE_DIRS "rsig/rsig.h") + target_include_directories(main PRIVATE ${RSIG_INCLUDE_DIRS}) diff --git a/external_imported/vcpkg/ports/rsig/vcpkg.json b/external_imported/vcpkg/ports/rsig/vcpkg.json new file mode 100644 index 000000000..6ad5ebb95 --- /dev/null +++ b/external_imported/vcpkg/ports/rsig/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rsig", + "version-semver": "0.1.1", + "description": "rioki's signal library", + "homepage": "https://github.com/rioki/rsig", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake index bb14909ce..121c06018 100644 --- a/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake +++ b/external_imported/vcpkg/ports/rsm-binary-io/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/binary_io - REF 2.0.4 - SHA512 a2025be9db79e2d89ab28fdda98cfe88ae6a7f0f0a7e3b6d9f99a1bf8a7b4d89e8a34db21a9bdf11784c7f01fb27a6b083c8af81743919e04efb0736c151bb7e + REF 2.0.5 + SHA512 787833487b9e2b64aeb73842024a52a6ad646d2609342983ebf1539878b96565bf329c8b05afca0fb35a1e40a91174131ad7a0bdc79b168a12bf02f3d6e0cd6d HEAD_REF main ) diff --git a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json index 0c5c77eb6..1b66d5141 100644 --- a/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json +++ b/external_imported/vcpkg/ports/rsm-binary-io/vcpkg.json @@ -1,10 +1,10 @@ { "name": "rsm-binary-io", - "version-semver": "2.0.4", - "port-version": 1, + "version-semver": "2.0.5", "description": "A binary i/o library for C++, without the agonizing pain", "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", + "license": "MIT", "supports": "!osx & !uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch b/external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch index ea6c73b84..cc5786b5f 100644 --- a/external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch +++ b/external_imported/vcpkg/ports/rtabmap/0001-add-bigobj-for-msvc.patch @@ -1,14 +1,3 @@ -From 37a2b1fe682bcea48cb944762853bec404c9e937 Mon Sep 17 00:00:00 2001 -From: Amin Yahyaabadi -Date: Sun, 6 Feb 2022 12:29:02 -0800 -Subject: [PATCH] add bigobj for msvc - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cdae617..ed829a46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ if(MSVC) @@ -19,6 +8,3 @@ index 5cdae617..ed829a46 100644 endif() # [Eclipse] Automatic Discovery of Include directories (Optional, but handy) --- -2.35.1.windows.2 - diff --git a/external_imported/vcpkg/ports/rtabmap/0002-fix-opencv46.patch b/external_imported/vcpkg/ports/rtabmap/0002-fix-opencv46.patch new file mode 100644 index 000000000..37e13dca1 --- /dev/null +++ b/external_imported/vcpkg/ports/rtabmap/0002-fix-opencv46.patch @@ -0,0 +1,11 @@ +--- a/corelib/src/MarkerDetector.cpp ++++ b/corelib/src/MarkerDetector.cpp +@@ -304,7 +304,7 @@ std::map MarkerDetector::detect(const cv::Mat & image, + std::map::iterator iter = detections.find(ids[i]); + if(iter!=detections.end()) + { +- cv::aruco::drawAxis(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); ++ cv::drawFrameAxes(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); + } + } + } diff --git a/external_imported/vcpkg/ports/rtabmap/fix-qt.patch b/external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch similarity index 65% rename from external_imported/vcpkg/ports/rtabmap/fix-qt.patch rename to external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch index e7baa15df..facc1ffe8 100644 --- a/external_imported/vcpkg/ports/rtabmap/fix-qt.patch +++ b/external_imported/vcpkg/ports/rtabmap/0003-fix-qt.patch @@ -1,13 +1,3 @@ -From a9f8c032bb7915c075f0fb32a0bbfa633ca3b388 Mon Sep 17 00:00:00 2001 -Date: Wed, 7 Jul 2021 15:13:43 -0400 -Subject: [PATCH] Fix Qt - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cdae617..fe98199b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -966,13 +966,13 @@ IF(ANDROID) @@ -26,6 +16,3 @@ index 5cdae617..fe98199b 100644 ENDIF() IF(BUILD_TOOLS) --- -2.32.0.windows.1 - diff --git a/external_imported/vcpkg/ports/rtabmap/portfile.cmake b/external_imported/vcpkg/ports/rtabmap/portfile.cmake index 1cd6d123f..24ec6fb33 100644 --- a/external_imported/vcpkg/ports/rtabmap/portfile.cmake +++ b/external_imported/vcpkg/ports/rtabmap/portfile.cmake @@ -7,8 +7,9 @@ vcpkg_from_github( SHA512 7787d5f927f53554cec3044221011cbc78b654c504d96af29947266e25058194923c5463aefde73b93dcfb3930eedf731f6af4d0c311d8f2f0d7be2114393e05 HEAD_REF master PATCHES - fix-qt.patch 0001-add-bigobj-for-msvc.patch + 0002-fix-opencv46.patch + 0003-fix-qt.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -90,7 +91,7 @@ if("tools" IN_LIST FEATURES) ) endif() -file(REMOVE_RECURSE +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/external_imported/vcpkg/ports/rtabmap/vcpkg.json b/external_imported/vcpkg/ports/rtabmap/vcpkg.json index f92769710..ee3339564 100644 --- a/external_imported/vcpkg/ports/rtabmap/vcpkg.json +++ b/external_imported/vcpkg/ports/rtabmap/vcpkg.json @@ -1,12 +1,16 @@ { "name": "rtabmap", "version": "0.20.13", - "port-version": 3, + "port-version": 4, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", + "license": "BSD-3-Clause", "supports": "windows & !static", "dependencies": [ - "opencv", + { + "name": "opencv", + "default-features": false + }, { "name": "pcl", "default-features": false, @@ -24,7 +28,22 @@ }, "zlib" ], + "default-features": [ + "opencv-contrib" + ], "features": { + "opencv-contrib": { + "description": "Use OpenCV with contrib modules", + "dependencies": [ + { + "name": "opencv", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, "tools": { "description": "Build tools", "dependencies": [ diff --git a/external_imported/vcpkg/ports/rtmidi/fix-POSIXname.patch b/external_imported/vcpkg/ports/rtmidi/fix-POSIXname.patch deleted file mode 100644 index a2a5b0ee1..000000000 --- a/external_imported/vcpkg/ports/rtmidi/fix-POSIXname.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/rtmidi_c.cpp b/rtmidi_c.cpp -index 248c9e5..ec1dd38 100644 ---- a/rtmidi_c.cpp -+++ b/rtmidi_c.cpp -@@ -136,7 +136,11 @@ const char* rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber) - { - try { - std::string name = ((RtMidi*) device->ptr)->getPortName (portNumber); -- return strdup (name.c_str ()); -+#if defined(_WIN) || defined(WINAPI_FAMILY) //Windows platform -+ return _strdup (name.c_str ()); -+#else // Unix platform -+ return strdup (name.c_str ()); -+#endif - - } catch (const RtMidiError & err) { - device->ok = false; diff --git a/external_imported/vcpkg/ports/rtmidi/fix-cmake-usage.patch b/external_imported/vcpkg/ports/rtmidi/fix-cmake-usage.patch new file mode 100644 index 000000000..8e6c6efee --- /dev/null +++ b/external_imported/vcpkg/ports/rtmidi/fix-cmake-usage.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 616fdaf..e6af930 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ include(CMakePackageConfigHelpers) + + # Write cmake package version file + write_basic_package_version_file( +- RtMidi-config-version.cmake ++ rtmidi-config-version.cmake + VERSION ${FULL_VER} + COMPATIBILITY SameMajorVersion + ) +@@ -288,15 +288,15 @@ write_basic_package_version_file( + # Write cmake package config file + configure_package_config_file ( + cmake/RtMidi-config.cmake.in +- RtMidi-config.cmake ++ rtmidi-config.cmake + INSTALL_DESTINATION "${RTMIDI_CMAKE_DESTINATION}" + ) + + # Install package files + install ( + FILES +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config-version.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config-version.cmake" + DESTINATION + "${RTMIDI_CMAKE_DESTINATION}" + ) diff --git a/external_imported/vcpkg/ports/rtmidi/portfile.cmake b/external_imported/vcpkg/ports/rtmidi/portfile.cmake index 9b57212c4..404a49ebc 100644 --- a/external_imported/vcpkg/ports/rtmidi/portfile.cmake +++ b/external_imported/vcpkg/ports/rtmidi/portfile.cmake @@ -5,24 +5,30 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtmidi - REF dda792c5394375769466ab1c1d7773e741bbd950 # 4.0.0 - SHA512 cb1ded29c0b22cf7f38719131a9572a4daba7071fd8cf8b5b8d7306560a218bb0ef42150bf341b76f4ddee0ae087da975116c3b153e7bb908f2a674ecacb9d7a + REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 + SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f HEAD_REF master - PATCHES - fix-POSIXname.patch + PATCHES fix-cmake-usage.patch # Remove this patch in the next update ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + alsa RTMIDI_API_ALSA +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DRTMIDI_API_ALSA=OFF -DRTMIDI_API_JACK=OFF + -DRTMIDI_BUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/rtmidi/vcpkg.json b/external_imported/vcpkg/ports/rtmidi/vcpkg.json index 73280aa86..91979a2d5 100644 --- a/external_imported/vcpkg/ports/rtmidi/vcpkg.json +++ b/external_imported/vcpkg/ports/rtmidi/vcpkg.json @@ -1,8 +1,28 @@ { "name": "rtmidi", - "version-semver": "4.0.0", - "port-version": 4, + "version": "5.0.0", + "port-version": 2, "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "alsa": { + "description": "Build ALSA API", + "supports": "linux", + "dependencies": [ + "alsa" + ] + } + } } diff --git a/external_imported/vcpkg/ports/rttr/portfile.cmake b/external_imported/vcpkg/ports/rttr/portfile.cmake index 56700768b..9b8f01ca0 100644 --- a/external_imported/vcpkg/ports/rttr/portfile.cmake +++ b/external_imported/vcpkg/ports/rttr/portfile.cmake @@ -10,44 +10,48 @@ vcpkg_from_github( remove-owner-read-perms.patch ) -#Handle static lib -set(BUILD_STATIC_LIB OFF) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC_LIB ON) +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC ON) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC OFF) + set(BUILD_WITH_STATIC_RUNTIME_LIBS ON) +elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "dynamic") + set(BUILD_STATIC OFF) + set(BUILD_RTTR_DYNAMIC ON) + set(BUILD_WITH_STATIC_RUNTIME_LIBS OFF) else() - set(BUILD_STATIC_LIB OFF) + message(FATAL_ERROR "rttr's build system does not support this configuration: VCPKG_LIBRARY_LINKAGE: ${VCPKG_LIBRARY_LINKAGE} VCPKG_CRT_LINKAGE: ${VCPKG_CRT_LINKAGE}") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_BENCHMARKS=OFF - -DBUILD_UNIT_TESTS=OFF - -DBUILD_STATIC=${BUILD_STATIC_LIB} + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_BENCHMARKS=OFF + -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_STATIC=${BUILD_STATIC} + -DBUILD_RTTR_DYNAMIC=${BUILD_RTTR_DYNAMIC} + -DBUILD_WITH_STATIC_RUNTIME_LIBS=${BUILD_WITH_STATIC_RUNTIME_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - vcpkg_fixup_cmake_targets(CONFIG_PATH share/rttr/cmake) -elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - message(FATAL_ERROR "RTTR does not support this platform") -endif() - -#Handle static lib -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + vcpkg_cmake_config_fixup(CONFIG_PATH share/rttr/cmake) endif() -#Handle copyright -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) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/README.md - ${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/README.md + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/README.md" ) diff --git a/external_imported/vcpkg/ports/rttr/vcpkg.json b/external_imported/vcpkg/ports/rttr/vcpkg.json index fc7ff33bc..d1d1389cd 100644 --- a/external_imported/vcpkg/ports/rttr/vcpkg.json +++ b/external_imported/vcpkg/ports/rttr/vcpkg.json @@ -1,10 +1,20 @@ { "name": "rttr", - "version-string": "0.9.6", - "port-version": 3, + "version": "0.9.6", + "port-version": 4, "description": "an easy and intuitive way to use reflection in C++", "homepage": "https://github.com/rttrorg/rttr", + "license": "MIT", + "supports": "(static & staticcrt) | (!static & staticcrt) | (!static & !staticcrt)", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/rubberband/portfile.cmake b/external_imported/vcpkg/ports/rubberband/portfile.cmake new file mode 100644 index 000000000..370bcae95 --- /dev/null +++ b/external_imported/vcpkg/ports/rubberband/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO breakfastquay/rubberband + REF v2.0.2 + SHA512 56e33f3a6f5755242e46f9cb224e372bea7a367756f08d3322c8951a40b3907f1a2957775de6f2584a093e6adf82ca91015119650d5a624afe39086a47843ddc + HEAD_REF default +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') + -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' + -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' + -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' + -Dextra_lib_dirs= # 'Additional local library directories to search for dependencies.' + ) + +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/rubberband-program${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + # Rubberband uses a different executable name when compiled with msvc + # Just looking for that file is faster than detecting msvc builds + set(RUBBERBAND_PROGRAM_NAME rubberband-program) +else() + set(RUBBERBAND_PROGRAM_NAME rubberband) +endif() + +# Features cli and lv2 are build whenever suficient dependencies are installed, +# Remove them when not enabled. +if("cli" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "${RUBBERBAND_PROGRAM_NAME}" AUTO_CLEAN) +else() + vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") +endif() + +# lv2 feature is not supported yet because vcpkg can't isntall to +# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") + +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/external_imported/vcpkg/ports/rubberband/vcpkg.json b/external_imported/vcpkg/ports/rubberband/vcpkg.json new file mode 100644 index 000000000..8c9bf8609 --- /dev/null +++ b/external_imported/vcpkg/ports/rubberband/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "rubberband", + "version": "2.0.2", + "description": "A high quality software library for audio time-stretching and pitch-shifting.", + "homepage": "https://www.breakfastquay.com/rubberband/", + "license": "GPL-2.0-or-later", + "supports": "!uwp & !(windows & static)", + "dependencies": [ + "fftw3", + "libsamplerate", + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "cli": { + "description": "Build the command-line utility", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/rxcpp/portfile.cmake b/external_imported/vcpkg/ports/rxcpp/portfile.cmake index b98701132..deb7e294c 100644 --- a/external_imported/vcpkg/ports/rxcpp/portfile.cmake +++ b/external_imported/vcpkg/ports/rxcpp/portfile.cmake @@ -1,21 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ReactiveX/RxCpp - REF v4.1.0 - SHA512 a92e817ecbdf6f235cae724ada2615af9fa0c243249625d0f2c2f09ff5dd7f53fdabd03a0278fe2995fe27528c5511d71f87b7a6b3d54f73b49b65aef56e32fd + REF v4.1.1 + SHA512 387e1276151a19b62fd1d36b486ff5f3ed28f0f48ae8b00902bf13464d20603f492ecd63ab4444d04293fc3d92a8f7ce3e67a4c68836415c4655331fb6b54edb HEAD_REF master - PATCHES support_find_package.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake/) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(COPY ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/external_imported/vcpkg/ports/rxcpp/support_find_package.patch b/external_imported/vcpkg/ports/rxcpp/support_find_package.patch deleted file mode 100644 index bb1da2d2d..000000000 --- a/external_imported/vcpkg/ports/rxcpp/support_find_package.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt -index 3d0744740..293f187c5 100644 ---- a/projects/CMake/CMakeLists.txt -+++ b/projects/CMake/CMakeLists.txt -@@ -146,3 +146,27 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE CACHE BOOL "Don't require all project - - install(DIRECTORY ${RXCPP_DIR}/Rx/v2/src/rxcpp/ DESTINATION include/rxcpp - FILES_MATCHING PATTERN "*.hpp") -+ -+# Here we are exporting TARGETS so that other projects can import rxcpp -+# just with find_package(rxcpp CONFIG) after rxcpp is installed into system by "make install". -+add_library(rxcpp INTERFACE) -+ -+target_include_directories(rxcpp INTERFACE -+ $ -+ $ -+) -+ -+install(TARGETS rxcpp EXPORT rxcppConfig) -+install(EXPORT rxcppConfig DESTINATION share/rxcpp/cmake) -+ -+# When find_package(rxcpp SOME_VERSION REQUIRED) will be used in third party project -+# where SOME_VERSION is any version incompatible with ${PROJECT_VERSION} then cmake will generate the error. -+# It means you don't need track versions manually. -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file("${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" -+ VERSION -+ ${PROJECT_VERSION} -+ COMPATIBILITY -+ AnyNewerVersion -+) -+install(FILES "${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" DESTINATION share/rxcpp/cmake) diff --git a/external_imported/vcpkg/ports/rxcpp/vcpkg.json b/external_imported/vcpkg/ports/rxcpp/vcpkg.json index 013aa46a3..44f51ec0e 100644 --- a/external_imported/vcpkg/ports/rxcpp/vcpkg.json +++ b/external_imported/vcpkg/ports/rxcpp/vcpkg.json @@ -1,7 +1,17 @@ { "name": "rxcpp", - "version-string": "4.1.0", - "port-version": 2, + "version": "4.1.1", "description": "Reactive Extensions for C++", - "homepage": "https://github.com/Reactive-Extensions/RxCpp" + "homepage": "https://github.com/Reactive-Extensions/RxCpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/rxspencer/disable-docs-and-tests.patch b/external_imported/vcpkg/ports/rxspencer/disable-docs-and-tests.patch new file mode 100644 index 000000000..9cacda578 --- /dev/null +++ b/external_imported/vcpkg/ports/rxspencer/disable-docs-and-tests.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49faf30..e590001 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + project ( rxspencer C ) + cmake_minimum_required ( VERSION 3.0 ) + option ( rxshared "build shared library instead of static" OFF ) +-enable_testing() ++#enable_testing() + + # Define POSIX_MISTAKE to allow unmatched right parentheses as literals, as + # required by POSIX 1003.2. +@@ -47,10 +47,12 @@ install ( TARGETS rxspencer + PUBLIC_HEADER DESTINATION ${RXSPENCER_INCLUDE_DIR} ) + + # Install docs ++if(FALSE) + set ( RXSPENCER_DATA_FILES "COPYRIGHT;README;WHATSNEW" ) + install ( FILES ${RXSPENCER_DATA_FILES} DESTINATION ${RXSPENCER_DATA_DIR} ) + install ( FILES rxspencer.3 DESTINATION ${RXSPENCER_MAN3_DIR} ) + install ( FILES rxspencer.7 DESTINATION ${RXSPENCER_MAN7_DIR} ) ++endif() + + # generate cmake configuration file + include ( CMakePackageConfigHelpers ) +@@ -69,8 +71,9 @@ install ( EXPORT RXSpencerTargets DESTINATION ${CMAKE_CONFIG_DEST} ) + install ( FILES + ${CMAKE_CURRENT_BINARY_DIR}/RXSpencerConfig.cmake + DESTINATION ${CMAKE_CONFIG_DEST} ) +- ++if(FALSE) + add_executable(tester ${RXSPENCER_SRCS} debug.c main.c split.c) + add_test(NAME test1 COMMAND sh -c "./tester -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test2 COMMAND sh -c "./tester -el -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") + add_test(NAME test3 COMMAND sh -c "./tester -er -f ${CMAKE_CURRENT_SOURCE_DIR}/tests") ++endif() diff --git a/external_imported/vcpkg/ports/rxspencer/portfile.cmake b/external_imported/vcpkg/ports/rxspencer/portfile.cmake index b4ce794d0..4f31d69fb 100644 --- a/external_imported/vcpkg/ports/rxspencer/portfile.cmake +++ b/external_imported/vcpkg/ports/rxspencer/portfile.cmake @@ -4,18 +4,21 @@ vcpkg_from_github( REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0 SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598 HEAD_REF master + PATCHES + disable-docs-and-tests.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer -Drxshared=${BUILD_SHARED} ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer") @@ -25,5 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/rxspencer/vcpkg.json b/external_imported/vcpkg/ports/rxspencer/vcpkg.json index 41b863e25..910ff4279 100644 --- a/external_imported/vcpkg/ports/rxspencer/vcpkg.json +++ b/external_imported/vcpkg/ports/rxspencer/vcpkg.json @@ -1,9 +1,10 @@ { "name": "rxspencer", "version": "3.9.0", - "port-version": 1, + "port-version": 2, "description": "Henry Spencer's BSD regular expression library.", "homepage": "https://garyhouston.github.io/regex/", + "license": "MIT AND CC0-1.0", "supports": "!uwp", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/ryml/cmake-fix.patch b/external_imported/vcpkg/ports/ryml/cmake-fix.patch index e8a01c5a6..4c973e9fd 100644 --- a/external_imported/vcpkg/ports/ryml/cmake-fix.patch +++ b/external_imported/vcpkg/ports/ryml/cmake-fix.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e4eb23..115b8aa 100644 +index d18407c..db19e0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF) +@@ -21,8 +21,7 @@ option(RYML_DBG "Enable (very verbose) ryml debug prints." OFF) #------------------------------------------------------- @@ -12,11 +12,11 @@ index 3e4eb23..115b8aa 100644 c4_add_library(ryml SOURCES -@@ -46,10 +46,10 @@ c4_add_library(ryml +@@ -54,10 +53,10 @@ c4_add_library(ryml ryml.natvis SOURCE_ROOT ${RYML_SRC_DIR} INC_DIRS -+ $ ++ $ $ $ - LIBS c4core @@ -24,5 +24,4 @@ index 3e4eb23..115b8aa 100644 + LIBS c4core::c4core ) - if(NOT RYML_DEFAULT_CALLBACKS) - + if(RYML_WITH_TAB_TOKENS) diff --git a/external_imported/vcpkg/ports/ryml/portfile.cmake b/external_imported/vcpkg/ports/ryml/portfile.cmake index 152c7c9e8..7d650c096 100644 --- a/external_imported/vcpkg/ports/ryml/portfile.cmake +++ b/external_imported/vcpkg/ports/ryml/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/rapidyaml - REF affafd5db67208eb85413327595507314c068525 - SHA512 31d827ead680828b3c0ad879290b17d4729d412e30a20459aea4b92a8f4f3b8397f82b09c27d918ab4b955289560b17697d5f15eaa4d24661ff46f5dbbc50fa8 + REF 213b201d264139cd1b887790197e08850af628e3 #v0.4.1 + SHA512 f76e3c41284441dc195402fadda5ceb56fd48c7954a24c29457e14d2f1996d46e9cfb01dd366b00c588108777735b7ccc1d68215c6ecc609cc7b805535c77309 HEAD_REF master PATCHES cmake-fix.patch ) @@ -13,20 +13,21 @@ vcpkg_from_github( set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) # Get cmake scripts for rapidyaml -vcpkg_download_distfile(CMAKE_ARCHIVE +vcpkg_download_distfile( + CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" FILENAME "cmake-${CM_COMMIT_HASH}.zip" SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH_CMAKE +vcpkg_extract_source_archive( + SOURCE_PATH_CMAKE ARCHIVE ${CMAKE_ARCHIVE} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext/c4core/cmake") -file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/ext/c4core/cmake") +file(RENAME "${SOURCE_PATH_CMAKE}" "${SOURCE_PATH}/ext/c4core/cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/external_imported/vcpkg/ports/ryml/vcpkg.json b/external_imported/vcpkg/ports/ryml/vcpkg.json index a11054bd4..8fccd4407 100644 --- a/external_imported/vcpkg/ports/ryml/vcpkg.json +++ b/external_imported/vcpkg/ports/ryml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ryml", - "version-date": "2021-07-24", - "port-version": 1, + "version": "0.4.1", "description": "Rapid YAML library", "homepage": "https://github.com/biojppm/rapidyaml", + "license": "MIT", "dependencies": [ { "name": "c4core", diff --git a/external_imported/vcpkg/ports/sail/portfile.cmake b/external_imported/vcpkg/ports/sail/portfile.cmake index 8d7c58689..57ae51976 100644 --- a/external_imported/vcpkg/ports/sail/portfile.cmake +++ b/external_imported/vcpkg/ports/sail/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre21 - SHA512 51c23792d18b28520d04d7a097a6d46521d12107919ff76a7ff270a518beb862e4a1df89f3effb945ff908c39336bd60c5f118d6db80baf50005c05f55d2d96f + REF v0.9.0-rc1 + SHA512 c9b04bdf92600c0b1d38e00b31ec28f841b76fa41c50524199665de3e97a74b2633b8e9dc4bce1820521245b9d3bf04788eb1b5de9e3516e421927205d09ac47 HEAD_REF master ) @@ -21,8 +21,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove duplicate files -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") # Move cmake configs vcpkg_cmake_config_fixup(PACKAGE_NAME sail CONFIG_PATH lib/cmake/sail DO_NOT_DELETE_PARENT_CONFIG_PATH) diff --git a/external_imported/vcpkg/ports/sail/vcpkg.json b/external_imported/vcpkg/ports/sail/vcpkg.json index fade1e924..ec9d7ba0c 100644 --- a/external_imported/vcpkg/ports/sail/vcpkg.json +++ b/external_imported/vcpkg/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre21", + "version-semver": "0.9.0-rc1", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", diff --git a/external_imported/vcpkg/ports/saucer/fix-source-generation.patch b/external_imported/vcpkg/ports/saucer/fix-source-generation.patch new file mode 100644 index 000000000..be1dcde90 --- /dev/null +++ b/external_imported/vcpkg/ports/saucer/fix-source-generation.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3800146..61a9e60 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer") + # -------------------------------------------------------------------------------------------------------- + + string(TOLOWER ${saucer_backend} saucer_backed_lower) +-configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp") ++configure_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") + + # -------------------------------------------------------------------------------------------------------- + # Configure Library depending on options +@@ -91,6 +91,7 @@ include(FetchContent) + if (saucer_backend STREQUAL "Qt") + target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp") + target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp") ++ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") + + find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel) diff --git a/external_imported/vcpkg/ports/saucer/portfile.cmake b/external_imported/vcpkg/ports/saucer/portfile.cmake new file mode 100644 index 000000000..0ca352fc3 --- /dev/null +++ b/external_imported/vcpkg/ports/saucer/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO saucer/saucer + REF 6ae482092cca4d4a408e6bdf24714153d9203797 + SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0 + HEAD_REF dev + PATCHES + unofficial-webview2.patch + fix-source-generation.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -Dsaucer_prefer_remote=OFF -Dsaucer_remote_webview2=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch b/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch new file mode 100644 index 000000000..be42769a6 --- /dev/null +++ b/external_imported/vcpkg/ports/saucer/unofficial-webview2.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9fa4269..f950363 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,8 +111,8 @@ elseif (saucer_backend STREQUAL "WebView2") + endif() + + if (NOT saucer_remote_webview2) +- find_package(webview2 CONFIG REQUIRED) +- target_link_libraries(${PROJECT_NAME} PRIVATE webview2::webview2) ++ find_package(unofficial-webview2 CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::webview2::webview2) + else() + include("NuGet.cmake") + nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version}) diff --git a/external_imported/vcpkg/ports/saucer/vcpkg.json b/external_imported/vcpkg/ports/saucer/vcpkg.json new file mode 100644 index 000000000..a70da6bfa --- /dev/null +++ b/external_imported/vcpkg/ports/saucer/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "saucer", + "version": "1.0.1", + "port-version": 2, + "description": "Next-gen desktop apps with web-frontend in C++", + "homepage": "https://saucer.github.io/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "ereignis", + "fmt", + "lockpp", + "nlohmann-json", + { + "name": "qt5-webchannel", + "platform": "!windows" + }, + { + "name": "qt5-webengine", + "platform": "!windows" + }, + "tl-expected", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "webview2", + "platform": "windows" + }, + { + "name": "wil", + "platform": "windows" + } + ] +} diff --git a/external_imported/vcpkg/ports/sciplot/portfile.cmake b/external_imported/vcpkg/ports/sciplot/portfile.cmake index c6a369eb6..c2f57f0c9 100644 --- a/external_imported/vcpkg/ports/sciplot/portfile.cmake +++ b/external_imported/vcpkg/ports/sciplot/portfile.cmake @@ -1,22 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sciplot/sciplot - REF v0.2.2 - SHA512 2e7646e0fd52643bf86c09466d921d7b6a53349cd113e15177c3389654e0489df1d56f5fdcad7fc73834e632fff0a303d1366688ac7bb11937d49babd0742a7f + REF f8d779a1110b76c6bdc77edcdc7fa798156a6917 #v0.3.1 + SHA512 fa21895c637bc42071fbd951e1c2ee450798398863626e31015f106077de4ad17dc276d77f2f1a4a7679c055c8cd8caafea513d746ac7ddbb22a16cc9382f39a HEAD_REF vcpkg ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSCIPLOT_BUILD_EXAMPLES=OFF + -DSCIPLOT_BUILD_TESTS=OFF + -DSCIPLOT_BUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/sciplot) +vcpkg_cmake_config_fixup(CONFIG_PATH share/sciplot) -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - -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/external_imported/vcpkg/ports/sciplot/vcpkg.json b/external_imported/vcpkg/ports/sciplot/vcpkg.json index 0fdf43a09..bbe5ec72b 100644 --- a/external_imported/vcpkg/ports/sciplot/vcpkg.json +++ b/external_imported/vcpkg/ports/sciplot/vcpkg.json @@ -1,7 +1,19 @@ { "name": "sciplot", - "version": "0.2.2", + "version": "0.3.1", + "port-version": 1, "description": "A modern c++ scientific plotting library powered by gnuplot", "homepage": "https://github.com/sciplot/sciplot", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/sdformat9/portfile.cmake b/external_imported/vcpkg/ports/sdformat9/portfile.cmake index 058988450..54d083a29 100644 --- a/external_imported/vcpkg/ports/sdformat9/portfile.cmake +++ b/external_imported/vcpkg/ports/sdformat9/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat - REF sdformat9_9.4.0 - SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e + REF a978ade73e7b3509d378667dca394681e55ca068 #9.8.0 + SHA512 958c0613da7c885f81cceee726da10574188e5edafb7d3aca680e40bbdca6ff1bc7b721ee1c56c53e3973960ae715912adfa6541cf3e35d32a5dc2ef2a997505 HEAD_REF sdf9 PATCHES fix-dependency-urdfdom.patch @@ -13,7 +13,7 @@ vcpkg_from_github( # Ruby is required by the sdformat build process vcpkg_find_acquire_program(RUBY) -get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) +get_filename_component(RUBY_PATH "${RUBY}" DIRECTORY) set(_path $ENV{PATH}) vcpkg_add_to_path("${RUBY_PATH}") diff --git a/external_imported/vcpkg/ports/sdformat9/vcpkg.json b/external_imported/vcpkg/ports/sdformat9/vcpkg.json index c4f2a7dcc..c541b726b 100644 --- a/external_imported/vcpkg/ports/sdformat9/vcpkg.json +++ b/external_imported/vcpkg/ports/sdformat9/vcpkg.json @@ -1,11 +1,10 @@ { "name": "sdformat9", - "version": "9.4.0", - "port-version": 5, + "version": "9.8.0", "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", - "supports": "!(linux | uwp)", + "supports": "!uwp", "dependencies": [ "ignition-math6", "tinyxml", diff --git a/external_imported/vcpkg/ports/sdl1/portfile.cmake b/external_imported/vcpkg/ports/sdl1/portfile.cmake index d870cffe9..3f46fe389 100644 --- a/external_imported/vcpkg/ports/sdl1/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl1/portfile.cmake @@ -7,13 +7,13 @@ vcpkg_from_github( PATCHES export-symbols-only-in-shared-build.patch fix-linux-build.patch + sdl-config.patch ) -configure_file(${SOURCE_PATH}/include/SDL_config.h.default ${SOURCE_PATH}/include/SDL_config.h COPYONLY) +configure_file("${SOURCE_PATH}/include/SDL_config.h.default" "${SOURCE_PATH}/include/SDL_config.h" COPYONLY) - -if (VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ ) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln" DESTINATION "${SOURCE_PATH}/VisualC/") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIB_TYPE StaticLibrary) @@ -21,7 +21,7 @@ if (VCPKG_TARGET_IS_WINDOWS) set(LIB_TYPE DynamicLibrary) endif() - if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(CRT_TYPE_DBG MultiThreadedDebugDLL) set(CRT_TYPE_REL MultiThreadedDLL) else() @@ -29,14 +29,14 @@ if (VCPKG_TARGET_IS_WINDOWS) 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) + 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 - file(REMOVE_RECURSE ${SOURCE_PATH}/src/hermes/COPYING.LIB) + file(REMOVE_RECURSE "${SOURCE_PATH}/src/hermes/COPYING.LIB") vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH VisualC/SDL1_2017.sln INCLUDES_SUBPATH include LICENSE_SUBPATH COPYING @@ -44,47 +44,44 @@ if (VCPKG_TARGET_IS_WINDOWS) ) #Take all the fils into include/SDL to sovle conflict with SDL2 port - file(GLOB files ${CURRENT_PACKAGES_DIR}/include/*) - foreach(file ${files}) - file(COPY ${file} DESTINATION ${CURRENT_PACKAGES_DIR}/include/SDL) - file(REMOVE ${file}) - endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/SDL/doxyfile) + 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") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - 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) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib) + 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) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib") endif() else() - message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".") + if(VCPKG_TARGET_IS_LINUX) + message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".") + endif() + + find_program(WHICH_COMMAND NAMES which) + if(NOT WHICH_COMMAND) + set(polyfill_scripts "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-bin") + file(REMOVE_RECURSE "${polyfill_scripts}") + file(MAKE_DIRECTORY "${polyfill_scripts}") + vcpkg_host_path_list(APPEND ENV{PATH} "${polyfill_scripts}") + # sdl's autoreconf.sh needs `which`, but our msys root doesn't have it. + file(WRITE "${polyfill_scripts}/which" "#!/bin/sh\nif test -f \"/usr/bin/\$1\"; then echo \"/usr/bin/\$1\"; else false; fi\n") + file(CHMOD "${polyfill_scripts}/which" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) + endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_install_make() - vcpkg_fixup_pkgconfig(IGNORE_FLAGS -Wl,-rpath,${CURRENT_PACKAGES_DIR}/lib/pkgconfig/../../lib - -Wl,-rpath,${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/../../lib - SYSTEM_LIBRARIES pthread) + vcpkg_fixup_pkgconfig() - file(GLOB SDL1_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") - foreach (SDL1_TOOL ${SDL1_TOOLS}) - file(COPY ${SDL1_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${SDL1_TOOL}) - endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man3" + ) - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/sdl1/debug/bin/sdl-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - endif() -endif() \ No newline at end of file + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/sdl1/sdl-config.patch b/external_imported/vcpkg/ports/sdl1/sdl-config.patch new file mode 100644 index 000000000..0851ade5d --- /dev/null +++ b/external_imported/vcpkg/ports/sdl1/sdl-config.patch @@ -0,0 +1,13 @@ +diff --git a/sdl-config.in b/sdl-config.in +index e0fcc0c..de602d8 100644 +--- a/sdl-config.in ++++ b/sdl-config.in +@@ -1,6 +1,7 @@ + #!/bin/sh + +-prefix=@prefix@ ++DIRNAME=$(dirname $0) ++prefix=$(CDPATH= cd -- "${DIRNAME%/tools/sdl1/*}" && pwd -P) + exec_prefix=@exec_prefix@ + exec_prefix_set=no + libdir=@libdir@ diff --git a/external_imported/vcpkg/ports/sdl1/vcpkg.json b/external_imported/vcpkg/ports/sdl1/vcpkg.json index 299c16461..43968e5ed 100644 --- a/external_imported/vcpkg/ports/sdl1/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl1/vcpkg.json @@ -1,7 +1,9 @@ { "name": "sdl1", "version": "1.2.15", - "port-version": 15, + "port-version": 17, "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" + "homepage": "https://www.libsdl.org", + "license": "LGPL-2.1-or-later", + "supports": "!osx & !uwp" } diff --git a/external_imported/vcpkg/ports/sdl2-image/CMakeLists.txt b/external_imported/vcpkg/ports/sdl2-image/CMakeLists.txt index cc37ad122..70f279754 100644 --- a/external_imported/vcpkg/ports/sdl2-image/CMakeLists.txt +++ b/external_imported/vcpkg/ports/sdl2-image/CMakeLists.txt @@ -3,27 +3,14 @@ project(SDL2_image C) ### configuration ### -list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/libwebp") # enable all file formats which are supported natively set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV SVG) # enable all file formats which are supported through external dependencies -# first try to load them statically (lib file in vcpkg installation) -# if this fails try to make them a dynamic dependency (dll will be loaded at runtime) if possible. vcpkg cannot resolve these dependencies! -# else do not support this file format at all - -# Can be explicitly enabled or disabled via USE_XYZ -set(DEPENDENCIES PNG JPEG TIFF WEBP) - -# patch library names for preprocessor flags -set(JPEG_FLAG JPG) -set(TIFF_FLAG TIF) - -# names of potentially dynamically loaded libraries -set(JPEG_DYNAMIC \"libjpeg-9.dll\") -set(PNG_DYNAMIC \"libpng16-16.dll\") -set(TIFF_DYNAMIC \"libtiff-5.dll\") -set(WEBP_DYNAMIC \"libwebp-4.dll\") +option(USE_WEBP "Enable support for WebP format" OFF) +option(USE_PNG "Enable support for PNG format" OFF) +option(USE_JPEG "Enable support for JPEG format" OFF) +option(USE_TIFF "Enable support for TIFF format" OFF) ### implementation ### @@ -55,6 +42,13 @@ if (APPLE) target_compile_options(SDL2_image BEFORE PRIVATE "-x" "objective-c" ) + target_link_libraries(SDL2_image PRIVATE + "-framework CoreFoundation" + "-framework CoreGraphics" + "-framework CoreServices" + "-framework Foundation" + "-framework ImageIO" + ) endif() set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL DLL_EXPORT) @@ -74,33 +68,34 @@ include_directories(${CMAKE_SOURCE_DIR}) target_link_libraries(SDL2_image SDL2::SDL2) # external dependencies -foreach(DEPENDENCY IN LISTS DEPENDENCIES) - if(NOT USE_${DEPENDENCY}) - continue() - endif() - find_package(${DEPENDENCY}) - - if(NOT DEFINED ${DEPENDENCY}_FLAG) - set(${DEPENDENCY}_FLAG ${DEPENDENCY}) - endif() +if(USE_WEBP) + find_package(WebP CONFIG REQUIRED) + add_definitions(-DLOAD_WEBP) + target_link_libraries(SDL2_image PRIVATE WebP::webp) +endif() - add_definitions(-DLOAD_${${DEPENDENCY}_FLAG}) - if(${DEPENDENCY}_FOUND) - message(STATUS " --> linking statically.") - target_link_libraries(SDL2_image ${${DEPENDENCY}_LIBRARIES}) - elseif(DEFINED ${DEPENDENCY}_DYNAMIC) - message(STATUS " --> linking dynamically.") - add_definitions(-DLOAD_${${DEPENDENCY}_FLAG}_DYNAMIC=${${DEPENDENCY}_DYNAMIC}) - set(RUNTIME_DEPENDENCIES ON) - else() - message(STATUS " --> skipping.") - endif() -endforeach(DEPENDENCY) +if(USE_PNG) + find_package(PNG REQUIRED) + add_definitions(-DLOAD_PNG) + target_link_libraries(SDL2_image PRIVATE PNG::PNG) +endif() -if(DEFINED RUNTIME_DEPENDENCIES) - include_directories(VisualC/external/include) +if(USE_JPEG) + find_package(JPEG REQUIRED) + add_definitions(-DLOAD_JPG) + target_link_libraries(SDL2_image PRIVATE ${JPEG_LIBRARIES}) endif() +if(USE_TIFF) + find_package(TIFF REQUIRED) + add_definitions(-DLOAD_TIF) + target_link_libraries(SDL2_image PRIVATE TIFF::TIFF) + + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") + endif() +endif() install(TARGETS SDL2_image EXPORT SDL2_image @@ -110,11 +105,10 @@ install(TARGETS SDL2_image install(FILES SDL_image.h DESTINATION include/SDL2 CONFIGURATIONS Release) -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake" -[[include(CMakeFindDependencyMacro) -find_dependency(SDL2 CONFIG) -include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") -]]) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sdl2-image-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake" @ONLY + INSTALL_DESTINATION "share/sdl2-image") + set(prefix "") set(exec_prefix [[${prefix}]]) set(libdir [[${prefix}/lib]]) @@ -141,20 +135,3 @@ install(EXPORT SDL2_image FILE sdl2-image-targets.cmake NAMESPACE SDL2:: ) - -message(STATUS "Link-time dependencies:") -message(STATUS " " SDL2::SDL2) -foreach(DEPENDENCY ${DEPENDENCIES}) - if(${DEPENDENCY}_FOUND) - message(STATUS " " ${DEPENDENCY}) - endif() -endforeach(DEPENDENCY) - -if(DEFINED RUNTIME_DEPENDENCIES) - message(STATUS "Run-time dependencies:") - foreach(DEPENDENCY ${DEPENDENCIES}) - if(NOT ${DEPENDENCY}_FOUND AND DEFINED ${DEPENDENCY}_DYNAMIC) - message(STATUS " " ${${DEPENDENCY}_DYNAMIC}) - endif() - endforeach(DEPENDENCY) -endif() diff --git a/external_imported/vcpkg/ports/sdl2-image/portfile.cmake b/external_imported/vcpkg/ports/sdl2-image/portfile.cmake index 4f82650ce..cede4e416 100644 --- a/external_imported/vcpkg/ports/sdl2-image/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2-image/portfile.cmake @@ -15,30 +15,20 @@ vcpkg_extract_source_archive_ex( ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/sdl2-image-config.cmake.in" DESTINATION "${SOURCE_PATH}") -set(USE_JPEG OFF) -if("libjpeg-turbo" IN_LIST FEATURES) - set(USE_JPEG ON) -endif() - -set(USE_TIFF OFF) -if("tiff" IN_LIST FEATURES) - set(USE_TIFF ON) -endif() - -set(USE_WEBP OFF) -if("libwebp" IN_LIST FEATURES) - set(USE_WEBP ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libjpeg-turbo USE_JPEG + tiff USE_TIFF + libwebp USE_WEBP +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" -DUSE_PNG=ON - -DUSE_JPEG=${USE_JPEG} - -DUSE_TIFF=${USE_TIFF} - -DUSE_WEBP=${USE_WEBP} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in b/external_imported/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in new file mode 100644 index 000000000..8db8b11d0 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-image/sdl2-image-config.cmake.in @@ -0,0 +1,13 @@ +include(CMakeFindDependencyMacro) + +find_dependency(SDL2 CONFIG) + +if(@USE_WEBP@) + find_dependency(WebP CONFIG) +endif() + +if (@USE_PNG@) + find_dependency(PNG) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake") diff --git a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json index a57f93672..1d9b5ce7a 100644 --- a/external_imported/vcpkg/ports/sdl2-image/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2-image/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdl2-image", - "version-string": "2.0.5", - "port-version": 4, + "version": "2.0.5", + "port-version": 7, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://www.libsdl.org/projects/SDL_image", + "license": "Zlib", "dependencies": [ "libpng", "sdl2", @@ -20,18 +21,39 @@ "libjpeg-turbo": { "description": "Support for JPEG image format", "dependencies": [ - "libjpeg-turbo" + "libjpeg-turbo", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } ] }, "libwebp": { "description": "Support for WEBP image format.", "dependencies": [ - "libwebp" + "libwebp", + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + } ] }, "tiff": { "description": "Support for TIFF image format", "dependencies": [ + { + "name": "sdl2", + "features": [ + "x11" + ], + "platform": "!windows" + }, "tiff" ] } diff --git a/external_imported/vcpkg/ports/sdl2-mixer/CMakeLists.txt b/external_imported/vcpkg/ports/sdl2-mixer/CMakeLists.txt deleted file mode 100644 index 2ab5e00ad..000000000 --- a/external_imported/vcpkg/ports/sdl2-mixer/CMakeLists.txt +++ /dev/null @@ -1,166 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(SDL2_MIXER C) - -find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2) -find_package(SDL2 CONFIG REQUIRED) -set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR}) - -set(SDL_MIXER_LIBRARIES SDL2::SDL2) - -# builtin formats -set(SDL_MIXER_DEFINES MUSIC_WAV) - -# MP3 support -if(SDL_MIXER_ENABLE_MP3) - find_path(MPG123_INCLUDE_DIR mpg123.h) - find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) - list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) - list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(MPG123_LIBRARY_NAME "${MPG123_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DMPG123_DYNAMIC="${MPG123_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# FLAC support -if(SDL_MIXER_ENABLE_FLAC) - find_path(FLAC_INCLUDE_DIR FLAC/all.h) - find_library(FLAC_LIBRARY FLAC) - list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) - list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(FLAC_LIBRARY_NAME "${FLAC_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DFLAC_DYNAMIC="${FLAC_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# MOD support -if(SDL_MIXER_ENABLE_MOD) - find_path(MODPLUG_INCLUDE_DIR libmodplug/modplug.h) - find_library(MODPLUG_LIBRARY modplug) - list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG) - list(APPEND SDL_MIXER_LIBRARIES ${MODPLUG_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(MODPLUG_LIBRARY_NAME "${MODPLUG_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DMODPLUG_DYNAMIC="${MODPLUG_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Ogg-Vorbis support -if(SDL_MIXER_ENABLE_OGGVORBIS) - find_path(VORBIS_INCLUDE_DIR vorbis/codec.h) - find_library(VORBISFILE_LIBRARY vorbisfile) - list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) - list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(VORBISFILE_LIBRARY_NAME "${VORBISFILE_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DOGG_DYNAMIC="${VORBISFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Opus support -if(SDL_MIXER_ENABLE_OPUS) - find_path(OPUS_INCLUDE_DIR opus/opusfile.h) - find_library(OPUSFILE_LIBRARY opusfile) - list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) - list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(OPUSFILE_LIBRARY_NAME "${OPUSFILE_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DOPUS_DYNAMIC="${OPUSFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Fluidsynth support -if(SDL_MIXER_ENABLE_FLUIDSYNTH) - find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) - find_library(FLUIDSYNTH_LIBRARY fluidsynth) - list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) - list(APPEND SDL_MIXER_LIBRARIES ${FLUIDSYNTH_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -add_library(SDL2_mixer - effect_position.c - effect_stereoreverse.c - effects_internal.c - load_aiff.c - load_voc.c - mixer.c - music.c - music_cmd.c - music_flac.c - music_fluidsynth.c - music_mad.c - music_mikmod.c - music_modplug.c - music_mpg123.c - music_ogg.c - music_opus.c - music_timidity.c - music_wav.c - version.rc) - -if((WIN32 OR APPLE) AND SDL_MIXER_ENABLE_NATIVEMIDI) - list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) - target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c) - target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES}) - if(WIN32) - target_sources(SDL2_mixer PRIVATE native_midi/native_midi_win32.c) - target_link_libraries(SDL2_mixer Winmm) - elseif(APPLE) - target_sources(SDL2_mixer PRIVATE native_midi/native_midi_macosx.c) - endif() -endif() - -set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL DLL_EXPORT) -target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES} ${SDL_MIXER_LOAD_DEFINES}) -target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi) - -install(TARGETS SDL2_mixer - EXPORT SDL2_mixer - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -install(EXPORT SDL2_mixer - DESTINATION share/sdl2-mixer/ - FILE sdl2-mixer-config.cmake - NAMESPACE SDL2:: -) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(PACKAGE "SDL2_mixer") -file(READ "SDL_mixer.h" header_contents) -# #define SDL_MIXER_MAJOR_VERSION 2 -# #define SDL_MIXER_MINOR_VERSION 0 -# #define SDL_MIXER_PATCHLEVEL 5 -string(REGEX MATCH "define *SDL_MIXER_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") -set(VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "define *SDL_MIXER_MINOR_VERSION *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -string(REGEX MATCH "define *SDL_MIXER_PATCHLEVEL *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -set(SDL_VERSION 0.0) -configure_file(SDL2_mixer.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc" @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc DESTINATION lib/pkgconfig) - -if(NOT SDL_MIXER_SKIP_HEADERS) - install(FILES SDL_mixer.h DESTINATION include/SDL2) -endif() - -message(STATUS "Link-time dependencies:") -foreach(LIBRARY ${SDL_MIXER_LIBRARIES}) - message(STATUS " " ${LIBRARY}) -endforeach() diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch deleted file mode 100644 index 0edcdf871..000000000 --- a/external_imported/vcpkg/ports/sdl2-mixer/fix-featurempg123.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/music_mpg123.c b/music_mpg123.c -index cd151b9..b4294ab 100644 ---- a/music_mpg123.c -+++ b/music_mpg123.c -@@ -31,7 +31,11 @@ - #include "music_mpg123.h" - - #include -- -+#ifdef _MSC_VER -+typedef ptrdiff_t MIX_SSIZE_T; -+#else -+typedef ssize_t MIX_SSIZE_T; -+#endif - - typedef struct { - int loaded; -@@ -49,7 +53,7 @@ typedef struct { - const char* (*mpg123_plain_strerror)(int errcode); - void (*mpg123_rates)(const long **list, size_t *number); - int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); -- 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, MIX_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; -@@ -96,7 +100,7 @@ static int MPG123_Load(void) - FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) - FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); - FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) -- 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, MIX_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)) - } -@@ -181,9 +185,9 @@ static char const* mpg_err(mpg123_handle* mpg, int result) - } - - /* 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) -+static MIX_SSIZE_T rwops_read(void* p, void* dst, size_t n) - { -- return (ssize_t)SDL_RWread((SDL_RWops*)p, dst, 1, n); -+ return (MIX_SSIZE_T )SDL_RWread((SDL_RWops*)p, dst, 1, n); - } - - static off_t rwops_seek(void* p, off_t offset, int whence) diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch new file mode 100644 index 000000000..90a337784 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkg-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70c4d0b..8038abee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -753,7 +753,7 @@ if(SDL2MIXER_INSTALL) + endif() + + ##### export files ##### +- if(WIN32 AND NOT MINGW) ++ if(0) + set(PKG_PREFIX "cmake") + else() + set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer") diff --git a/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch new file mode 100644 index 000000000..8face0103 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-mixer/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70c4d0b..8038abee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -796,7 +796,7 @@ if(SDL2MIXER_INSTALL) + COMPONENT devel + ) + +- if(SDL2MIXER_BUILD_SHARED_LIBS) ++ if(1) + # Only create a .pc file for a shared SDL2_mixer + set(VERSION ${FULL_VERSION}) + set(SDL_VERSION ${SDL_REQUIRED_VERSION}) diff --git a/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake b/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake index c0f1a0225..589356a26 100644 --- a/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2-mixer/portfile.cmake @@ -1,60 +1,40 @@ -set(SDL2_MIXER_VERSION 2.0.4) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" - FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" - SHA512 359b4f9877804f9c4b3cb608ca6082aab684f07a20a816ab71c8cdf85d26f76d67eeb5aee44daf52b7935d82aa3b45941f8f53f07ca3dd5150d6c58ed99e1492 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${SDL2_MIXER_VERSION} - PATCHES - fix-featurempg123.patch + REPO libsdl-org/SDL_mixer + REF 1cf51b6e16552e4118d90799ef752f7644efb9fd # release-2.6.1 + SHA512 c18c5d374ba1db8b07c796be5acae3e82b2191c43f9e1156b86f5ce6a088bd8200d9b7feee36de88d518f1ee2a6ff7410e911d37ac641ee4b46f7b098bf916fe + PATCHES fix-pkg-prefix.patch fix-pkgconfig.patch ) -if ("dynamic-load" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message("Building static library, disable dynamic loading") - elseif (NOT "mpg123" IN_LIST FEATURES - AND NOT "libflac" IN_LIST FEATURES - AND NOT "libmodplug" IN_LIST FEATURES - AND NOT "libvorbis" IN_LIST FEATURES - AND NOT "opusfile" IN_LIST FEATURES - ) - message("No features selected, dynamic loading will not be enabled") - endif() -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - dynamic-load SDL_DYNAMIC_LOAD - mpg123 SDL_MIXER_ENABLE_MP3 - libflac SDL_MIXER_ENABLE_FLAC - libmodplug SDL_MIXER_ENABLE_MOD - libvorbis SDL_MIXER_ENABLE_OGGVORBIS - opusfile SDL_MIXER_ENABLE_OPUS - nativemidi SDL_MIXER_ENABLE_NATIVEMIDI - fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH + fluidsynth SDL2MIXER_MIDI_FLUIDSYNTH + libflac SDL2MIXER_FLAC_LIBFLAC + libmodplug SDL2MIXER_MOD_MODPLUG + libvorbis SDL2MIXER_VORBIS_VORBISFILE + mpg123 SDL2MIXER_MP3_MPG123 + nativemidi SDL2MIXER_MIDI_NATIVE + opusfile SDL2MIXER_OPUS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DLIBRARY_SUFFIX=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} # It should always be dynamic suffix - OPTIONS_DEBUG - -DSDL_MIXER_SKIP_HEADERS=ON + -DSDL2MIXER_VENDORED=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "SDL2_mixer" + CONFIG_PATH "lib/cmake/SDL2_mixer" +) vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +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) diff --git a/external_imported/vcpkg/ports/sdl2-mixer/usage b/external_imported/vcpkg/ports/sdl2-mixer/usage new file mode 100644 index 000000000..efcc86b13 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-mixer/usage @@ -0,0 +1,4 @@ +sdl2-mixer provides CMake targets: + + find_package(SDL2_mixer CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static>) diff --git a/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json b/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json index a0286dd91..94ff15c90 100644 --- a/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2-mixer/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdl2-mixer", - "version": "2.0.4", - "port-version": 16, + "version": "2.6.1", + "port-version": 1, "description": "Multi-channel audio mixer library for SDL.", - "homepage": "https://www.libsdl.org/projects/SDL_mixer", + "homepage": "https://github.com/libsdl-org/SDL_mixer", + "license": "Zlib", "dependencies": [ "sdl2", { @@ -19,35 +20,32 @@ "nativemidi" ], "features": { - "dynamic-load": { - "description": "Load plugins with dynamic call." - }, "fluidsynth": { - "description": "Support for FluidSynth MIDI/SF2 audio format.", + "description": "Use FluidSynth to play MIDI audio format.", "dependencies": [ "fluidsynth" ] }, "libflac": { - "description": "Support for FLAC audio format.", + "description": "Use libflac to play FLAC audio format instead of the built-in dr_flac.", "dependencies": [ "libflac" ] }, "libmodplug": { - "description": "Support for MOD audio format.", + "description": "Support for MOD audio format using libmodplug.", "dependencies": [ "libmodplug" ] }, "libvorbis": { - "description": "Support for OGG Vorbis audio format.", + "description": "Use libvorbis to play OGG Vorbis audio format instead of the built-in stb_vorbis.", "dependencies": [ "libvorbis" ] }, "mpg123": { - "description": "Support for MP3 audio format.", + "description": "Use mpg123 to play MP3 audio format instead of the built-in dr_mp3.", "dependencies": [ "mpg123" ] @@ -56,7 +54,7 @@ "description": "Support for MIDI audio format on Windows and macOS." }, "opusfile": { - "description": "Support for Opus audio format.", + "description": "Support for Opus audio format using opusfile.", "dependencies": [ "opusfile" ] diff --git a/external_imported/vcpkg/ports/sdl2-ttf/CMakeLists.txt b/external_imported/vcpkg/ports/sdl2-ttf/CMakeLists.txt deleted file mode 100644 index 71f875902..000000000 --- a/external_imported/vcpkg/ports/sdl2-ttf/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(SDL2_TTF C) - -find_path(SDL_INCLUDE_DIR SDL2/SDL.h) -find_package(SDL2 CONFIG REQUIRED) -find_package(Freetype REQUIRED) - -add_library(SDL2_ttf SDL_ttf.c version.rc) - -set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL DLL_EXPORT) -target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(SDL2_ttf SDL2::SDL2 ${FREETYPE_LIBRARIES}) - -install(TARGETS SDL2_ttf - EXPORT SDL2_ttf - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -INSTALL(EXPORT SDL2_ttf - DESTINATION "share/sdl2-ttf" - FILE sdl2-ttf-config.cmake - NAMESPACE SDL2:: -) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(PACKAGE "SDL2_ttf") -file(READ "SDL_ttf.h" header_contents) -# #define SDL_TTF_MAJOR_VERSION 2 -# #define SDL_TTF_MINOR_VERSION 0 -# #define SDL_TTF_PATCHLEVEL 5 -string(REGEX MATCH "define *SDL_TTF_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") -set(VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "define *SDL_TTF_MINOR_VERSION *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -string(REGEX MATCH "define *SDL_TTF_PATCHLEVEL *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -set(SDL_VERSION 0.0) -configure_file(SDL2_ttf.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" @ONLY) -file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" "Requires.private: freetype2") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc DESTINATION lib/pkgconfig) - -if(NOT DEFINED SDL_TTF_SKIP_HEADERS) - install(FILES SDL_ttf.h DESTINATION include/SDL2) -endif() - -message(STATUS "Link-time dependencies:") -message(STATUS " " SDL2::SDL2) -message(STATUS " " ${FREETYPE_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/sdl2-ttf/fix-pkgconfig.patch b/external_imported/vcpkg/ports/sdl2-ttf/fix-pkgconfig.patch new file mode 100644 index 000000000..a6c32a18a --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-ttf/fix-pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a097d5c..ca2881f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,7 +333,7 @@ if(SDL2TTF_INSTALL) + COMPONENT devel + ) + +- if(SDL2TTF_BUILD_SHARED_LIBS) ++ if(1) + # Only create a .pc file for a shared SDL2_ttf + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +@@ -352,7 +360,7 @@ if(SDL2TTF_INSTALL) + \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\" ONLY_IF_DIFFERENT) + file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\" + TYPE FILE +- FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")" CONFIG Release) ++ FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")") + endif() + + if(SDL2TTF_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID))) diff --git a/external_imported/vcpkg/ports/sdl2-ttf/portfile.cmake b/external_imported/vcpkg/ports/sdl2-ttf/portfile.cmake index 781c47766..e6c2eba9a 100644 --- a/external_imported/vcpkg/ports/sdl2-ttf/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2-ttf/portfile.cmake @@ -1,31 +1,38 @@ -set(VERSION 2.0.15) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${VERSION}.tar.gz" - FILENAME "SDL2_ttf-${VERSION}.tar.gz" - SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsdl-org/SDL_ttf + REF f5e4828ffc9d3a84f00011fede4446aecb4a685f #v2.20.0 + SHA512 c0d2d6107e5427d9c1353e14cb4b0c3957d28391cfc772f1f972fe3aa8ba9e9dfdfcb64acd317a7836d46b3a50da9597b19a832f0baf5198654acb7b31ab1e6b + HEAD_REF main + PATCHES + fix-pkgconfig.patch ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + harfbuzz SDL2TTF_HARFBUZZ ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSDL2TTF_VENDORED=OFF + -DSDL2TTF_SAMPLES=OFF + ${FEATURE_OPTIONS} +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DSDL_TTF_SKIP_HEADERS=ON) +vcpkg_cmake_install() +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_ttf CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_ttf CONFIG_PATH lib/cmake/SDL2_ttf) +endif() -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") -file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/copyright) +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) diff --git a/external_imported/vcpkg/ports/sdl2-ttf/usage b/external_imported/vcpkg/ports/sdl2-ttf/usage new file mode 100644 index 000000000..200fbb972 --- /dev/null +++ b/external_imported/vcpkg/ports/sdl2-ttf/usage @@ -0,0 +1,4 @@ +sdl2-ttf provides CMake targets: + + find_package(SDL2_ttf CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>) diff --git a/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json b/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json index 58978546c..db684d5b0 100644 --- a/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2-ttf/vcpkg.json @@ -1,11 +1,27 @@ { "name": "sdl2-ttf", - "version-string": "2.0.15", - "port-version": 5, + "version": "2.20.0", "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", + "license": "Zlib", "dependencies": [ "freetype", - "sdl2" - ] + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "harfbuzz": { + "description": "Enable HarfBuzz support", + "dependencies": [ + "harfbuzz" + ] + } + } } diff --git a/external_imported/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/external_imported/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index 269f8f5ef..e72b3a916 100644 --- a/external_imported/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch +++ b/external_imported/vcpkg/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -1,23 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa36eb02c..feb8a3b35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2555,7 +2555,6 @@ endif() - configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" - "${SDL2_BINARY_DIR}/include/SDL_revision.h") +@@ -2833,8 +2833,6 @@ foreach(_hdr IN LISTS SDL2_INCLUDE_FILES) + endforeach() + list(APPEND SDL_GENERATED_HEADERS ${SDL2_COPIED_INCLUDE_FILES}) -if(NOT WINDOWS OR CYGWIN OR MINGW) - +- set(prefix ${CMAKE_INSTALL_PREFIX}) + file(RELATIVE_PATH bin_prefix_relpath "${CMAKE_INSTALL_FULL_BINDIR}" "${CMAKE_INSTALL_PREFIX}") + +@@ -2861,6 +2859,7 @@ Libs.private:") + endif() -@@ -2590,7 +2590,7 @@ Libs.private:") - set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) - listtostrrev(SDL_LIBS _SDL_LIBS) - set(SDL_LIBS ${_SDL_LIBS}) -- else() -+ elseif(NOT WINDOWS_STORE) - listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") - set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) - list(REMOVE_DUPLICATES SDL_STATIC_LIBS) -@@ -2611,7 +2611,6 @@ Libs.private:") + # Clean up the different lists ++ if(NOT WINDOWS_STORE) + listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") + set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) + list(REMOVE_DUPLICATES SDL_STATIC_LIBS) +@@ -2870,6 +2869,7 @@ Libs.private:") + set(SDL_LIBS ${_SDL_LIBS}) + listtostr(SDL_CFLAGS _SDL_CFLAGS "") + set(SDL_CFLAGS ${_SDL_CFLAGS}) ++ endif() + + # MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}") + # MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}") +@@ -2882,7 +2882,6 @@ Libs.private:") "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -25,12 +35,11 @@ macro(check_add_debug_flag FLAG SUFFIX) check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) -@@ -2956,6 +2956,7 @@ if(NOT (WINDOWS OR CYGWIN) OR MINGW) - # TODO: what about the .spec file? Is it only needed for RPM creation? - install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") +@@ -3310,6 +3309,7 @@ if(NOT SDL2_DISABLE_INSTALL) + install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") + install(FILES "LICENSE.txt" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${PROJECT_NAME}") + endif() ++ install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") endif() -+install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") ##### Uninstall target ##### - - \ No newline at end of file diff --git a/external_imported/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/external_imported/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch index b7c56c14b..20765aabc 100644 --- a/external_imported/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch +++ b/external_imported/vcpkg/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -1,6 +1,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa36eb02c..c01ee2e4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1342,12 +1342,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) +@@ -1434,11 +1434,6 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU) set(HAVE_FCITX TRUE) endif() @@ -8,7 +10,6 @@ - if(IBUS_FOUND) - set(HAVE_IBUS_IBUS_H TRUE) - target_include_directories(sdl-build-options INTERFACE "${IBUS_INCLUDE_DIRS}") -- list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) - endif() if (HAVE_IBUS_IBUS_H OR HAVE_FCITX) diff --git a/external_imported/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch b/external_imported/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch deleted file mode 100644 index e24057c3e..000000000 --- a/external_imported/vcpkg/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/SDL2Config.cmake -+++ b/SDL2Config.cmake -@@ -46,6 +46,7 @@ foreach(prop ${relprops}) - endif() - endforeach() - -+if(NOT WINDOWS_STORE) - foreach(prop ${relprops}) - get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) - if(sdl2mainimplib) -@@ -53,6 +54,7 @@ foreach(prop ${relprops}) - break() - endif() - endforeach() -+endif() - - foreach(prop ${dbgprops}) - get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) -@@ -62,6 +64,7 @@ foreach(prop ${dbgprops}) - endif() - endforeach() - -+if(NOT WINDOWS_STORE) - foreach(prop ${dbgprops}) - get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) - if(sdl2mainimplibdbg) -@@ -69,6 +72,7 @@ foreach(prop ${dbgprops}) - break() - endif() - endforeach() -+endif() - - if( sdl2implib AND sdl2mainimplib AND sdl2implibdbg AND sdl2mainimplibdbg ) - # we have both release and debug builds of SDL2 and SDL2main, so use this ugly diff --git a/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch b/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch deleted file mode 100644 index ac8f185a7..000000000 --- a/external_imported/vcpkg/ports/sdl2/0004-Define-crt-macros.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -602,6 +602,11 @@ if(USE_GCC OR USE_CLANG) - list(APPEND EXTRA_CFLAGS -fcolor-diagnostics) - endif() - endif() - endif() -+if(MSVC) -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_DEPRECATE") -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_NONSTDC_NO_DEPRECATE") -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_WARNINGS") -+endif() - - if(SDL_ASSEMBLY) - diff --git a/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch b/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch deleted file mode 100644 index eb67d882d..000000000 --- a/external_imported/vcpkg/ports/sdl2/0005-Fix-uwp-joystick.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1755,8 +1755,10 @@ elseif(WINDOWS) - list(APPEND EXTRA_LIBS dinput8) - endif() - if(HAVE_XINPUT_H) -- set(SDL_JOYSTICK_XINPUT 1) -- set(HAVE_XINPUT TRUE) -+ if(NOT WINDOWS_STORE) -+ set(SDL_JOYSTICK_XINPUT 1) -+ set(HAVE_XINPUT TRUE) -+ endif() - if(HAVE_WINDOWS_GAMING_INPUT_H) - set(SDL_JOYSTICK_WGI 1) - endif() -@@ -1764,7 +1766,7 @@ elseif(WINDOWS) - set(HAVE_SDL_JOYSTICK TRUE) - - if(SDL_HAPTIC) -- if(HAVE_DINPUT_H OR HAVE_XINPUT_H) -+ if((HAVE_DINPUT_H OR HAVE_XINPUT_H) AND NOT WINDOWS_STORE) - file(GLOB HAPTIC_SOURCES ${SDL2_SOURCE_DIR}/src/haptic/windows/*.c) - if(HAVE_DINPUT_H) - set(SDL_HAPTIC_DINPUT 1) - diff --git a/external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch b/external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch deleted file mode 100644 index 84a58f318..000000000 --- a/external_imported/vcpkg/ports/sdl2/0006-Update-SDL_sysurl.cpp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/misc/winrt/SDL_sysurl.cpp -+++ b/src/misc/winrt/SDL_sysurl.cpp -@@ -18,10 +18,9 @@ - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - */ --#include - --#include "../../core/windows/SDL_windows.h" - #include "../SDL_sysurl.h" -+#include "../../core/windows/SDL_windows.h" - - int - SDL_SYS_OpenURL(const char *url) - diff --git a/external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch b/external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch deleted file mode 100644 index 39665a9b8..000000000 --- a/external_imported/vcpkg/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 99af3281ee11ff947a82c561c2a275627ccea90c Mon Sep 17 00:00:00 2001 -From: Charlie Birks -Date: Sat, 22 Jan 2022 12:27:43 +0000 -Subject: [PATCH] timer: Fix Emscripten declaration-after-statement error - ---- - src/timer/unix/SDL_systimer.c | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c -index 57fdab09c..2cf26764c 100644 ---- a/src/timer/unix/SDL_systimer.c -+++ b/src/timer/unix/SDL_systimer.c -@@ -187,13 +187,6 @@ SDL_GetPerformanceFrequency(void) - void - SDL_Delay(Uint32 ms) - { --#ifdef __EMSCRIPTEN__ -- if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { -- /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ -- emscripten_sleep(ms); -- return; -- } --#endif - int was_error; - - #if HAVE_NANOSLEEP -@@ -203,6 +196,14 @@ SDL_Delay(Uint32 ms) - Uint64 then, now, elapsed; - #endif - -+#ifdef __EMSCRIPTEN__ -+ if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { -+ /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ -+ emscripten_sleep(ms); -+ return; -+ } -+#endif -+ - /* Set the timeout interval */ - #if HAVE_NANOSLEEP - elapsed.tv_sec = ms / 1000; --- -2.35.1 - diff --git a/external_imported/vcpkg/ports/sdl2/portfile.cmake b/external_imported/vcpkg/ports/sdl2/portfile.cmake index 67c43d4bb..9083b8982 100644 --- a/external_imported/vcpkg/ports/sdl2/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2/portfile.cmake @@ -1,18 +1,13 @@ -set(SDL2_VERSION 2.0.20) +set(SDL2_VERSION 2.24.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF release-2.0.20 - SHA512 f8558057a06d4507190b369b2067aee55c22ab796b90bb663fbc36218e66ec14e2feb0ecd55f9b798bfd24fc94e2b4cb93eddc52a59f0709d6cb0ebdb6d9309b + REF 8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac #vrelease-2.24.0 + SHA512 7936fc3de9920eafe399f5b2af7bf87d479d4ba8c4a7957da90f3a90316dc7a6b8619ffd7a2c198d298d390e1235e00f9bd36fe3f04102bdff351b96c2ade59e HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch - 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch - 0004-Define-crt-macros.patch - 0005-Fix-uwp-joystick.patch - 0006-Update-SDL_sysurl.cpp.patch - 0007-timer-Fix-Emscripten-declaration-after-statement-err.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -21,24 +16,34 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan SDL_VULKAN - x11 SDL_X11_SHARED + vulkan SDL_VULKAN + x11 SDL_X11_SHARED + wayland SDL_WAYLAND_SHARED ) if ("x11" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature x11 only support UNIX.") - endif() message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") endif() +if ("wayland" IN_LIST FEATURES) + message(WARNING "You will need to install Wayland dependencies to use feature wayland:\nsudo apt install libwayland-dev libxkbcommon-dev libegl1-mesa-dev\n") +endif() + +if(VCPKG_TARGET_IS_UWP) + set(configure_opts WINDOWS_USE_MSBUILD) +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + ${configure_opts} OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DSDL_LIBC=ON + -DSDL_HIDAPI_JOYSTICK=ON + -DSDL_TEST=OFF + MAYBE_UNUSED_VARIABLES + SDL_FORCE_STATIC_VCRT ) vcpkg_cmake_install() @@ -84,7 +89,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP AND NOT VCPKG_TARGET_IS_M endforeach() endif() -configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") @@ -99,4 +103,15 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2-static ") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2d " "-lSDL2-staticd ") + endif() +endif() + vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/sdl2/vcpkg.json b/external_imported/vcpkg/ports/sdl2/vcpkg.json index af0042840..6440727e2 100644 --- a/external_imported/vcpkg/ports/sdl2/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sdl2", - "version": "2.0.20", - "port-version": 1, + "version": "2.24.0", "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/download-2.0.php", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", @@ -18,8 +18,13 @@ "vulkan": { "description": "Vulkan functionality for SDL" }, + "wayland": { + "description": "Dynamically load Wayland support", + "supports": "linux" + }, "x11": { - "description": "Dynamically load X11 support" + "description": "Dynamically load X11 support", + "supports": "!windows" } } } diff --git a/external_imported/vcpkg/ports/sdl2pp/fix-dependencies.patch b/external_imported/vcpkg/ports/sdl2pp/fix-dependencies.patch index 48e5c8f97..14300c0de 100644 --- a/external_imported/vcpkg/ports/sdl2pp/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/sdl2pp/fix-dependencies.patch @@ -2,27 +2,36 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cdfd2a6..dc08748 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,11 +23,15 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) +@@ -23,10 +23,25 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # depends FIND_PACKAGE(SDL2 REQUIRED) -SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) -SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY}) -+SET(SDL2_ALL_INCLUDE_DIRS ) -+IF (BUILD_SHARED_LIBS) ++SET(SDL2_ALL_INCLUDE_DIRS "") ++IF(TARGET SDL2::SDL2) + SET(SDL2_ALL_LIBRARIES SDL2::SDL2) +ELSE() + SET(SDL2_ALL_LIBRARIES SDL2::SDL2-static) +ENDIF() SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) -SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY}) --SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) -+SET(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) -+SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES SDL2::SDL2main) ++set(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) ++get_target_property(SDL2_MAIN_LIBRARY_DEBUG SDL2::SDL2main IMPORTED_LOCATION_DEBUG) ++get_target_property(SDL2_MAIN_LIBRARY_RELEASE SDL2::SDL2main IMPORTED_LOCATION_RELEASE) ++get_target_property(SDL2_MAIN_LIBRARY_GENERAL SDL2::SDL2main IMPORTED_LOCATION) ++set(SDL2MAIN_LIBRARY "") ++if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND SDL2_MAIN_LIBRARY_DEBUG) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_DEBUG}") ++elseif(SDL2_MAIN_LIBRARY_RELEASE) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_RELEASE}") ++elseif(SDL2_MAIN_LIBRARY_GENERAL) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_GENERAL}") ++endif() + SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) IF(MINGW) - SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library") -@@ -36,27 +40,27 @@ IF(MINGW) +@@ -36,18 +40,16 @@ IF(MINGW) ENDIF(MINGW) IF(SDL2PP_WITH_IMAGE) @@ -30,7 +39,6 @@ index cdfd2a6..dc08748 100644 - SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY}) + FIND_PACKAGE(sdl2-image CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) + SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_image) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image") ELSE(SDL2PP_WITH_IMAGE) @@ -38,35 +46,22 @@ index cdfd2a6..dc08748 100644 ENDIF(SDL2PP_WITH_IMAGE) IF(SDL2PP_WITH_TTF) -- FIND_PACKAGE(SDL2_ttf REQUIRED) + FIND_PACKAGE(SDL2_ttf REQUIRED) - SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY}) -+ FIND_PACKAGE(sdl2-ttf CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) -+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_ttf) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") ELSE(SDL2PP_WITH_TTF) MESSAGE(STATUS "SDL2_ttf support disabled") - ENDIF(SDL2PP_WITH_TTF) - +@@ -56,7 +60,7 @@ ENDIF(SDL2PP_WITH_TTF) IF(SDL2PP_WITH_MIXER) -- FIND_PACKAGE(SDL2_mixer REQUIRED) -- SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) + FIND_PACKAGE(SDL2_mixer REQUIRED) + SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY}) -+ FIND_PACKAGE(sdl2-mixer CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) -+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_mixer) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_mixer::SDL2_mixer) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") ELSE(SDL2PP_WITH_MIXER) MESSAGE(STATUS "SDL2_mixer support disabled") -@@ -81,7 +85,6 @@ ELSE(MSVC) - ENDIF() - ENDIF(MSVC) - --LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS) - - INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}) - INCLUDE_DIRECTORIES(SYSTEM ${SDL2_ALL_INCLUDE_DIRS}) @@ -200,10 +203,10 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OPTION(SDL2PP_STATIC "Build static library instead of shared one" OFF) diff --git a/external_imported/vcpkg/ports/sdl2pp/portfile.cmake b/external_imported/vcpkg/ports/sdl2pp/portfile.cmake index 265c9bf50..67ddaba17 100644 --- a/external_imported/vcpkg/ports/sdl2pp/portfile.cmake +++ b/external_imported/vcpkg/ports/sdl2pp/portfile.cmake @@ -18,6 +18,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL2PP_STATIC) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKEMODDIR=share/${PORT} -DSDL2PP_WITH_EXAMPLES=OFF -DSDL2PP_WITH_TESTS=OFF -DSDL2PP_STATIC=${SDL2PP_STATIC} @@ -26,8 +27,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/sdl2pp/usage b/external_imported/vcpkg/ports/sdl2pp/usage index e19381a32..866ef7c8f 100644 --- a/external_imported/vcpkg/ports/sdl2pp/usage +++ b/external_imported/vcpkg/ports/sdl2pp/usage @@ -1,4 +1,5 @@ -The package sdl2pp provides CMake targets: - - find_package(SDL2PP REQUIRED) - target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS}) +The package sdl2pp provides CMake variables: + + find_package(SDL2PP REQUIRED) + target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${SDL2PP_LIBRARIES}) diff --git a/external_imported/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake index 5141fdd39..b0eac9e1b 100644 --- a/external_imported/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/sdl2pp/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,5 @@ -set(SDL2PP_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules) - +set(Z_VCPKG_SDL2PP_PREV_MODULE_PATH "${CMAKE_MODULE_PATH}") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") _find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${SDL2PP_PREV_MODULE_PATH}) +set(CMAKE_MODULE_PATH "${Z_VCPKG_SDL2PP_PREV_MODULE_PATH}") +unset(Z_VCPKG_SDL2PP_PREV_MODULE_PATH) diff --git a/external_imported/vcpkg/ports/sdl2pp/vcpkg.json b/external_imported/vcpkg/ports/sdl2pp/vcpkg.json index 316c630be..3ed283ae0 100644 --- a/external_imported/vcpkg/ports/sdl2pp/vcpkg.json +++ b/external_imported/vcpkg/ports/sdl2pp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 2, + "port-version": 5, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", + "license": "Zlib", "dependencies": [ "sdl2", "sdl2-image", diff --git a/external_imported/vcpkg/ports/seal/portfile.cmake b/external_imported/vcpkg/ports/seal/portfile.cmake index 868a030e7..b4a73e829 100644 --- a/external_imported/vcpkg/ports/seal/portfile.cmake +++ b/external_imported/vcpkg/ports/seal/portfile.cmake @@ -11,6 +11,12 @@ vcpkg_from_github( shared-zstd.patch ) +vcpkg_replace_string( + "${SOURCE_PATH}/cmake/CheckCXXIntrinsicsSpecific.cmake" + "check_cxx_source_runs" + "check_cxx_source_compiles" +) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ms-gsl SEAL_USE_MSGSL diff --git a/external_imported/vcpkg/ports/seal/vcpkg.json b/external_imported/vcpkg/ports/seal/vcpkg.json index be1b20e5d..bccf3b64e 100644 --- a/external_imported/vcpkg/ports/seal/vcpkg.json +++ b/external_imported/vcpkg/ports/seal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seal", "version-semver": "3.7.2", - "port-version": 2, + "port-version": 3, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "dependencies": [ diff --git a/external_imported/vcpkg/ports/secp256k1/CMakeLists.txt b/external_imported/vcpkg/ports/secp256k1/CMakeLists.txt index a3af313b6..3fe32d099 100644 --- a/external_imported/vcpkg/ports/secp256k1/CMakeLists.txt +++ b/external_imported/vcpkg/ports/secp256k1/CMakeLists.txt @@ -2,34 +2,84 @@ cmake_minimum_required(VERSION 3.8) project(secp256k1 C) option(INSTALL_HEADERS "Install header files" ON) +option(BUILD_TOOLS "Build tools" OFF) +option(BUILD_EXAMPLES "Build examples" OFF) add_definitions( -DENABLE_MODULE_ECDH -DENABLE_MODULE_RECOVERY - -DHAVE_CONFIG_H + -DENABLE_MODULE_EXTRAKEYS + -DENABLE_MODULE_SCHNORRSIG ) file(GLOB SOURCES src/secp256k1.c) add_library(secp256k1 ${SOURCES}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(secp256k1 PUBLIC $ $ $) -target_include_directories(secp256k1 PUBLIC $ $) +file(GLOB SOURCES_PRECOMP src/precomputed_ecmult.c src/precomputed_ecmult_gen.c) +add_library(secp256k1_precomputed ${SOURCES_PRECOMP}) + +target_include_directories(secp256k1_precomputed PUBLIC $ $) + +if (BUILD_TOOLS) + add_executable(bench src/bench.c) + target_link_libraries(bench PRIVATE secp256k1 secp256k1_precomputed) + + add_executable(bench_internal src/bench_internal.c) + target_link_libraries(bench_internal PRIVATE secp256k1_precomputed) + + add_executable(bench_ecmult src/bench_ecmult.c) + target_link_libraries(bench_ecmult PRIVATE secp256k1_precomputed) + + install(TARGETS bench bench_internal bench_ecmult RUNTIME DESTINATION bin) +endif() + +if (BUILD_EXAMPLES) + add_executable(ecdsa_example examples/ecdsa.c) + target_include_directories(ecdsa_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(ecdsa_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(ecdsa_example PRIVATE Bcrypt) + endif() + + add_executable(ecdh_example examples/ecdh.c) + target_include_directories(ecdh_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(ecdh_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(ecdh_example PRIVATE Bcrypt) + endif() + + add_executable(schnorr_example examples/schnorr.c) + target_include_directories(schnorr_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(schnorr_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(schnorr_example PRIVATE Bcrypt) + endif() + + install(TARGETS ecdsa_example ecdh_example schnorr_example RUNTIME DESTINATION bin) +endif() if(INSTALL_HEADERS) file(GLOB HEADERS include/*.h) install(FILES ${HEADERS} DESTINATION include) endif() -install(TARGETS secp256k1 EXPORT unofficial-secp256k1-targets +install(TARGETS secp256k1 EXPORT unofficial-secp256k1-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(TARGETS secp256k1_precomputed EXPORT unofficial-secp256k1-config RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( - EXPORT unofficial-secp256k1-targets - FILE unofficial-secp256k1-targets.cmake + EXPORT unofficial-secp256k1-config + FILE unofficial-secp256k1-config.cmake NAMESPACE unofficial:: DESTINATION share/unofficial-secp256k1 -) \ No newline at end of file +) diff --git a/external_imported/vcpkg/ports/secp256k1/libsecp256k1-config.h b/external_imported/vcpkg/ports/secp256k1/libsecp256k1-config.h deleted file mode 100644 index 693d3ed25..000000000 --- a/external_imported/vcpkg/ports/secp256k1/libsecp256k1-config.h +++ /dev/null @@ -1,29 +0,0 @@ -/********************************************************************** - * Copyright (c) 2013, 2014 Pieter Wuille * - * Distributed under the MIT software license, see the accompanying * - * file COPYING or http://www.opensource.org/licenses/mit-license.php.* - **********************************************************************/ - -#ifndef SECP256K1_BASIC_CONFIG_H -#define SECP256K1_BASIC_CONFIG_H - -#undef USE_ASM_X86_64 -#undef USE_ENDOMORPHISM -#undef USE_FIELD_10X26 -#undef USE_FIELD_5X52 -#undef USE_FIELD_INV_BUILTIN -#undef USE_FIELD_INV_NUM -#undef USE_NUM_GMP -#undef USE_NUM_NONE -#undef USE_SCALAR_4X64 -#undef USE_SCALAR_8X32 -#undef USE_SCALAR_INV_BUILTIN -#undef USE_SCALAR_INV_NUM - -#define USE_NUM_NONE 1 -#define USE_FIELD_INV_BUILTIN 1 -#define USE_SCALAR_INV_BUILTIN 1 -#define USE_FIELD_10X26 1 -#define USE_SCALAR_8X32 1 - -#endif /* SECP256K1_BASIC_CONFIG_H */ diff --git a/external_imported/vcpkg/ports/secp256k1/portfile.cmake b/external_imported/vcpkg/ports/secp256k1/portfile.cmake index 3bf158816..4c63bebed 100644 --- a/external_imported/vcpkg/ports/secp256k1/portfile.cmake +++ b/external_imported/vcpkg/ports/secp256k1/portfile.cmake @@ -2,24 +2,45 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "bitcoin-core/secp256k1" - REF "0b7024185045a49a1a6a4c5615bf31c94f63d9c4" - SHA512 54e0c446ae63105800dfaf23dc934734f196c91f275db0455e58a36926c29ecc51a13d9b1eb2e45bc86199120c3c472ec7b39086787a49ce388a4df462a870bc + REPO bitcoin-core/secp256k1 + REF 3efeb9da21368c02cad58435b2ccdf6eb4b359c3 + SHA512 6d792943f9277a1b4c36dad62389cb38e0b93efb570b6af6c41afdb936d10ca30d4c2e4e743fc0f113d1f9785891d1e9d1fe224d7b8abd4197a9f5febf0febd6 ) -file(COPY ${CURRENT_PORT_DIR}/libsecp256k1-config.h DESTINATION ${SOURCE_PATH}) -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 - OPTIONS_DEBUG +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS + examples BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-${PORT}" PACKAGE_NAME unofficial-${PORT}) + +if (BUILD_TOOLS OR BUILD_EXAMPLES) + set(SECP256K1_TOOLS "") + if (BUILD_TOOLS) + list(APPEND SECP256K1_TOOLS bench bench_internal bench_ecmult) + endif() + + if (BUILD_EXAMPLES) + list(APPEND SECP256K1_TOOLS ecdsa_example ecdh_example schnorr_example) + endif() + + vcpkg_copy_tools(TOOL_NAMES ${SECP256K1_TOOLS} AUTO_CLEAN) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${CMAKE_CURRENT_LIST_DIR}/secp256k1-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-secp256k1-config.cmake @ONLY) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/secp256k1/secp256k1-config.cmake b/external_imported/vcpkg/ports/secp256k1/secp256k1-config.cmake deleted file mode 100644 index 5cc40fe82..000000000 --- a/external_imported/vcpkg/ports/secp256k1/secp256k1-config.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-secp256k1-targets.cmake") diff --git a/external_imported/vcpkg/ports/secp256k1/vcpkg.json b/external_imported/vcpkg/ports/secp256k1/vcpkg.json index 43a10ad02..8026e540c 100644 --- a/external_imported/vcpkg/ports/secp256k1/vcpkg.json +++ b/external_imported/vcpkg/ports/secp256k1/vcpkg.json @@ -1,7 +1,26 @@ { "name": "secp256k1", - "version-string": "2017-19-10", - "port-version": 4, + "version-date": "2022-07-11", + "port-version": 1, "description": "Optimized C library for EC operations on curve", - "homepage": "https://github.com/bitcoin-core/secp256k1" + "homepage": "https://github.com/bitcoin-core/secp256k1", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "examples": { + "description": "Build examples" + }, + "tools": { + "description": "Build tools" + } + } } diff --git a/external_imported/vcpkg/ports/sentry-native/portfile.cmake b/external_imported/vcpkg/ports/sentry-native/portfile.cmake index 59ad22c2e..0c685cc02 100644 --- a/external_imported/vcpkg/ports/sentry-native/portfile.cmake +++ b/external_imported/vcpkg/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.15/sentry-native.zip" - FILENAME "sentry-native-0.4.15.zip" - SHA512 bbe568cc92fa20d69db5bb9efc5ac1a27d05c3ac28c36addd827fba64b2945ce23cbdb3c0daf76b0a140de4949b6c76607f00000ceb7989d8a33b791d30c8152 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.5.0/sentry-native.zip" + FILENAME "sentry-native-0.5.0.zip" + SHA512 54ee5fcbcd58cb70d7acc55a91ef6eb19751321b35d8fd3b0173fe52b1034023dbeb5c891554615b1277e1a1644b25c28ba0c4712839765dd790e3055ab0e79c ) vcpkg_extract_source_archive_ex( @@ -38,6 +38,8 @@ vcpkg_cmake_configure( -DSENTRY_BUILD_EXAMPLES=OFF -DSENTRY_BACKEND=${SENTRY_BACKEND} -DCRASHPAD_ZLIB_SYSTEM=ON + MAYBE_UNUSED_VARIABLES + CRASHPAD_ZLIB_SYSTEM ) vcpkg_cmake_install() @@ -46,7 +48,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sentry) +vcpkg_cmake_config_fixup(PACKAGE_NAME sentry CONFIG_PATH lib/cmake/sentry) if (SENTRY_BACKEND STREQUAL "crashpad") vcpkg_copy_tools( diff --git a/external_imported/vcpkg/ports/sentry-native/vcpkg.json b/external_imported/vcpkg/ports/sentry-native/vcpkg.json index b25d67db0..0fecfcb8a 100644 --- a/external_imported/vcpkg/ports/sentry-native/vcpkg.json +++ b/external_imported/vcpkg/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.15", + "version": "0.5.0", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/external_imported/vcpkg/ports/septag-dmon/portfile.cmake b/external_imported/vcpkg/ports/septag-dmon/portfile.cmake new file mode 100644 index 000000000..2628c4306 --- /dev/null +++ b/external_imported/vcpkg/ports/septag-dmon/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO septag/dmon + REF 59fac713a168b6c9fd08db48da49f7bd50fd9d37 + SHA512 61fa6a0e243be456d3b59d20e18183392d106983dc9f1b0a7290b54fefa964d4eeba4bacd92cd5310b6f3da2dac232fd043c529c51fe3e6cccbfb9422dd31311 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTS=OFF" +) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/septag-dmon/vcpkg.json b/external_imported/vcpkg/ports/septag-dmon/vcpkg.json new file mode 100644 index 000000000..d9df93c87 --- /dev/null +++ b/external_imported/vcpkg/ports/septag-dmon/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "septag-dmon", + "version-date": "2022-02-08", + "description": "a tiny C library that monitors changes in a directory", + "homepage": "https://github.com/septag/dmon", + "license": "BSD-2-Clause", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/sfgui/002-add-limits-header.patch b/external_imported/vcpkg/ports/sfgui/002-add-limits-header.patch new file mode 100644 index 000000000..e16e57663 --- /dev/null +++ b/external_imported/vcpkg/ports/sfgui/002-add-limits-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/SFGUI/ComboBox.cpp b/src/SFGUI/ComboBox.cpp +index a01937b..454ec3e 100644 +--- a/src/SFGUI/ComboBox.cpp ++++ b/src/SFGUI/ComboBox.cpp +@@ -9,6 +9,8 @@ + #include + #include + ++#include ++ + namespace sfg { + + // Signals. diff --git a/external_imported/vcpkg/ports/sfgui/portfile.cmake b/external_imported/vcpkg/ports/sfgui/portfile.cmake index b2c678765..ee3974c10 100644 --- a/external_imported/vcpkg/ports/sfgui/portfile.cmake +++ b/external_imported/vcpkg/ports/sfgui/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES "001-fix-corefoundation-link.patch" + "002-add-limits-header.patch" ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) diff --git a/external_imported/vcpkg/ports/sfgui/vcpkg.json b/external_imported/vcpkg/ports/sfgui/vcpkg.json index aa4ea2c85..e0cbe393a 100644 --- a/external_imported/vcpkg/ports/sfgui/vcpkg.json +++ b/external_imported/vcpkg/ports/sfgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfgui", - "version-string": "0.4.0", - "port-version": 4, + "version": "0.4.0", + "port-version": 5, "description": "simple and fast graphical user interface library", "homepage": "https://github.com/TankOs/SFGUI", "dependencies": [ diff --git a/external_imported/vcpkg/ports/sfml/fix-dependencies.patch b/external_imported/vcpkg/ports/sfml/fix-dependencies.patch new file mode 100644 index 000000000..cea4ebff7 --- /dev/null +++ b/external_imported/vcpkg/ports/sfml/fix-dependencies.patch @@ -0,0 +1,75 @@ +diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in +index ce81953..bd2d330 100644 +--- a/cmake/SFMLConfig.cmake.in ++++ b/cmake/SFMLConfig.cmake.in +@@ -1,3 +1,8 @@ ++set(SFML_STATIC_LIBRARIES false) ++if(NOT "@BUILD_SHARED_LIBS@") ++ set(SFML_STATIC_LIBRARIES true) ++endif() ++include(CMakeFindDependencyMacro) + # This script provides the SFML libraries as imported targets + # ------------------------------------ + # +diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in +index 1028110..927d1a4 100644 +--- a/cmake/SFMLConfigDependencies.cmake.in ++++ b/cmake/SFMLConfigDependencies.cmake.in +@@ -56,6 +56,9 @@ if(SFML_STATIC_LIBRARIES) + if (FIND_SFML_OS_WINDOWS) + set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32") + elseif(NOT FIND_SFML_OS_IOS) ++ set(OpenGL_GL_PREFERENCE "@EXPORT_OpenGL_GL_PREFERENCE@") ++ find_dependency(OpenGL) ++ set(OpenGL_LIB OpenGL::GL) + sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL") + endif() + endif() +@@ -63,6 +66,8 @@ if(SFML_STATIC_LIBRARIES) + # sfml-graphics + list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX) + if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1) ++ find_dependency(Freetype) ++ set(FreeType_LIB Freetype::Freetype) + sfml_bind_dependency(TARGET Freetype FRIENDLY_NAME "FreeType" SEARCH_NAMES "freetype") + endif() + +diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt +index 883c758..402efbe 100644 +--- a/src/SFML/Graphics/CMakeLists.txt ++++ b/src/SFML/Graphics/CMakeLists.txt +@@ -97,7 +97,8 @@ sfml_add_library(sfml-graphics + target_link_libraries(sfml-graphics PUBLIC sfml-window) + + # stb_image sources +-target_include_directories(sfml-graphics PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") ++find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) ++target_include_directories(sfml-graphics PRIVATE "${STB_INCLUDE_DIR}") + + # let CMake know about our additional graphics libraries paths + if(SFML_OS_WINDOWS) +@@ -134,7 +134,8 @@ if(SFML_OS_ANDROID) + target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM) + endif() + +-sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") ++set(FreeType_LIB Freetype::Freetype) ++sfml_find_package(Freetype LINK FreeType_LIB) + target_link_libraries(sfml-graphics PRIVATE Freetype) + + # add preprocessor symbols +diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt +index 98ea439..0f1fb53 100644 +--- a/src/SFML/Window/CMakeLists.txt ++++ b/src/SFML/Window/CMakeLists.txt +@@ -254,7 +254,9 @@ if(SFML_OPENGL_ES) + target_link_libraries(sfml-window PRIVATE EGL GLESv1_CM) + endif() + else() +- sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_LIBRARIES") ++ set(EXPORT_OpenGL_GL_PREFERENCE "${OpenGL_GL_PREFERENCE}" CACHE INTERNAL "") ++ set(OpenGL_LIB OpenGL::GL) ++ sfml_find_package(OpenGL LINK OpenGL_LIB) + target_link_libraries(sfml-window PRIVATE OpenGL) + endif() + diff --git a/external_imported/vcpkg/ports/sfml/portfile.cmake b/external_imported/vcpkg/ports/sfml/portfile.cmake index 2352bfabd..f3379806d 100644 --- a/external_imported/vcpkg/ports/sfml/portfile.cmake +++ b/external_imported/vcpkg/ports/sfml/portfile.cmake @@ -4,15 +4,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH HEAD_REF master SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES - use-system-freetype.patch - stb_include.patch + fix-dependencies.patch arm64.patch ) -file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") -# Without this, we get error: list sub-command REMOVE_DUPLICATES requires list to be present. -file(MAKE_DIRECTORY "${SOURCE_PATH}/extlibs/libs") -file(WRITE "${SOURCE_PATH}/extlibs/libs/x" "") # The embedded FindFreetype doesn't properly handle debug libraries file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") @@ -33,13 +28,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() -FILE(READ "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" SFML_CONFIG) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") -else() - FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") -endif() - # move sfml-main to manual link dir 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") diff --git a/external_imported/vcpkg/ports/sfml/stb_include.patch b/external_imported/vcpkg/ports/sfml/stb_include.patch deleted file mode 100644 index 3519b1c1e..000000000 --- a/external_imported/vcpkg/ports/sfml/stb_include.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e821a49bc..c68264ef2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS) - endforeach() - - list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) -+ -+ find_path(STB_INCLUDE_DIR stb.h) -+ include_directories(${STB_INCLUDE_DIR}) - endif() - - # Visual C++: remove warnings regarding SL security and algorithms on pointers diff --git a/external_imported/vcpkg/ports/sfml/use-system-freetype.patch b/external_imported/vcpkg/ports/sfml/use-system-freetype.patch deleted file mode 100644 index 4d895b741..000000000 --- a/external_imported/vcpkg/ports/sfml/use-system-freetype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/SFML/Graphics/CMakeLists.txt -+++ b/src/SFML/Graphics/CMakeLists.txt -@@ -135,7 +135,7 @@ if(SFML_OS_ANDROID) - endif() - - sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") --target_link_libraries(sfml-graphics PRIVATE Freetype) -+target_link_libraries(sfml-graphics PRIVATE Freetype::Freetype) - - # add preprocessor symbols - target_compile_definitions(sfml-graphics PRIVATE "STBI_FAILURE_USERMSG") diff --git a/external_imported/vcpkg/ports/sfml/vcpkg.json b/external_imported/vcpkg/ports/sfml/vcpkg.json index de544f640..ba297ad70 100644 --- a/external_imported/vcpkg/ports/sfml/vcpkg.json +++ b/external_imported/vcpkg/ports/sfml/vcpkg.json @@ -1,15 +1,17 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 12, + "port-version": 14, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", + "license": "Zlib", "dependencies": [ "freetype", "libflac", "libogg", "libvorbis", "openal-soft", + "opengl", "stb", { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt b/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt index 0e745779d..3b31564f9 100644 --- a/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt +++ b/external_imported/vcpkg/ports/shaderc/glslang/CMakeLists.txt @@ -2,12 +2,21 @@ cmake_minimum_required(VERSION 3.11) find_package(glslang CONFIG REQUIRED) -set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) + +add_library(glslang ALIAS glslang::glslang) +add_library(OSDependent ALIAS glslang::OSDependent) +add_library(OGLCompiler ALIAS glslang::OGLCompiler) +add_library(HLSL ALIAS glslang::HLSL) +add_library(SPIRV ALIAS glslang::SPIRV) +add_library(MachineIndependent ALIAS glslang::MachineIndependent) + +find_package(Threads REQUIRED) find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/external_imported/vcpkg/ports/shaderc/vcpkg.json b/external_imported/vcpkg/ports/shaderc/vcpkg.json index 903544d80..b3c400f80 100644 --- a/external_imported/vcpkg/ports/shaderc/vcpkg.json +++ b/external_imported/vcpkg/ports/shaderc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 2, + "port-version": 3, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake index b785430a7..b5116c7d2 100644 --- a/external_imported/vcpkg/ports/shaderwriter/portfile.cmake +++ b/external_imported/vcpkg/ports/shaderwriter/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF 8b1b0614f49c27ab08ff16ce632fcac44f24d6d5 + REF ec31f19f88fe15af476b48da7499aac9d4089a8f HEAD_REF development - SHA512 697ecfee5dc9cbfe3cc724b7acd90107ea40bba58448536b1726eb3755f8c96e77b9a31317b567d77ed9e9b5c6decede73c4c7f1a760f11eff0cba2711b3c548 + SHA512 7c7979d24c5ab5b896c9f4a090b1014c924a5b10657eadf13a92bb6d212f6e9fa8ec7f992b637b890f89d36365526b1d5f6698c4fed209b3fd0c424b04ce99a6 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF acbce0a4966d0689148975aaa3c581af2b4e33a7 + REF 684ef1585180798879c3bf4cba45f9b19948e275 HEAD_REF master - SHA512 f2f45520554b576b3896ef9068549878e05a57a8bd0a3a4ab8c218bba9dee49febfe8cb7edb85b8ff51bdd86dee576cace6b8506a6226484d2b640408a3246ba + SHA512 d87f937d94d2db985322d557eb6e0af7b8f85f2a0b86cb1bddc2a0997237620d3dcb78066ee64280f7a905f64e003b219aac761f2ffd27f46d3c084a2bb490e3 ) file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") @@ -29,7 +29,8 @@ vcpkg_cmake_configure( -DSDW_UNITY_BUILD=ON ) +vcpkg_copy_pdbs() vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shaderwriter) +vcpkg_cmake_config_fixup(PACKAGE_NAME ShaderWriter CONFIG_PATH lib/cmake/shaderwriter) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/shaderwriter/vcpkg.json b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json index 524382657..e1d3dc5d0 100644 --- a/external_imported/vcpkg/ports/shaderwriter/vcpkg.json +++ b/external_imported/vcpkg/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version": "2.2.0", + "version": "2.4.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter", "license": "MIT", diff --git a/external_imported/vcpkg/ports/shiftmedia-libgcrypt/portfile.cmake b/external_imported/vcpkg/ports/shiftmedia-libgcrypt/portfile.cmake new file mode 100644 index 000000000..f8a0637a4 --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgcrypt/portfile.cmake @@ -0,0 +1,107 @@ +set(PACKAGE_VERSION_MAJOR 1) +set(PACKAGE_VERSION_MINOR 10) +set(PACKAGE_VERSION_PATCH 1) +set(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/libgcrypt + REF libgcrypt-${PACKAGE_VERSION} + SHA512 6da8225ec73c51562cd76a0c0abc19506a7378750ed2a9ea45f03df3c8d7cf500840459deb9b0a694a5602fe77ee2b0dd5b2e37376745233350b0f218dff4f1c + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURATION_RELEASE ReleaseDLL) + set(CONFIGURATION_DEBUG DebugDLL) +else() + set(CONFIGURATION_RELEASE Release) + set(CONFIGURATION_DEBUG Debug) +endif() + +if(VCPKG_TARGET_IS_UWP) + string(APPEND CONFIGURATION_RELEASE WinRT) + string(APPEND CONFIGURATION_DEBUG WinRT) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") +else() + set(RuntimeLibraryExt "DLL") +endif() + +# patch output library file path and name; inject RuntimeLibrary property to control CRT linkage +foreach(PROPS IN ITEMS + "${SOURCE_PATH}/SMP/smp_deps.props" + "${SOURCE_PATH}/SMP/smp_winrt_deps.props") + vcpkg_replace_string( + "${PROPS}" + [=[_winrt]=] + [=[]=] + ) + vcpkg_replace_string( + "${PROPS}" + [=[lib$(RootNamespace)]=] + [=[$(RootNamespace)]=] + ) + vcpkg_replace_string( + "${PROPS}" + [=[]=] + [=[$(RuntimeLibrary)]=] + ) +endforeach() + +# patch gpg-error library file name +foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/SMP/libgcrypt.vcxproj" + "${SOURCE_PATH}/SMP/libgcrypt_winrt.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "_winrt.lib" + ".lib" + ) + vcpkg_replace_string( + "${VCXPROJ}" + "libgpg-error" + "gpg-error" + ) +endforeach() + +vcpkg_install_msbuild( + USE_VCPKG_INTEGRATION + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH SMP/libgcrypt.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} + LICENSE_SUBPATH COPYING.LIB + RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} + SKIP_CLEAN + OPTIONS /p:OutDir=..\\msvc + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" +) + +get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) +if(VCPKG_TARGET_IS_UWP) + set(WINRT_SUBFOLDER libgcrypt_winrt) +endif() +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(LIBGCRYPT_CONFIG_LIBS "-lgcrypt") +configure_file("${SOURCE_PATH}/src/libgcrypt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libgcrypt.pc" @ONLY) + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/../include") +set(LIBGCRYPT_CONFIG_LIBS "-lgcryptd") +configure_file("${SOURCE_PATH}/src/libgcrypt.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libgcrypt.pc" @ONLY) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/src/libgcrypt.m4" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libgcrypt/aclocal/") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") diff --git a/external_imported/vcpkg/ports/shiftmedia-libgcrypt/vcpkg.json b/external_imported/vcpkg/ports/shiftmedia-libgcrypt/vcpkg.json new file mode 100644 index 000000000..10e7530a2 --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgcrypt/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "shiftmedia-libgcrypt", + "version": "1.10.1", + "description": "An unofficial LibGCrypt with added custom native Visual Studio project build tools. LibGCrypt", + "homepage": "https://github.com/ShiftMediaProject/libgcrypt", + "license": "LGPL-2.1-only", + "supports": "windows", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/external-libtasn1.patch b/external_imported/vcpkg/ports/shiftmedia-libgnutls/external-libtasn1.patch new file mode 100644 index 000000000..5b2add92e --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/external-libtasn1.patch @@ -0,0 +1,91 @@ +diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters +index 5c4d1070d..df4aa2b9f 100644 +--- a/SMP/libgnutls.vcxproj.filters ++++ b/SMP/libgnutls.vcxproj.filters +@@ -1514,30 +1514,6 @@ + + Source Files\lib\nettle + +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- + + Source Files\lib\nettle\gost + +diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props +index 8bc3e2406..10e113e93 100644 +--- a/SMP/libgnutls_files.props ++++ b/SMP/libgnutls_files.props +@@ -170,16 +170,6 @@ + + + +- +- +- +- +- $(IntDir)\tasn1_$(filename).obj +- +- +- +- +- + + + +diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters +index 49778942d..804248636 100644 +--- a/SMP/libgnutls_winrt.vcxproj.filters ++++ b/SMP/libgnutls_winrt.vcxproj.filters +@@ -1514,30 +1514,6 @@ + + Source Files\lib\nettle + +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- + + Source Files\lib\accelerated + diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/pkgconfig.patch b/external_imported/vcpkg/ports/shiftmedia-libgnutls/pkgconfig.patch new file mode 100644 index 000000000..3eecc76b6 --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in +index 7cdedda5..11785bcd 100644 +--- a/lib/gnutls.pc.in ++++ b/lib/gnutls.pc.in +@@ -18,7 +18,7 @@ Name: GnuTLS + Description: Transport Security Layer implementation for the GNU system + URL: https://www.gnutls.org/ + Version: @VERSION@ +-Libs: -L${libdir} -lgnutls ++Libs: -L${libdir} @GNUTLS_LIBS@ + Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ + @GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake b/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake new file mode 100644 index 000000000..567607078 --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/portfile.cmake @@ -0,0 +1,177 @@ +set(PACKAGE_VERSION_MAJOR 3) +set(PACKAGE_VERSION_MINOR 7) +set(PACKAGE_VERSION_PATCH 6) +set(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}) + +set(GNULIB_REF "fb64a781") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/gnutls + REF ${PACKAGE_VERSION} + SHA512 8a3ff480e065cf517468fac9d8d4474cfa6ed354fa83ae60de224580f359f8dcfbfed6cf640d33783779174ade0bca0fbe1c529097ee103af2b02546fc2acaec + HEAD_REF master + PATCHES + external-libtasn1.patch + pkgconfig.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm") + +vcpkg_download_distfile( + GNULIB_SNAPSHOT + URLS "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=${GNULIB_REF};sf=tgz" + FILENAME "gnulib-${GNULIB_REF}.tar.gz" + SHA512 6e534b3a623efa5f473977deeed4d24669ef0e0e3ac5fcadc88c5cf2d6ad0852a07c68cd70ac748d7f9a3793704ce1a54a7d17114458a8c1f2e42d410681c340 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH GNULIB_SOURCE_PATH + ARCHIVE "${GNULIB_SNAPSHOT}" + REF ${GNULIB_REF} +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/gnulib") +file(RENAME "${GNULIB_SOURCE_PATH}" "${SOURCE_PATH}/gnulib") + +include("${CURRENT_HOST_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") +yasm_tool_helper(OUT_VAR YASM) +file(TO_NATIVE_PATH "${YASM}" YASM) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURATION_RELEASE ReleaseDLL) + set(CONFIGURATION_DEBUG DebugDLL) +else() + set(CONFIGURATION_RELEASE Release) + set(CONFIGURATION_DEBUG Debug) +endif() + +if(VCPKG_TARGET_IS_UWP) + string(APPEND CONFIGURATION_RELEASE WinRT) + string(APPEND CONFIGURATION_DEBUG WinRT) +endif() + +set(_gnutlsproject "${SOURCE_PATH}/SMP/libgnutls.vcxproj") +file(READ "${_gnutlsproject}" _contents) +string(REPLACE [[]] + "" + _contents "${_contents}") +string(REPLACE [[]] + "" + _contents "${_contents}") +string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_HOST_INSTALLED_DIR}/share" _contents "${_contents}") # Above already +file(WRITE "${_gnutlsproject}" "${_contents}") + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") +else() + set(RuntimeLibraryExt "DLL") +endif() + +# patch output library file path and name +foreach(PROPS IN ITEMS +"${SOURCE_PATH}/SMP/smp_deps.props" +"${SOURCE_PATH}/SMP/smp_winrt_deps.props") +vcpkg_replace_string( + "${PROPS}" + [=[_winrt]=] + [=[]=] +) +vcpkg_replace_string( + "${PROPS}" + [=[lib$(RootNamespace)]=] + [=[$(RootNamespace)]=] +) +endforeach() + +# patch hogweed, gpm, nettle, zlib libraries file names; inject RuntimeLibrary property to control CRT linkage +foreach(VCXPROJ IN ITEMS +"${SOURCE_PATH}/SMP/libgnutls.vcxproj" +"${SOURCE_PATH}/SMP/libgnutls_winrt.vcxproj") +vcpkg_replace_string( + "${VCXPROJ}" + "_winrt.lib" + ".lib" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libhogweed" + "hogweed" +) +vcpkg_replace_string( + "${VCXPROJ}" + "hogweedd" + "hogweed" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libgmp" + "gmp" +) +vcpkg_replace_string( + "${VCXPROJ}" + "gmpd" + "gmp" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libnettle" + "nettle" +) +vcpkg_replace_string( + "${VCXPROJ}" + "nettled" + "nettle" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libzlib" + "zlib" +) +vcpkg_replace_string( + "${VCXPROJ}" + [=[]=] + [=[$(RuntimeLibrary)]=] +) +endforeach() + +vcpkg_install_msbuild( + USE_VCPKG_INTEGRATION + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH SMP/libgnutls.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} + LICENSE_SUBPATH LICENSE + RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} + SKIP_CLEAN + OPTIONS /p:YasmPath="${YASM}" /p:OutDir=..\\msvc + OPTIONS_DEBUG /p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt} + OPTIONS_RELEASE /p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt} +) + +get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) +if(VCPKG_TARGET_IS_UWP) + set(WINRT_SUBFOLDER libgnutls_winrt) +endif() +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +set(VERSION ${PACKAGE_VERSION}) +set(GNUTLS_REQUIRES_PRIVATE "Requires.private: gmp, nettle, hogweed, libtasn1") +set(GNUTLS_LIBS_PRIVATE "-lcrypt32 -lws2_32 -lkernel32 -lncrypt") + +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(GNUTLS_LIBS "-lgnutls") +configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gnutls.pc" @ONLY) + +set(prefix "${CURRENT_INSTALLED_DIR}/debug") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/../include") +set(GNUTLS_LIBS "-lgnutlsd") +configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gnutls.pc" @ONLY) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json b/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json new file mode 100644 index 000000000..b208408b3 --- /dev/null +++ b/external_imported/vcpkg/ports/shiftmedia-libgnutls/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "shiftmedia-libgnutls", + "version": "3.7.6", + "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", + "dependencies": [ + "gettext", + "gmp", + "libidn2", + "libtasn1", + "nettle", + { + "name": "vs-yasm", + "host": true + }, + { + "name": "yasm-tool-helper", + "host": true + }, + "zlib" + ] +} diff --git a/external_imported/vcpkg/ports/simage/portfile.cmake b/external_imported/vcpkg/ports/simage/portfile.cmake index 8e4514055..ff1611082 100644 --- a/external_imported/vcpkg/ports/simage/portfile.cmake +++ b/external_imported/vcpkg/ports/simage/portfile.cmake @@ -1,10 +1,10 @@ -set(SIMAGE_VERSION 1.8.1) +set(SIMAGE_VERSION 1.8.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/simage - REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1 - SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1 + REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2 + SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875 HEAD_REF master PATCHES requies-all-dependencies.patch ) diff --git a/external_imported/vcpkg/ports/simage/requies-all-dependencies.patch b/external_imported/vcpkg/ports/simage/requies-all-dependencies.patch index ef0536a96..a0765f8a9 100644 --- a/external_imported/vcpkg/ports/simage/requies-all-dependencies.patch +++ b/external_imported/vcpkg/ports/simage/requies-all-dependencies.patch @@ -1,21 +1,28 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d869715..073a73f 100644 +index ef92706..fee22e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -117,10 +117,10 @@ endif() - # On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF. - # see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about - if(SIMAGE_USE_GDIPLUS) -- find_package(GdiPlus) -+ find_package(GdiPlus REQUIRED) +@@ -129,6 +129,9 @@ if(SIMAGE_USE_GDIPLUS) + } + " GDIPLUS_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT GDIPLUS_FOUND) ++ message(FATAL_ERROR "GDI+ is required on Windows.") ++ endif() endif() if(SIMAGE_USE_AVIENC) -- find_package(Vfw) -+ find_package(Vfw REQUIRED) + set(CMAKE_REQUIRED_LIBRARIES vfw32) +@@ -142,6 +145,9 @@ if(SIMAGE_USE_AVIENC) + } + " VFW_FOUND) + unset(CMAKE_REQUIRED_LIBRARIES) ++ if(NOT VFW_FOUND) ++ message(FATAL_ERROR "Video for Windows is required on Windows.") ++ endif() endif() # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. -@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) +@@ -286,7 +292,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) find_package(Ogg REQUIRED) find_package(Vorbis REQUIRED) if(OGG_FOUND) @@ -24,7 +31,7 @@ index d869715..073a73f 100644 endif() endif() -@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD +@@ -306,8 +312,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD if(SIMAGE_TIFF_SUPPORT) find_package(TIFF REQUIRED) if(TIFF_FOUND) diff --git a/external_imported/vcpkg/ports/simage/vcpkg.json b/external_imported/vcpkg/ports/simage/vcpkg.json index 784879b1a..f961409b4 100644 --- a/external_imported/vcpkg/ports/simage/vcpkg.json +++ b/external_imported/vcpkg/ports/simage/vcpkg.json @@ -1,9 +1,10 @@ { "name": "simage", - "version-semver": "1.8.1", - "port-version": 4, + "version-semver": "1.8.2", + "port-version": 1, "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", + "license": "ISC", "supports": "!uwp", "dependencies": [ { @@ -129,8 +130,13 @@ "sndfile": { "description": "Use libsndfile to load/save sampled sound", "dependencies": [ - "libflac", - "libsndfile" + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } ] }, "tiff": { diff --git a/external_imported/vcpkg/ports/simbody/portfile.cmake b/external_imported/vcpkg/ports/simbody/portfile.cmake index d3287e03b..4b4d990fd 100644 --- a/external_imported/vcpkg/ports/simbody/portfile.cmake +++ b/external_imported/vcpkg/ports/simbody/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_cmake_configure( -DBUILD_VISUALIZER=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF + -DBUILD_TESTS_AND_EXAMPLES_STATIC=OFF + -DBUILD_TESTS_AND_EXAMPLES_SHARED=OFF ) vcpkg_cmake_install() @@ -32,6 +34,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/simbody/vcpkg.json b/external_imported/vcpkg/ports/simbody/vcpkg.json index c35c85a01..51cb881fb 100644 --- a/external_imported/vcpkg/ports/simbody/vcpkg.json +++ b/external_imported/vcpkg/ports/simbody/vcpkg.json @@ -1,9 +1,10 @@ { "name": "simbody", "version-date": "2022-01-04", - "port-version": 1, + "port-version": 2, "description": "High-performance C++ multibody dynamics/physics library for simulating articulated biomechanical and mechanical systems like vehicles, robots, and the human skeleton.", "homepage": "https://simtk.org/home/simbody", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ "blas", diff --git a/external_imported/vcpkg/ports/simdjson/portfile.cmake b/external_imported/vcpkg/ports/simdjson/portfile.cmake index 1a2fd4a87..2de973ea8 100644 --- a/external_imported/vcpkg/ports/simdjson/portfile.cmake +++ b/external_imported/vcpkg/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF v1.0.2 + REF 933c2ebeacf9a1df12acd9a6781e590cad2f81f7 # v2.2.2 HEAD_REF master - SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073 + SHA512 6dda3fbbba7e788adc7b29710c2b08c428a180fadd298c4129a5856e65de1d947b38ecff0098fcd29ad98923e14910ba77eaedbd3d3a9fa3a0c49c686ecbb1b4 ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/simdjson/vcpkg.json b/external_imported/vcpkg/ports/simdjson/vcpkg.json index 3a3ee28ad..81540da7e 100644 --- a/external_imported/vcpkg/ports/simdjson/vcpkg.json +++ b/external_imported/vcpkg/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "1.0.2", + "version-semver": "2.2.2", "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/external_imported/vcpkg/ports/skia/add-missing-tuple.patch b/external_imported/vcpkg/ports/skia/add-missing-tuple.patch deleted file mode 100644 index e33d44e3a..000000000 --- a/external_imported/vcpkg/ports/skia/add-missing-tuple.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h -index 7afe4f9..502f83e 100644 ---- a/include/private/SkPathRef.h -+++ b/include/private/SkPathRef.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - class SkRBuffer; - class SkWBuffer; diff --git a/external_imported/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch b/external_imported/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch new file mode 100644 index 000000000..02e25148c --- /dev/null +++ b/external_imported/vcpkg/ports/skia/dawn_use_vcpkg_spirv.patch @@ -0,0 +1,13 @@ +diff --git a/src/dawn_native/BUILD.gn b/src/dawn_native/BUILD.gn +index f73bfe24..e37792a0 100644 +--- a/src/dawn_native/BUILD.gn ++++ b/src/dawn_native/BUILD.gn +@@ -145,7 +145,7 @@ source_set("dawn_native_sources") { + ":dawn_native_headers", + ":dawn_native_utils_gen", + "${dawn_root}/src/common", +- "${dawn_root}/third_party/gn/spirv_cross:spirv_cross", ++ "//third_party/spirv-cross:spirv_cross", + "${dawn_spirv_tools_dir}:spvtools_opt", + "${dawn_spirv_tools_dir}:spvtools_val", + "${dawn_tint_dir}/src:libtint", diff --git a/external_imported/vcpkg/ports/skia/fontconfig.gn b/external_imported/vcpkg/ports/skia/fontconfig.gn new file mode 100644 index 000000000..ae4fe7b46 --- /dev/null +++ b/external_imported/vcpkg/ports/skia/fontconfig.gn @@ -0,0 +1,10 @@ +import("../third_party.gni") + + system("fontconfig") { + include_dirs = @_INCLUDES@ + if(is_debug) { + libs = @_LIBS_DBG@ + } else { + libs = @_LIBS_REL@ + } + } diff --git a/external_imported/vcpkg/ports/skia/portfile.cmake b/external_imported/vcpkg/ports/skia/portfile.cmake index dc6881eec..1f4f3296e 100644 --- a/external_imported/vcpkg/ports/skia/portfile.cmake +++ b/external_imported/vcpkg/ports/skia/portfile.cmake @@ -1,10 +1,21 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL https://skia.googlesource.com/skia.git - REF fb0b35fed5580d49392df7ce9374551b348fffbf - PATCHES add-missing-tuple.patch + URL https://github.com/google/skia + REF f86f242886692a18f5adc1cf9cbd6740cd0870fd + PATCHES + "use_vcpkg_fontconfig.patch" ) +# Replace hardcoded python paths +vcpkg_find_acquire_program(PYTHON3) +vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") + +if(VCPKG_TARGET_IS_LINUX) + vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python3" "command = \"$shell '${PYTHON3}'") +else() + vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") +endif() + function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") return() @@ -19,10 +30,27 @@ function(checkout_in_path PATH URL REF) file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") endfunction() +function(checkout_in_path_with_patch PATH URL REF PATCH) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES "${PATCH}" + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + set(EXTERNALS "${SOURCE_PATH}/third_party/externals") file(MAKE_DIRECTORY "${EXTERNALS}") # these following aren't available in vcpkg +# to update, visit the DEPS file in Skia's root directory +# define SKIA_USE_MIRROR in a triplet to use the mirrors checkout_in_path("${EXTERNALS}/sfntly" "https://github.com/googlefonts/sfntly" "b55ff303ea2f9e26702b514cf6a3196a2e3e2974" @@ -33,7 +61,7 @@ checkout_in_path("${EXTERNALS}/dng_sdk" ) checkout_in_path("${EXTERNALS}/libgifcodec" "https://skia.googlesource.com/libgifcodec" - "d06d2a6d42baf6c0c91cacc28df2542a911d05fe" + "fd59fa92a0c86788dcdd84d091e1ce81eda06a77" ) checkout_in_path("${EXTERNALS}/piex" "https://android.googlesource.com/platform/external/piex" @@ -94,40 +122,165 @@ set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "") replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "") -replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "") +replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz;harfbuzz-subset" "harfbuzz;harfbuzz-subset" "") replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") replace_skia_dep(libwebp "/include" - "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;libwebpmux,libwebpmuxd" - "webp;webpdemux;webpdecoder;libwebpmux" "") + "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;webpmux,webpmuxd" + "webp;webpdemux;webpdecoder;webpmux" "") replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") +if(CMAKE_HOST_UNIX) + replace_skia_dep(fontconfig "/include" "fontconfig" "fontconfig" "") + endif() set(OPTIONS "\ skia_use_lua=false \ skia_enable_tools=false \ -skia_enable_spirv_validation=false") - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(OPTIONS "${OPTIONS} target_cpu=\"arm64\"") -endif() +skia_enable_spirv_validation=false \ +target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"") # used for passing feature-specific definitions to the config file -set(SKIA_PUBLIC_DEFINITIONS "") +set(SKIA_PUBLIC_DEFINITIONS + SK_SUPPORT_PDF + SK_HAS_JPEG_LIBRARY + SK_USE_LIBGIFCODEC + SK_HAS_PNG_LIBRARY + SK_HAS_WEBP_LIBRARY + SK_XML) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS "${OPTIONS} is_component_build=true") + string(APPEND OPTIONS " is_component_build=true") + if(CMAKE_HOST_WIN32) + set(SKIA_PUBLIC_DEFINITIONS SKIA_DLL) + endif() else() - set(OPTIONS "${OPTIONS} is_component_build=false") + string(APPEND OPTIONS " is_component_build=false") endif() -if("metal" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} skia_use_metal=true") - list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) +if(CMAKE_HOST_APPLE) + if("metal" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_metal=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_METAL) + endif() +endif() + +if("vulkan" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_vulkan=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_VULKAN) + endif() + +if(CMAKE_HOST_WIN32) + if("direct3d" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} skia_use_direct3d=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DIRECT3D) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "61c603f3baa5270e04bcfb6acf83c654e3c57679" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad" + ) + + checkout_in_path("${EXTERNALS}/d3d12allocator" + "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" + "169895d529dfce00390a20e69c2f516066fe7a3b" + ) + endif() +endif() + +if("dawn" IN_LIST FEATURES) + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[ +dawn support requires the following libraries from the system package manager: + + libx11-xcb-dev mesa-common-dev + +They can be installed on Debian based systems via + + apt-get install libx11-xcb-dev mesa-common-dev +]] + ) + endif() + + set(OPTIONS "${OPTIONS} skia_use_dawn=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_DAWN) + + checkout_in_path("${EXTERNALS}/spirv-cross" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + "61c603f3baa5270e04bcfb6acf83c654e3c57679" + ) + + checkout_in_path("${EXTERNALS}/spirv-headers" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" + "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" + ) + + checkout_in_path("${EXTERNALS}/spirv-tools" + "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" + "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad" + ) + + checkout_in_path("${EXTERNALS}/tint" + "https://dawn.googlesource.com/tint" + "200492e32b94f042d9942154fb4fa7f93bb8289a" + ) + + checkout_in_path("${EXTERNALS}/jinja2" + "https://chromium.googlesource.com/chromium/src/third_party/jinja2" + "ee69aa00ee8536f61db6a451f3858745cf587de6" + ) + + checkout_in_path("${EXTERNALS}/markupsafe" + "https://chromium.googlesource.com/chromium/src/third_party/markupsafe" + "0944e71f4b2cb9a871bcbe353f95e889b64a611a" + ) + +## Remove + checkout_in_path("${EXTERNALS}/vulkan-headers" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + "c896e2f920273bfee852da9cca2a356bc1c2031e" + ) + + checkout_in_path("${EXTERNALS}/vulkan-tools" + "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + "d55c7aaf041af331bee8c22fb448a6ff4c797f73" + ) + + checkout_in_path("${EXTERNALS}/abseil-cpp" + "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git" + "c5a424a2a21005660b182516eb7a079cd8021699" + ) + +## REMOVE ^ + checkout_in_path("${EXTERNALS}/dawn" + "https://dawn.googlesource.com/dawn.git" + "30fa0d8d2ced43e44baa522dd4bd4684b14a3099" + ) + + vcpkg_find_acquire_program(GIT) + file(READ "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" DVG_CONTENT) + string(REPLACE "return 'git.bat' if sys.platform == 'win32' else 'git'" "return '${GIT}'" DVG_CONTENT ${DVG_CONTENT}) + file(WRITE "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" ${DVG_CONTENT}) +endif() + +if("gl" IN_LIST FEATURES) + string(APPEND OPTIONS " skia_use_gl=true") + list(APPEND SKIA_PUBLIC_DEFINITIONS SK_GL) endif() -set(OPTIONS_REL "${OPTIONS} is_official_build=true") set(OPTIONS_DBG "${OPTIONS} is_debug=true") +set(OPTIONS_REL "${OPTIONS} is_official_build=true") if(CMAKE_HOST_WIN32) # Load toolchains @@ -151,17 +304,15 @@ if(CMAKE_HOST_WIN32) to_gn_list(SKIA_CXX_FLAGS_DBG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") to_gn_list(SKIA_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(OPTIONS_DBG "${OPTIONS_DBG} extra_cflags_c=${SKIA_C_FLAGS_DBG} \ + string(APPEND OPTIONS_DBG " extra_cflags_c=${SKIA_C_FLAGS_DBG} \ extra_cflags_cc=${SKIA_CXX_FLAGS_DBG}") - - set(OPTIONS_REL "${OPTIONS_REL} extra_cflags_c=${SKIA_C_FLAGS_REL} \ + string(APPEND OPTIONS_REL " extra_cflags_c=${SKIA_C_FLAGS_REL} \ extra_cflags_cc=${SKIA_CXX_FLAGS_REL}") set(WIN_VC "$ENV{VCINSTALLDIR}") string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}") - set(OPTIONS_DBG "${OPTIONS_DBG} win_vc=\"${WIN_VC}\"") - set(OPTIONS_REL "${OPTIONS_REL} win_vc=\"${WIN_VC}\"") - + string(APPEND OPTIONS_DBG " win_vc=\"${WIN_VC}\"") + string(APPEND OPTIONS_REL " win_vc=\"${WIN_VC}\"") endif() vcpkg_configure_gn( @@ -170,9 +321,26 @@ vcpkg_configure_gn( OPTIONS_RELEASE "${OPTIONS_REL}" ) +set(DAWN_LINKAGE "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DAWN_LINKAGE "shared") +else() + set(DAWN_LINKAGE "static") +endif() + +vcpkg_list(SET SKIA_TARGETS ":skia") +if("dawn" IN_LIST FEATURES) + vcpkg_list(APPEND SKIA_TARGETS + "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}" + "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}" + ) +endif() + vcpkg_install_gn( SOURCE_PATH "${SOURCE_PATH}" - TARGETS ":skia" + TARGETS + ${SKIA_TARGETS} ) message(STATUS "Installing: ${CURRENT_PACKAGES_DIR}/include/${PORT}") @@ -188,33 +356,46 @@ endforeach() # get a list of library dependencies for TARGET function(gn_desc_target_libs OUTPUT BUILD_DIR TARGET) - vcpkg_find_acquire_program(GN) - execute_process( - COMMAND ${GN} desc "${BUILD_DIR}" "${TARGET}" libs - WORKING_DIRECTORY "${SOURCE_PATH}" - OUTPUT_VARIABLE OUTPUT_ - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}") + z_vcpkg_install_gn_get_desc("${OUTPUT}" + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY libs) +endfunction() + +function(gn_desc_target_defines OUTPUT BUILD_DIR TARGET) + z_vcpkg_install_gn_get_desc(OUTPUT_ + SOURCE_PATH "${SOURCE_PATH}" + BUILD_DIR "${BUILD_DIR}" + TARGET "${TARGET}" + WHAT_TO_DISPLAY defines) + # exclude system defines such as _HAS_EXCEPTIONS=0 + list(FILTER OUTPUT_ EXCLUDE REGEX "^_") set(${OUTPUT} ${OUTPUT_} PARENT_SCOPE) endfunction() # skiaConfig.cmake.in input variables -gn_desc_target_libs(SKIA_DEP_DBG - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - //:skia) -gn_desc_target_libs(SKIA_DEP_REL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - //:skia) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + gn_desc_target_libs(SKIA_DEP_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_DBG + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + //:skia) +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + gn_desc_target_libs(SKIA_DEP_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //:skia) + gn_desc_target_defines(SKIA_DEFINITIONS_REL + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + //:skia) +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/skia/skiaConfig.cmake" @ONLY) -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/skia") -vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/skia/skiaConfig.cmake.in b/external_imported/vcpkg/ports/skia/skiaConfig.cmake.in index b4c7c82ce..98b491206 100644 --- a/external_imported/vcpkg/ports/skia/skiaConfig.cmake.in +++ b/external_imported/vcpkg/ports/skia/skiaConfig.cmake.in @@ -1,12 +1,9 @@ add_library(skia INTERFACE) add_library(skia::skia ALIAS skia) - -set(SKIA_LIBRARY_NAME_DBG @SKIA_LIBRARY_NAME_DBG@) -set(SKIA_LIBRARY_NAME_REL @SKIA_LIBRARY_NAME_REL@) -set(SKIA_LIBRARY_IMPLIB_DBG @SKIA_LIBRARY_IMPLIB_DBG@) -set(SKIA_LIBRARY_IMPLIB_REL @SKIA_LIBRARY_IMPLIB_REL@) - -set(SKIA_PUBLIC_DEFINITIONS @SKIA_PUBLIC_DEFINITIONS@) +set(SKIA_DEP_DBG @SKIA_DEP_DBG@) +set(SKIA_DEP_REL @SKIA_DEP_REL@) +set(SKIA_DEFINITIONS_DBG @SKIA_DEFINITIONS_DBG@) +set(SKIA_DEFINITIONS_REL @SKIA_DEFINITIONS_REL@) # Compute the installation prefix relative to this file. get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) @@ -16,11 +13,10 @@ if(_IMPORT_PREFIX STREQUAL "/") set(_IMPORT_PREFIX "") endif() -set(SKIA_DEP_DBG @SKIA_DEP_DBG@) -set(SKIA_DEP_REL @SKIA_DEP_REL@) - -find_library(SKIA_LIB NAMES skia skia.dll) -target_link_libraries(skia INTERFACE "${SKIA_LIB}") +find_library(SKIA_LIB_DBG NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/debug/lib NO_DEFAULT_PATH) +find_library(SKIA_LIB_REL NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_DBG}>") +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_REL}>") function(set_dependencies CONFIG LIBRARIES) foreach(LIB ${LIBRARIES}) @@ -45,42 +41,8 @@ endfunction() set_dependencies(Debug "${SKIA_DEP_DBG}") set_dependencies(Release "${SKIA_DEP_REL}") -set(SKIA_DEFINITIONS_DBG - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - SK_GL - SK_ENABLE_DUMP_GPU - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_HEIF_LIBRARY - SK_HAS_PNG_LIBRARY - SK_ENABLE_SKSL_INTERPRETER - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL - SK_SUPPORT_ATLAS_TEXT=1) - -set(SKIA_DEFINITIONS_REL - _CRT_SECURE_NO_WARNINGS - _HAS_EXCEPTIONS=0 - WIN32_LEAN_AND_MEAN - NOMINMAX - NDEBUG - SK_GL - SK_SUPPORT_PDF - SK_HAS_JPEG_LIBRARY - SK_USE_LIBGIFCODEC - SK_HAS_PNG_LIBRARY - SK_HAS_WEBP_LIBRARY - SK_XML - SKIA_DLL) - target_compile_definitions(skia INTERFACE $<$:${SKIA_DEFINITIONS_DBG}> $<$:${SKIA_DEFINITIONS_REL}>) target_include_directories(skia INTERFACE ${_IMPORT_PREFIX}/include) -target_compile_definitions(skia INTERFACE ${SKIA_PUBLIC_DEFINITIONS}) diff --git a/external_imported/vcpkg/ports/skia/use_vcpkg_fontconfig.patch b/external_imported/vcpkg/ports/skia/use_vcpkg_fontconfig.patch new file mode 100644 index 000000000..56bfd2c2b --- /dev/null +++ b/external_imported/vcpkg/ports/skia/use_vcpkg_fontconfig.patch @@ -0,0 +1,42 @@ +diff --git a/BUILD.gn b/BUILD.gn +index aeb46b4664..2ddbcd0ebe 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -452,7 +452,7 @@ optional("fontmgr_fontconfig") { + enabled = skia_enable_fontmgr_fontconfig + + # The public header includes fontconfig.h and uses FcConfig* +- public_deps = [ "//third_party:fontconfig" ] ++ public_deps = [ "//third_party/fontconfig" ] + public = [ "include/ports/SkFontMgr_fontconfig.h" ] + deps = [ ":typeface_freetype" ] + sources = [ "src/ports/SkFontMgr_fontconfig.cpp" ] +@@ -469,7 +469,7 @@ optional("fontmgr_FontConfigInterface") { + + deps = [ + ":typeface_freetype", +- "//third_party:fontconfig", ++ "//third_party/fontconfig", + ] + public = [ + "include/ports/SkFontConfigInterface.h", +diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn +index 63fa748d16..6760e0f41b 100644 +--- a/third_party/BUILD.gn ++++ b/third_party/BUILD.gn +@@ -6,9 +6,9 @@ + declare_args() { + } + +-config("system_fontconfig") { +- libs = [ "fontconfig" ] +-} +-group("fontconfig") { +- public_configs = [ ":system_fontconfig" ] +-} ++#config("system_fontconfig") { ++# libs = [ "fontconfig" ] ++#} ++#group("fontconfig") { ++# public_configs = [ ":system_fontconfig" ] ++#} diff --git a/external_imported/vcpkg/ports/skia/vcpkg.json b/external_imported/vcpkg/ports/skia/vcpkg.json index d8991a237..803246125 100644 --- a/external_imported/vcpkg/ports/skia/vcpkg.json +++ b/external_imported/vcpkg/ports/skia/vcpkg.json @@ -1,26 +1,22 @@ { "name": "skia", - "version-date": "2020-05-18", - "port-version": 8, + "version": "0.36.0", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." ], "homepage": "https://skia.org", - "supports": "osx | windows", + "license": "BSD-3-Clause", + "supports": "(osx | windows | linux) & !(windows & x86)", "dependencies": [ "expat", + "fontconfig", { "name": "freetype", "default-features": false }, - { - "name": "harfbuzz", - "features": [ - "icu" - ] - }, + "harfbuzz", "icu", "libjpeg-turbo", "libpng", @@ -29,11 +25,30 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-tool-gn", + "host": true + }, "zlib" ], + "default-features": [ + "gl" + ], "features": { + "dawn": { + "description": "dawn support for skia" + }, + "direct3d": { + "description": "Direct3D support for skia" + }, + "gl": { + "description": "OpenGL support for skia" + }, "metal": { - "description": "metal support for skia" + "description": "Metal support for skia" + }, + "vulkan": { + "description": "Vulkan support for skia" } } } diff --git a/external_imported/vcpkg/ports/snappy/fix_clang-cl_build.patch b/external_imported/vcpkg/ports/snappy/fix_clang-cl_build.patch new file mode 100644 index 000000000..b981e3076 --- /dev/null +++ b/external_imported/vcpkg/ports/snappy/fix_clang-cl_build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 672561e62..b6930b834 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ if(NOT CMAKE_CXX_STANDARD) + endif(NOT CMAKE_CXX_STANDARD) + + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + # Use the highest warning level for Visual Studio. + set(CMAKE_CXX_WARNING_LEVEL 4) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/external_imported/vcpkg/ports/snappy/portfile.cmake b/external_imported/vcpkg/ports/snappy/portfile.cmake index 45b8c706d..df95a08db 100644 --- a/external_imported/vcpkg/ports/snappy/portfile.cmake +++ b/external_imported/vcpkg/ports/snappy/portfile.cmake @@ -1,9 +1,14 @@ +file(READ "${CURRENT_PORT_DIR}/vcpkg.json" manifest) +string(JSON version GET "${manifest}" version) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/snappy - REF 1.1.9 + REF ${version} SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 HEAD_REF master + PATCHES + fix_clang-cl_build.patch ) vcpkg_cmake_configure( @@ -11,12 +16,21 @@ vcpkg_cmake_configure( OPTIONS -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Snappy) vcpkg_copy_pdbs() +string(JSON version GET "${manifest}" version) +string(JSON description GET "${manifest}" description) +set(name "${PORT}") + +configure_file("${CURRENT_PORT_DIR}/${PORT}.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) +if(NOT VCPKG_BUILD_TYPE) + configure_file("${CURRENT_PORT_DIR}/${PORT}.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) +endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/snappy/snappy.pc.in b/external_imported/vcpkg/ports/snappy/snappy.pc.in new file mode 100644 index 000000000..055f14bde --- /dev/null +++ b/external_imported/vcpkg/ports/snappy/snappy.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: @name@ +Description: @description@ +Version: @version@ +Libs: -L${libdir} -l@libname@ +Cflags: -I${includedir} \ No newline at end of file diff --git a/external_imported/vcpkg/ports/snappy/vcpkg.json b/external_imported/vcpkg/ports/snappy/vcpkg.json index 593b02343..05178f3eb 100644 --- a/external_imported/vcpkg/ports/snappy/vcpkg.json +++ b/external_imported/vcpkg/ports/snappy/vcpkg.json @@ -1,9 +1,10 @@ { "name": "snappy", "version": "1.1.9", - "port-version": 1, + "port-version": 3, "description": "A fast compressor/decompressor.", "homepage": "https://github.com/google/snappy", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/so5extra/portfile.cmake b/external_imported/vcpkg/ports/so5extra/portfile.cmake index 3c7def1b9..81261472f 100644 --- a/external_imported/vcpkg/ports/so5extra/portfile.cmake +++ b/external_imported/vcpkg/ports/so5extra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/so5extra - REF 713ed4876135dfaa9b744b567f7c300eae09800d # v.1.5.0 - SHA512 51b1e9521288c4cfbbf29aa9719b9da3ee0073e38af6fc275a5ec0a22b4bededf293b136aac0cf99a435b4411ccf0687556418fc25285f501a6f426f3a623c34 + REF be3fe020c30a7e5b3d7d2ac763c83e9a5dc7941f # v.1.5.2 + SHA512 49286808c189af9de1736e6bf3ac58273801d81c2123da4e94836a9ae83d68a8b55414a2c2373195d9c2af6a0ea7d4244754310869f6b2fab59c13547bdf478b ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/so5extra/vcpkg.json b/external_imported/vcpkg/ports/so5extra/vcpkg.json index b51bee5ec..0a60394ea 100644 --- a/external_imported/vcpkg/ports/so5extra/vcpkg.json +++ b/external_imported/vcpkg/ports/so5extra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "so5extra", - "version": "1.5.0", + "version": "1.5.2", "description": "A set of additional tools for SObjectizer framework.", "homepage": "https://github.com/Stiffstream/so5extra", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/sobjectizer/portfile.cmake b/external_imported/vcpkg/ports/sobjectizer/portfile.cmake index 55ca94ad8..282bc7134 100644 --- a/external_imported/vcpkg/ports/sobjectizer/portfile.cmake +++ b/external_imported/vcpkg/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF 4c3bf6e9da4eae21fa5cce31dd464aabaec803a4 # v.5.7.3 - SHA512 e5de6753d44c85c8077b133af1823bf892e1e7361659bbfc424b39c2f123e3b1c99b1292908e32034b538ef2410a41587c51723c8f8e1ffd85badd559f2a393c + REF df7c3ee91b29079ae4e3525c34ad83a0d4e83d77 # v.5.7.4.2 + SHA512 4caee3a95723c9564fbd5430492cc82513885ca17003e18b31378fc347ed8ad1b0859bd1693ecaaf514e8f82b86c07d1913a86f007250e2f28a77adfa03918b1 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/external_imported/vcpkg/ports/sobjectizer/vcpkg.json b/external_imported/vcpkg/ports/sobjectizer/vcpkg.json index 9b06fd909..995f4865f 100644 --- a/external_imported/vcpkg/ports/sobjectizer/vcpkg.json +++ b/external_imported/vcpkg/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.3", + "version": "5.7.4.2", "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/external_imported/vcpkg/ports/socket-io-client/fix-file-not-found.patch b/external_imported/vcpkg/ports/socket-io-client/fix-file-not-found.patch deleted file mode 100644 index b758c7a29..000000000 --- a/external_imported/vcpkg/ports/socket-io-client/fix-file-not-found.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,20 +31,24 @@ add_definitions( - -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ - ) - -+find_package(websocketpp CONFIG REQUIRED) -+find_package(asio CONFIG REQUIRED) -+find_package(RapidJSON CONFIG REQUIRED) -+ - add_library(sioclient ${ALL_SRC}) - target_include_directories(sioclient PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/src -- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp -- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include -- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include - ) - - if (CMAKE_VERSION VERSION_GREATER "3.1") - set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) - set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) - else() - set_property(TARGET sioclient APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") - endif() -+ -+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) -+ - if(BUILD_SHARED_LIBS) - set_target_properties(sioclient - PROPERTIES -@@ -56,16 +59,13 @@ if(OPENSSL_FOUND) - add_library(sioclient_tls ${ALL_SRC}) - target_include_directories(sioclient_tls PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/src -- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp -- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include -- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include - ${OPENSSL_INCLUDE_DIR} - ) - - if (CMAKE_VERSION VERSION_GREATER "3.1") - set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11) - set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON) --target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} ) -+target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson) - else() - set_property(TARGET sioclient_tls APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") - endif() diff --git a/external_imported/vcpkg/ports/socket-io-client/portfile.cmake b/external_imported/vcpkg/ports/socket-io-client/portfile.cmake index c5a1dfb32..a0f97dc5a 100644 --- a/external_imported/vcpkg/ports/socket-io-client/portfile.cmake +++ b/external_imported/vcpkg/ports/socket-io-client/portfile.cmake @@ -3,18 +3,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO socketio/socket.io-client-cpp - REF 3.1.0 - SHA512 a0adaa06ddb24297686a40b1e71a55bbab437093f828f76040c376b4adccb7d8b06eff4d8569dbde9b2e071257b3290e7e2bffd6354b33ecf67378ffa1d0cc13 + REF dbb4547d3160368feaaf55c3338ad085a8f968b8 + SHA512 cbb2a4742d16ba9ee72ca49a56605690ed620c978f51012e0d655a86b110a557b196ffc55af8b0440c1d7cd76d9dffe6f85abd0af300095608434eb9394dc68b HEAD_REF master - PATCHES - fix-file-not-found.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_SUBMODULES=OFF + -DCMAKE_INSTALL_INCLUDEDIR=include ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME sioclient CONFIG_PATH lib/cmake/sioclient) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/sioclient/sioclientConfig.cmake" + "include(CMakeFindDependencyMacro)" + [[include(CMakeFindDependencyMacro) +find_dependency(websocketpp CONFIG) +find_dependency(asio CONFIG) +find_dependency(RapidJSON CONFIG) +find_dependency(OpenSSL)]]) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/socket-io-client/vcpkg.json b/external_imported/vcpkg/ports/socket-io-client/vcpkg.json index e178386b5..84ee82e7a 100644 --- a/external_imported/vcpkg/ports/socket-io-client/vcpkg.json +++ b/external_imported/vcpkg/ports/socket-io-client/vcpkg.json @@ -1,9 +1,9 @@ { "name": "socket-io-client", - "version": "3.1.0", + "version-date": "2022-08-19", "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", - "supports": "static", + "license": "MIT", "dependencies": [ "asio", "rapidjson", @@ -11,6 +11,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "websocketpp" ] } diff --git a/external_imported/vcpkg/ports/sockpp/portfile.cmake b/external_imported/vcpkg/ports/sockpp/portfile.cmake index f9af412b4..2ab525a96 100644 --- a/external_imported/vcpkg/ports/sockpp/portfile.cmake +++ b/external_imported/vcpkg/ports/sockpp/portfile.cmake @@ -8,11 +8,10 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "\${SOCKPP}-static" "\${SOCKPP}") +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "\${SOCKPP}-static" "\${SOCKPP}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSOCKPP_BUILD_SHARED=OFF -DSOCKPP_BUILD_STATIC=ON @@ -23,9 +22,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/sockppConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/sockppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +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) diff --git a/external_imported/vcpkg/ports/sockpp/vcpkg.json b/external_imported/vcpkg/ports/sockpp/vcpkg.json index c985086f1..07d6f3f00 100644 --- a/external_imported/vcpkg/ports/sockpp/vcpkg.json +++ b/external_imported/vcpkg/ports/sockpp/vcpkg.json @@ -1,17 +1,15 @@ { "name": "sockpp", "version": "0.7.1", + "port-version": 1, "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", "homepage": "https://github.com/fpagliughi/sockpp", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/external_imported/vcpkg/ports/soil2/LICENSE b/external_imported/vcpkg/ports/soil2/LICENSE deleted file mode 100644 index 02c410675..000000000 --- a/external_imported/vcpkg/ports/soil2/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 2018 Matrin Lucas Golini - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/external_imported/vcpkg/ports/soil2/portfile.cmake b/external_imported/vcpkg/ports/soil2/portfile.cmake index db31e6d78..b8c223779 100644 --- a/external_imported/vcpkg/ports/soil2/portfile.cmake +++ b/external_imported/vcpkg/ports/soil2/portfile.cmake @@ -1,26 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SpartanJ/soil2 - REF 51023d551d895fb4beb576d726d798ccfe358d34 - SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c + REF ddcb35d13cc4129103de1c1a3cb74b828fe46b4a # 1.3.0 + SHA512 627c7bf4fddd5afef85ba7634c5ec0e10005c700abc1eb07c6346c1604e430c34aa4c33f6ffecbecb3dc2b04de7b855a3f6d923e94f23621ae0184e706358908 HEAD_REF master - PATCHES Workaround-ICE-in-release.patch + PATCHES Workaround-ICE-in-release.patch ) file( COPY - "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" - "${CMAKE_CURRENT_LIST_DIR}/LICENSE" - "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in" - DESTINATION "${SOURCE_PATH}" + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in" + DESTINATION "${SOURCE_PATH}" ) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_cmake_install() +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) diff --git a/external_imported/vcpkg/ports/soil2/vcpkg.json b/external_imported/vcpkg/ports/soil2/vcpkg.json index aebe61dcf..55acddbbb 100644 --- a/external_imported/vcpkg/ports/soil2/vcpkg.json +++ b/external_imported/vcpkg/ports/soil2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soil2", - "version-date": "2021-05-01", - "port-version": 1, + "version": "1.3.0", "description": "Simple OpenGL Image Library 2", "homepage": "https://github.com/SpartanJ/SOIL2", "license": "MIT-0", diff --git a/external_imported/vcpkg/ports/sol2/fix-namespace.patch b/external_imported/vcpkg/ports/sol2/fix-namespace.patch index bcce158db..79b3548d0 100644 --- a/external_imported/vcpkg/ports/sol2/fix-namespace.patch +++ b/external_imported/vcpkg/ports/sol2/fix-namespace.patch @@ -1,10 +1,10 @@ diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in -index 70c448d..7965bc6 100644 +index 0c48a99..62930db 100644 --- a/cmake/sol2-config.cmake.in +++ b/cmake/sol2-config.cmake.in -@@ -26,11 +26,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake") +@@ -24,9 +24,9 @@ - MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR}) + include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake") -if (TARGET sol2) +if (TARGET sol2::sol2) @@ -15,5 +15,3 @@ index 70c448d..7965bc6 100644 - set(SOL2_LIBRARIES sol2) + set(SOL2_LIBRARIES sol2::sol2) endif() - - if(TARGET sol2_single) diff --git a/external_imported/vcpkg/ports/sol2/portfile.cmake b/external_imported/vcpkg/ports/sol2/portfile.cmake index 901aeb51f..c5c2cd8bc 100644 --- a/external_imported/vcpkg/ports/sol2/portfile.cmake +++ b/external_imported/vcpkg/ports/sol2/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/sol2 - REF v3.2.2 - SHA512 e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec + REF eba86625b707e3c8c99bbfc4624e51f42dc9e561 #v3.3.0 + SHA512 a1fbcb4efd9a8b8b97c351e90499644aea72a3db62c258e219a2912853936b76870b51e69d835c14cbf1a20733673ba474e259a0243fec419c411b995cd1511d HEAD_REF develop PATCHES fix-namespace.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sol2) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sol2) file( REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/include" ) -file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/) +file(INSTALL "${SOURCE_PATH}/include/sol" DESTINATION "${CURRENT_PACKAGES_DIR}/include/") -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) vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/sol2/vcpkg.json b/external_imported/vcpkg/ports/sol2/vcpkg.json index 54c8837d5..699abac23 100644 --- a/external_imported/vcpkg/ports/sol2/vcpkg.json +++ b/external_imported/vcpkg/ports/sol2/vcpkg.json @@ -1,13 +1,21 @@ { "name": "sol2", - "version-string": "3.2.2", - "port-version": 2, + "version": "3.3.0", "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great", "homepage": "https://github.com/ThePhD/sol2", + "license": "MIT", "dependencies": [ { "name": "lua", "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/solid3/no-sse.patch b/external_imported/vcpkg/ports/solid3/no-sse.patch new file mode 100644 index 000000000..ed2cb1ddb --- /dev/null +++ b/external_imported/vcpkg/ports/solid3/no-sse.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be43838..fe71394 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,8 +87,12 @@ if(MSVC) + endif(MSVC) + + if(UNIX) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ffast-math -msse2 -mfpmath=sse") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -Wall -ffast-math -msse2 -mfpmath=sse") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ffast-math") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -Wall -ffast-math") ++ if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse") ++ endif() + if (DYNAMIC_SOLID) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") diff --git a/external_imported/vcpkg/ports/solid3/portfile.cmake b/external_imported/vcpkg/ports/solid3/portfile.cmake index 8cca23ada..d39d15fc1 100644 --- a/external_imported/vcpkg/ports/solid3/portfile.cmake +++ b/external_imported/vcpkg/ports/solid3/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable-examples.patch potentially-uninitialized-local-pointer-variable.patch + no-sse.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -15,16 +16,15 @@ else() set(DYNAMIC_SOLID ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DDYNAMIC_SOLID=${DYNAMIC_SOLID} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/solid3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/solid3) file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/solid3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/solid3/README.md ${CURRENT_PACKAGES_DIR}/share/solid3/copyright) diff --git a/external_imported/vcpkg/ports/solid3/vcpkg.json b/external_imported/vcpkg/ports/solid3/vcpkg.json index d8493859d..3a45bbb14 100644 --- a/external_imported/vcpkg/ports/solid3/vcpkg.json +++ b/external_imported/vcpkg/ports/solid3/vcpkg.json @@ -1,6 +1,17 @@ { "name": "solid3", - "version-string": "3.5.8", - "port-version": 1, - "description": "Software Library for Interference Detection" + "version": "3.5.8", + "port-version": 2, + "description": "Software Library for Interference Detection", + "license": "GPL-2.0-only OR QPL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/soxr/003_detect_arm_on_windows.patch b/external_imported/vcpkg/ports/soxr/003_detect_arm.patch similarity index 90% rename from external_imported/vcpkg/ports/soxr/003_detect_arm_on_windows.patch rename to external_imported/vcpkg/ports/soxr/003_detect_arm.patch index f1643fb63..90d3fd281 100644 --- a/external_imported/vcpkg/ports/soxr/003_detect_arm_on_windows.patch +++ b/external_imported/vcpkg/ports/soxr/003_detect_arm.patch @@ -7,7 +7,7 @@ index 0686bef..e4cb094 100644 ARM NEON support macros */ -#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__) -+#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(_M_ARM)) ++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) # include typedef float32x4_t v4sf; # define SIMD_SZ 4 diff --git a/external_imported/vcpkg/ports/soxr/portfile.cmake b/external_imported/vcpkg/ports/soxr/portfile.cmake index 63070fcb4..a922020de 100644 --- a/external_imported/vcpkg/ports/soxr/portfile.cmake +++ b/external_imported/vcpkg/ports/soxr/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_sourceforge( PATCHES 001_initialize-resampler.patch 002_disable_warning.patch - 003_detect_arm_on_windows.patch + 003_detect_arm.patch ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/soxr/vcpkg.json b/external_imported/vcpkg/ports/soxr/vcpkg.json index ec6f10990..3a7edcd3a 100644 --- a/external_imported/vcpkg/ports/soxr/vcpkg.json +++ b/external_imported/vcpkg/ports/soxr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "soxr", "version": "0.1.3", - "port-version": 6, + "port-version": 7, "description": "High quality audio resampling", "homepage": "https://sourceforge.net/projects/soxr/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/spdk-isal/portfile.cmake b/external_imported/vcpkg/ports/spdk-isal/portfile.cmake index 3a09af620..1fae5d898 100644 --- a/external_imported/vcpkg/ports/spdk-isal/portfile.cmake +++ b/external_imported/vcpkg/ports/spdk-isal/portfile.cmake @@ -1,3 +1,6 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/isal/copyright") + message(FATAL_ERROR "'${PORT}' conflicts with 'isal'. Please remove isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/external_imported/vcpkg/ports/spdk-isal/vcpkg.json b/external_imported/vcpkg/ports/spdk-isal/vcpkg.json index d2caf2dfc..b1e6045d4 100644 --- a/external_imported/vcpkg/ports/spdk-isal/vcpkg.json +++ b/external_imported/vcpkg/ports/spdk-isal/vcpkg.json @@ -1,8 +1,9 @@ { "name": "spdk-isal", - "version-string": "20181006", - "port-version": 2, + "version-date": "2018-10-06", + "port-version": 3, "description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library", + "homepage": "https://github.com/spdk/isa-l", "license": "BSD-3-Clause", "supports": "!windows & !(osx & x64)" } diff --git a/external_imported/vcpkg/ports/spdlog/portfile.cmake b/external_imported/vcpkg/ports/spdlog/portfile.cmake index 264772c85..e460dc0a7 100644 --- a/external_imported/vcpkg/ports/spdlog/portfile.cmake +++ b/external_imported/vcpkg/ports/spdlog/portfile.cmake @@ -12,14 +12,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS wchar SPDLOG_WCHAR_SUPPORT ) -# configured in triplet file +# SPDLOG_WCHAR_FILENAMES can only be configured in triplet file since it is an alternative (not additive) 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) + elseif(SPDLOG_WCHAR_FILENAMES) message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") endif() endif() @@ -45,10 +45,23 @@ 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" - "#define SPDLOG_FMT_EXTERNAL" + "#ifndef SPDLOG_FMT_EXTERNAL\n#define SPDLOG_FMT_EXTERNAL\n#endif" ) +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" + ) +endif() +if(SPDLOG_WCHAR_FILENAMES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_WCHAR_FILENAMES" + "#ifndef SPDLOG_WCHAR_FILENAMES\n#define SPDLOG_WCHAR_FILENAMES\n#endif" + ) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/external_imported/vcpkg/ports/spdlog/vcpkg.json b/external_imported/vcpkg/ports/spdlog/vcpkg.json index b643f8bf1..88c834167 100644 --- a/external_imported/vcpkg/ports/spdlog/vcpkg.json +++ b/external_imported/vcpkg/ports/spdlog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "spdlog", "version-semver": "1.10.0", + "port-version": 1, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/external_imported/vcpkg/ports/spectra/portfile.cmake b/external_imported/vcpkg/ports/spectra/portfile.cmake index 9a2394490..dad97dd37 100644 --- a/external_imported/vcpkg/ports/spectra/portfile.cmake +++ b/external_imported/vcpkg/ports/spectra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yixuan/spectra - REF v1.0.0 - SHA512 45540b12d370a28029f507f503618a0be9c19ec3a41813e23e036211dbc98237ac502c7f60cd42ccaa262f9dc0ebc02aabdefcd314f0c98c1e3dc925df02d783 + REF v1.0.1 + SHA512 575f90d2ab9c3cbdd4bbfe1abce35a262e319dac8689420859811a169cbfd8f617c80bfcd430aa8a5383c96f338155870a0ad7ac0d5db855c1e822c2d19837b5 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/spectra/vcpkg.json b/external_imported/vcpkg/ports/spectra/vcpkg.json index 83d1c1fc4..1d7f1e1e7 100644 --- a/external_imported/vcpkg/ports/spectra/vcpkg.json +++ b/external_imported/vcpkg/ports/spectra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spectra", - "version": "1.0.0", + "version": "1.0.1", "description": "A header-only C++ library for large scale eigenvalue problems", "homepage": "https://spectralib.org", "documentation": "https://spectralib.org/quick-start.html", diff --git a/external_imported/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch b/external_imported/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch deleted file mode 100644 index 72b61f4cc..000000000 --- a/external_imported/vcpkg/ports/speex/0001-make-pkg-config-lib-name-configurable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/speex.pc.in b/speex.pc.in -index 97bba4f..52a1d3c 100644 ---- a/speex.pc.in -+++ b/speex.pc.in -@@ -10,6 +10,6 @@ Description: Speex is an audio codec tuned for speech - Version: @SPEEX_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} -lspeex -+Libs: -L${libdir} -l@SPEEXLIB@ - Libs.private: @LIBM@ - Cflags: -I${includedir} - diff --git a/external_imported/vcpkg/ports/speex/CMakeLists.txt b/external_imported/vcpkg/ports/speex/CMakeLists.txt deleted file mode 100644 index b151b2439..000000000 --- a/external_imported/vcpkg/ports/speex/CMakeLists.txt +++ /dev/null @@ -1,111 +0,0 @@ -cmake_minimum_required (VERSION 3.8.0) -project (libspeex C) - -include(GNUInstallDirs) -include(CheckLibraryExists) - -option(USE_SSE "USE_SSE used Note: USE_SSE and FIXED_POINT are mutually exclusive." ON) -if(MSVC) - add_definitions(-DHAVE_CONFIG_H) - if(USE_SSE) - add_definitions(-DUSE_SSE -DFLOATING_POINT) - else() - add_definitions(-DFIXED_POINT) - endif() -endif() - -include_directories(win32 include) - -set(CMAKE_DEBUG_POSTFIX d) - -file(READ "win32/libspeex.def" _contents) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - string(REPLACE "LIBRARY libspeex" "LIBRARY libspeexd" _contents "${_contents}") -endif() -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" - "${_contents}\n" - "speex_nb_mode\n" - "speex_wb_mode\n" - "speex_uwb_mode\n" - "speex_mode_list\n" - "speex_header_free\n" -) - -file(STRINGS "configure.ac" - _speex_version_defines REGEX "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") -foreach(ver ${_speex_version_defines}) - if(ver MATCHES "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") - set(SPEEX_${CMAKE_MATCH_1}_VERSION "${CMAKE_MATCH_2}" CACHE INTERNAL "") - endif() -endforeach() -set(SPEEX_VERSION ${SPEEX_MAJOR_VERSION}.${SPEEX_MINOR_VERSION}.${SPEEX_MICRO_VERSION}) - -set(SRC - "libspeex/bits.c" - "libspeex/cb_search.c" - "libspeex/exc_10_16_table.c" - "libspeex/exc_10_32_table.c" - "libspeex/exc_20_32_table.c" - "libspeex/exc_5_256_table.c" - "libspeex/exc_5_64_table.c" - "libspeex/exc_8_128_table.c" - "libspeex/fftwrap.c" - "libspeex/filters.c" - "libspeex/gain_table.c" - "libspeex/gain_table_lbr.c" - "libspeex/hexc_10_32_table.c" - "libspeex/hexc_table.c" - "libspeex/high_lsp_tables.c" - "libspeex/kiss_fft.c" - "libspeex/kiss_fftr.c" - "libspeex/lpc.c" - "libspeex/lsp.c" - "libspeex/lsp_tables_nb.c" - "libspeex/ltp.c" - "libspeex/modes.c" - "libspeex/modes_wb.c" - "libspeex/nb_celp.c" - "libspeex/quant_lsp.c" - "libspeex/sb_celp.c" - "libspeex/smallft.c" - "libspeex/speex.c" - "libspeex/speex_callbacks.c" - "libspeex/speex_header.c" - "libspeex/stereo.c" - "libspeex/vbr.c" - "libspeex/vq.c" - "libspeex/window.c" - "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" -) - -add_library(libspeex ${SRC}) - -install( - TARGETS libspeex - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") -endif() - -# pkgconfig file -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) -set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) -set(LIBM ) -check_library_exists(m ceil "" LIBMEXIST) -if(LIBMEXIST) - list(APPEND LIBM -lm) -endif() -set(SPEEXLIB "${CMAKE_PROJECT_NAME}") -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(SPEEXLIB "${CMAKE_PROJECT_NAME}d") -endif() -configure_file(speex.pc.in speex.pc @ONLY) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/speex.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/external_imported/vcpkg/ports/speex/fix-vla-check.patch b/external_imported/vcpkg/ports/speex/fix-vla-check.patch new file mode 100644 index 000000000..9c64922c5 --- /dev/null +++ b/external_imported/vcpkg/ports/speex/fix-vla-check.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index d94c2fe..b813148 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,7 @@ AC_C_RESTRICT + + + AC_MSG_CHECKING(for C99 variable-size arrays) +-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ + int foo; + foo = 10; + int array[foo]; diff --git a/external_imported/vcpkg/ports/speex/portfile.cmake b/external_imported/vcpkg/ports/speex/portfile.cmake index b3c81875c..3bd2df656 100644 --- a/external_imported/vcpkg/ports/speex/portfile.cmake +++ b/external_imported/vcpkg/ports/speex/portfile.cmake @@ -1,47 +1,29 @@ -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PATCHES "0001-make-pkg-config-lib-name-configurable.patch") -endif() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO xiph/speex - REF Speex-1.2.0 - SHA512 612dfd67a9089f929b7f2a613ed3a1d2fda3d3ec0a4adafe27e2c1f4542de1870b42b8042f0dcb16d52e08313d686cc35b76940776419c775417f5bad18b448f - HEAD_REF master - PATCHES ${PATCHES} + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/speex + REF 5dceaaf3e23ee7fd17c80cb5f02a838fd6c18e01 #Speex-1.2.1 + SHA512 d03da906ec26ddcea2e1dc4157ac6dd056e1407381b0f37edd350552a02a7372e9108b4e39ae522f1b165be04b813ee11db0b47d17607e4dad18118b9041636b + HEAD_REF master + PATCHES + fix-vla-check.patch + subdirs.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON - ) - vcpkg_cmake_install() - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/speex/speex.h" - "extern const SpeexMode" - "__declspec(dllimport) extern const SpeexMode" - ) - endif() -else() - if(VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_OSX) message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with brew install autoconf automake libtool") - elseif(VCPKG_TARGET_IS_LINUX) +elseif(VCPKG_TARGET_IS_LINUX) message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with apt-get install autoconf automake libtool") - endif() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS --disable-binaries # no example programs (require libogg) - ) - vcpkg_install_make() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --disable-binaries # no example programs (GPL, require libogg) +) +vcpkg_install_make() vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/speex/subdirs.patch b/external_imported/vcpkg/ports/speex/subdirs.patch new file mode 100644 index 000000000..6832de2b3 --- /dev/null +++ b/external_imported/vcpkg/ports/speex/subdirs.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index dc90415..3b3c16d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,7 +14,7 @@ pkgconfig_DATA = speex.pc + EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP + + #Fools KDevelop into including all files +-SUBDIRS = libspeex include doc win32 symbian ti ++SUBDIRS = libspeex include + + if BUILD_BINARIES + SUBDIRS += src diff --git a/external_imported/vcpkg/ports/speex/vcpkg.json b/external_imported/vcpkg/ports/speex/vcpkg.json index b5f4250c0..c317c3411 100644 --- a/external_imported/vcpkg/ports/speex/vcpkg.json +++ b/external_imported/vcpkg/ports/speex/vcpkg.json @@ -1,15 +1,8 @@ { "name": "speex", - "version": "1.2.0", - "port-version": 11, + "version": "1.2.1", + "port-version": 1, "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", "homepage": "https://github.com/xiph/speex", - "license": null, - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true, - "platform": "windows" - } - ] + "license": "BSD-3-Clause" } diff --git a/external_imported/vcpkg/ports/speexdsp/CMakeLists.txt b/external_imported/vcpkg/ports/speexdsp/CMakeLists.txt index 6d9658916..673dbda27 100644 --- a/external_imported/vcpkg/ports/speexdsp/CMakeLists.txt +++ b/external_imported/vcpkg/ports/speexdsp/CMakeLists.txt @@ -34,7 +34,6 @@ set(LIBSPEEXDSP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_neon.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_sse.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.h" - "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/stack_alloc.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/vorbis_psy.h" "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_buffer.h" ) @@ -100,6 +99,9 @@ add_library(speexdsp ${LIBSPEEXDSP_SOURCES} ${LIBSPEEXDSP_HEADERS}) set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_PUBLIC}") set_target_properties(speexdsp PROPERTIES VERSION "${LIBSPEEXDSP_VERSION}") set_target_properties(speexdsp PROPERTIES SOVERSION "${LIBSPEEXDSP_SOVERSION}") +if (WIN32) + set_target_properties(speexdsp PROPERTIES RUNTIME_OUTPUT_NAME "libspeexdsp") +endif() # pkgconfig file set(prefix "${CMAKE_INSTALL_PREFIX}") diff --git a/external_imported/vcpkg/ports/speexdsp/portfile.cmake b/external_imported/vcpkg/ports/speexdsp/portfile.cmake index 276ea6e4d..554216848 100644 --- a/external_imported/vcpkg/ports/speexdsp/portfile.cmake +++ b/external_imported/vcpkg/ports/speexdsp/portfile.cmake @@ -8,20 +8,20 @@ if(VCPKG_USE_HEAD_VERSION) else() # Since the github repo is out-dated, use official download URL for release builds to reduce traffic to the Gitlab host vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz" - FILENAME "speexdsp-1.2.0.tar.gz" - SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec + URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz" + FILENAME "speexdsp-1.2.1.tar.gz" + SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "1.2.0" + REF "1.2.1" PATCHES jitter_ctl.patch ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") set(USE_SSE OFF) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -32,19 +32,18 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUA set(USE_NEON ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_SSE=${USE_SSE} -DUSE_NEON=${USE_NEON} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/external_imported/vcpkg/ports/speexdsp/vcpkg.json b/external_imported/vcpkg/ports/speexdsp/vcpkg.json index f62f8416d..19fac1b33 100644 --- a/external_imported/vcpkg/ports/speexdsp/vcpkg.json +++ b/external_imported/vcpkg/ports/speexdsp/vcpkg.json @@ -1,7 +1,13 @@ { "name": "speexdsp", - "version": "1.2.0", - "port-version": 7, + "version": "1.2.1", "description": "A patent-free, Open Source/Free Software DSP library.", - "homepage": "https://speex.org/" + "homepage": "https://speex.org/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/spirv-headers/portfile.cmake b/external_imported/vcpkg/ports/spirv-headers/portfile.cmake index 272746438..dd4ba9758 100644 --- a/external_imported/vcpkg/ports/spirv-headers/portfile.cmake +++ b/external_imported/vcpkg/ports/spirv-headers/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Headers - REF sdk-1.3.204.1 - SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f + REF sdk-1.3.216.0 + SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/spirv-headers/vcpkg.json b/external_imported/vcpkg/ports/spirv-headers/vcpkg.json index ff5cf7cf8..64e7fc879 100644 --- a/external_imported/vcpkg/ports/spirv-headers/vcpkg.json +++ b/external_imported/vcpkg/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version": "1.3.204.1", + "version": "1.3.216.0", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers" } diff --git a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake index 3997af9ef..bfb5f1310 100644 --- a/external_imported/vcpkg/ports/spirv-tools/portfile.cmake +++ b/external_imported/vcpkg/ports/spirv-tools/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Tools - REF v2022.1 - SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e + REF v2022.2 + SHA512 027819bb68a3cb42f086cab8089e0fe0b2ebcf40607811c6848d7d9f412ed3c977498d32dc7e37b828d0e6eb6924878e7c975c461fc5b171142a4ee1da2c1caa ) vcpkg_find_acquire_program(PYTHON3) diff --git a/external_imported/vcpkg/ports/spirv-tools/vcpkg.json b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json index 01d71eb66..49b5581f4 100644 --- a/external_imported/vcpkg/ports/spirv-tools/vcpkg.json +++ b/external_imported/vcpkg/ports/spirv-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-tools", - "version": "2022.1", + "version": "2022.2", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", diff --git a/external_imported/vcpkg/ports/spix/portfile.cmake b/external_imported/vcpkg/ports/spix/portfile.cmake index 91512aa78..3a14dd085 100644 --- a/external_imported/vcpkg/ports/spix/portfile.cmake +++ b/external_imported/vcpkg/ports/spix/portfile.cmake @@ -1,18 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO faaxm/spix - REF v0.3 - SHA512 be5695e1e061583645a711c91f218c2038ed66896932d9f32129242d20d0a451a032d53aee2fdb917f1423de96ebcba97887421636a13260a7e7c228a13666c0 + REF v0.4 + SHA512 4686199f851b4f06abf963ea79d3d2094d7bd956f009b3fe244dfbcfa7e0756d9971cb882c9963d479b44194806f3d0eaef68ac90b3468bf4ba9139948a9cd7b + HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPIX_BUILD_EXAMPLES=OFF -DSPIX_BUILD_TESTS=OFF + -DSPIX_QT_MAJOR=5 ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/spix/vcpkg.json b/external_imported/vcpkg/ports/spix/vcpkg.json index e2e1e5c48..7184dfe74 100644 --- a/external_imported/vcpkg/ports/spix/vcpkg.json +++ b/external_imported/vcpkg/ports/spix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spix", - "version": "0.3", + "version": "0.4", "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", "dependencies": [ diff --git a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake index 55d0b01e4..b7564ab93 100644 --- a/external_imported/vcpkg/ports/sqlcipher/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlcipher/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.5.1 - SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 + REF v4.5.2 + SHA512 1de5b219392bb976631857e32b4523258fd660fedb558d478e536b7e10c711c72c7e7c9062e45bd8a5ceaecbc1fee717935d2357f6811c3ddf76702167f4601b HEAD_REF master ) @@ -38,14 +38,14 @@ message(STATUS "Pre-building ${TARGET_TRIPLET}") vcpkg_execute_required_process( COMMAND ${NMAKE} -f Makefile.msc /A /NOLOGO clean tcl ${NMAKE_OPTIONS} - WORKING_DIRECTORY ${SOURCE_PATH} + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME pre-build-${TARGET_TRIPLET} ) message(STATUS "Pre-building ${TARGET_TRIPLET} done") # The rest of the build process with the CMakeLists.txt is merely a copy of sqlite3 -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 @@ -55,30 +55,29 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool SQLITE3_SKIP_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake" @ONLY ) -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) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json index 2d67e5175..4641301c7 100644 --- a/external_imported/vcpkg/ports/sqlcipher/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlcipher/vcpkg.json @@ -1,12 +1,21 @@ { "name": "sqlcipher", - "version": "4.5.1", + "version": "4.5.2", "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", + "license": null, "supports": "windows & !uwp & !static", "dependencies": [ "openssl", - "tcl" + "tcl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "geopoly": { diff --git a/external_imported/vcpkg/ports/sqlite3/portfile.cmake b/external_imported/vcpkg/ports/sqlite3/portfile.cmake index 30ef7c855..32b423f4e 100644 --- a/external_imported/vcpkg/ports/sqlite3/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlite3/portfile.cmake @@ -1,10 +1,10 @@ # Be sure to update both of these versions together. -set(SQLITE_VERSION 3370100) -set(PKGCONFIG_VERSION 3.37.1) -set(SQLITE_HASH b59343772dc4c6bb8e05fff6206eeb44861efa52c120c789ce6b733e974cf950657b6ab369aa405d75f45ed9cf1cb8128a76447bc63e9ce9822578d71581a7a3) +set(SQLITE_VERSION 3390200) +set(PKGCONFIG_VERSION 3.39.2) +set(SQLITE_HASH a8fb7903cdc985d17b421035d6affe16795382085d7eb70428bdbbb4abc7ea6674aa251d4e532b531733c195e8867bfbd3c5556824c76cf321f8bc617bad6a32) vcpkg_download_distfile(ARCHIVE - URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" + URLS "https://sqlite.org/2022/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" SHA512 ${SQLITE_HASH} ) @@ -69,4 +69,4 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sqlite3.h" "# define SQLITE_API\n" "# define SQLITE_API __declspec(dllimport)\n") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") diff --git a/external_imported/vcpkg/ports/sqlite3/sqlite3-config.in.cmake b/external_imported/vcpkg/ports/sqlite3/sqlite3-config.in.cmake index e7e26bf2c..fac63e6c0 100644 --- a/external_imported/vcpkg/ports/sqlite3/sqlite3-config.in.cmake +++ b/external_imported/vcpkg/ports/sqlite3/sqlite3-config.in.cmake @@ -1,5 +1,5 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) +if(NOT WIN32) include(CMakeFindDependencyMacro) find_dependency(Threads) endif() diff --git a/external_imported/vcpkg/ports/sqlite3/vcpkg.json b/external_imported/vcpkg/ports/sqlite3/vcpkg.json index f59f84fc6..6ff4859a7 100644 --- a/external_imported/vcpkg/ports/sqlite3/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.37.2", - "port-version": 1, + "version": "3.39.2", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://github.com/sqlite/sqlite", "license": "blessing", diff --git a/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake b/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake index efeb21450..c60ead0f6 100644 --- a/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlitecpp/portfile.cmake @@ -14,6 +14,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sqlcipher SQLITE_HAS_CODEC ) +set(USE_STACK_PROTECTION "") +if(VCPKG_TARGET_IS_MINGW) + set(USE_STACK_PROTECTION "-DSQLITECPP_USE_STACK_PROTECTION=OFF") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -25,6 +29,7 @@ vcpkg_configure_cmake( -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF + ${USE_STACK_PROTECTION} ) vcpkg_install_cmake() diff --git a/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json b/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json index c86c7b95e..fef44ac18 100644 --- a/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlitecpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlitecpp", "version-string": "3.1.1", - "port-version": 1, + "port-version": 2, "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "default-features": [ diff --git a/external_imported/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake b/external_imported/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake index 2dd953ff7..0015715fb 100644 --- a/external_imported/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlpp11-connector-mysql/portfile.cmake @@ -1,27 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO rbock/sqlpp11-connector-mysql - REF 0.29 - SHA512 0c71d2ea94933be3bbaa8d6afaac7059660bdb0af5ba905844d95facb5e73a122c3ccd723a48a7fd8db0c028309ac6dc8b91c6838dfbfe530727161d62a1481f - HEAD_REF master -) - -# Use sqlpp11-connector-mysql's own build process, skipping tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_TESTS:BOOL=OFF - -DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json b/external_imported/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json index 8eb8e93f5..8726643e7 100644 --- a/external_imported/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlpp11-connector-mysql/vcpkg.json @@ -1,13 +1,9 @@ { "name": "sqlpp11-connector-mysql", - "version-string": "0.29", - "port-version": 2, - "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11.", + "version": "0.61", + "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the mariadb/mysql feature instead)", "homepage": "https://github.com/rbock/sqlpp11-connector-mysql", - "dependencies": [ - "date", - "sqlpp11" - ], + "license": "BSD-2-Clause", "default-features": [ "mariadb" ], @@ -15,13 +11,27 @@ "mariadb": { "description": "Use MariaDB connector", "dependencies": [ - "libmariadb" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "mariadb" + ], + "version>=": "0.61" + } ] }, "mysql": { "description": "Use MySQL connector", "dependencies": [ - "libmysql" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "mysql" + ], + "version>=": "0.61" + } ] } } diff --git a/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake b/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake index 1663ca73a..0015715fb 100644 --- a/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -1,25 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO rbock/sqlpp11-connector-sqlite3 - REF a06d6944a55349fbd0ab0337c45d80c6efa2ff81 # 0.30 - SHA512 51efe8914b5ccf8092e15a9a7b29798db070ce0b47bb87b212724e209149c3a81821a3841ac317f506356430d87d3f16a066c74f60ad1ad7bf1333c9de36916b - HEAD_REF master -) - -# Use sqlpp11-connector-sqlite3's own build process, skipping tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_TESTS:BOOL=OFF - -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json b/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json index 09ebb22b5..541ab258f 100644 --- a/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlpp11-connector-sqlite3/vcpkg.json @@ -1,11 +1,17 @@ { "name": "sqlpp11-connector-sqlite3", - "version-string": "0.30", - "port-version": 1, - "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.", + "version": "0.61", + "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the sqlite3 feature instead)", + "homepage": "https://github.com/rbock/sqlpp11-connector-sqlite3", + "license": "BSD-2-Clause", "dependencies": [ - "date", - "sqlite3", - "sqlpp11" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "sqlite3" + ], + "version>=": "0.61" + } ] } diff --git a/external_imported/vcpkg/ports/sqlpp11/ddl2cpp_path.patch b/external_imported/vcpkg/ports/sqlpp11/ddl2cpp_path.patch index bc828e829..f908b9af4 100644 --- a/external_imported/vcpkg/ports/sqlpp11/ddl2cpp_path.patch +++ b/external_imported/vcpkg/ports/sqlpp11/ddl2cpp_path.patch @@ -1,8 +1,8 @@ -diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake -index 18ea9b1..730bce1 100644 ---- a/cmake/Sqlpp11Config.cmake -+++ b/cmake/Sqlpp11Config.cmake -@@ -32,7 +32,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake") +diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake +index 5c5926f..c25da97 100644 +--- a/cmake/configs/Sqlpp11Config.cmake ++++ b/cmake/configs/Sqlpp11Config.cmake +@@ -55,7 +55,7 @@ endforeach() # Import "ddl2cpp" script if(NOT TARGET sqlpp11::ddl2cpp) diff --git a/external_imported/vcpkg/ports/sqlpp11/fix-dependency.patch b/external_imported/vcpkg/ports/sqlpp11/fix-dependency.patch deleted file mode 100644 index d43e10bf3..000000000 --- a/external_imported/vcpkg/ports/sqlpp11/fix-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8de9fa..82dd632 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - - include(CTest) - -- --### Dependencies --add_subdirectory(dependencies) -- - ### Main targets - add_library(sqlpp11 INTERFACE) - add_library(sqlpp11::sqlpp11 ALIAS sqlpp11) - -+find_package(date CONFIG REQUIRED) - target_link_libraries(sqlpp11 INTERFACE date::date) - - target_include_directories(sqlpp11 INTERFACE diff --git a/external_imported/vcpkg/ports/sqlpp11/portfile.cmake b/external_imported/vcpkg/ports/sqlpp11/portfile.cmake index 312c16d4e..63ca1ef68 100644 --- a/external_imported/vcpkg/ports/sqlpp11/portfile.cmake +++ b/external_imported/vcpkg/ports/sqlpp11/portfile.cmake @@ -1,33 +1,42 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbock/sqlpp11 - REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60 - SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe + REF 648183fd64070185019f9237481b888173abfaf2 # 2022-09-14 + SHA512 0429c5972ef111a41422ebd3ca259bc7f2cca126b0abd526270e7c8553fbc9d22ee584c526340a7f3c667143a16b961c222687806641b6ddfe9a258bd5e1ccc8 HEAD_REF master PATCHES ddl2cpp_path.patch - fix-dependency.patch ) -# Use sqlpp11's own build process, skipping tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sqlite3 BUILD_SQLITE3_CONNECTOR + mariadb BUILD_MARIADB_CONNECTOR + mysql BUILD_MYSQL_CONNECTOR +) + +# Use sqlpp11's own build process +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DENABLE_TESTS:BOOL=OFF + -DBUILD_TESTING:BOOL=OFF + # Use vcpkg as source for the date library + -DUSE_SYSTEM_DATE:BOOL=ON + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Sqlpp11) # Delete redundant and unnecessary directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/include/date") # Move python script from bin directory -file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) +file(COPY "${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/scripts") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") # 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/external_imported/vcpkg/ports/sqlpp11/vcpkg.json b/external_imported/vcpkg/ports/sqlpp11/vcpkg.json index 63951d797..6d8f07814 100644 --- a/external_imported/vcpkg/ports/sqlpp11/vcpkg.json +++ b/external_imported/vcpkg/ports/sqlpp11/vcpkg.json @@ -1,10 +1,39 @@ { "name": "sqlpp11", - "version-string": "0.60", + "version": "0.61", "port-version": 1, "description": "A type safe embedded domain specific language for SQL queries and results in C++.", "homepage": "https://github.com/rbock/sqlpp11", + "license": "BSD-2-Clause", "dependencies": [ - "date" - ] + "date", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "mariadb": { + "description": "Use MariaDB connector", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Use MySQL connector", + "dependencies": [ + "libmysql" + ] + }, + "sqlite3": { + "description": "Use SQLite3 connector", + "dependencies": [ + "sqlite3" + ] + } + } } diff --git a/external_imported/vcpkg/ports/srell/portfile.cmake b/external_imported/vcpkg/ports/srell/portfile.cmake index 354c9da00..397834a67 100644 --- a/external_imported/vcpkg/ports/srell/portfile.cmake +++ b/external_imported/vcpkg/ports/srell/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION 3_001) +set(VERSION 3_010) vcpkg_download_distfile( ARCHIVE URLS "https://www.akenotsuki.com/misc/srell/srell${VERSION}.zip" FILENAME "srell${VERSION}.zip" - SHA512 6FE1DAC49B713B8FA0E4B12099E2B35017CE853CC8C7045AA808401D8C6D15E16B50E6DDFDCB0EFA9DB31188D5B9B385081C1EEB2AC413701847688B38B61B76 + SHA512 5F2762A98E1B68C3A4FA79051AE2CBEFD23CEDF1CE833FA1EB812D3F1112734018AF36AA9D9A50E2DC40C87A7FAAF46AF0B8F4161481994DC5E19F44301E867D ) vcpkg_extract_source_archive( diff --git a/external_imported/vcpkg/ports/srell/vcpkg.json b/external_imported/vcpkg/ports/srell/vcpkg.json index 255495353..579906d3f 100644 --- a/external_imported/vcpkg/ports/srell/vcpkg.json +++ b/external_imported/vcpkg/ports/srell/vcpkg.json @@ -1,6 +1,7 @@ { "name": "srell", - "version-string": "3.001", + "version-string": "3.010", "description": "SRELL (std::regex-like library) is a regular expression template library for C++.", - "homepage": "https://www.akenotsuki.com/misc/srell/en/" + "homepage": "https://www.akenotsuki.com/misc/srell/en/", + "license": "BSD-2-Clause" } diff --git a/external_imported/vcpkg/ports/status-code/portfile.cmake b/external_imported/vcpkg/ports/status-code/portfile.cmake index a7bf19e77..2e754a347 100644 --- a/external_imported/vcpkg/ports/status-code/portfile.cmake +++ b/external_imported/vcpkg/ports/status-code/portfile.cmake @@ -1,29 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/status-code - REF 0cca391ad9168581641b569e031f25c7ee1673b3 - SHA512 5fdf3e268d0a4a388202547ceac271832642648fdc50824a8f26d86bad1d45c93394ff6651e50232dde534e057dfadaf7a7436b893dd7b182a75bcd57e24fc9d + REF 8d5e162c9b02169fc6c95a79c54d1213027187b7 + SHA512 0af5a93a5015e070c2db8689f9a560c4a739ea40df3d7fee79f461d0274d7e79d27732cd339cb36e3af969adee0215c827b1fe63c177e8d7853c3fbe237f839f HEAD_REF master + PATCHES ) # Because status-code's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/status-code) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/status-code) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/status-code") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/external_imported/vcpkg/ports/status-code/vcpkg.json b/external_imported/vcpkg/ports/status-code/vcpkg.json index 93b58dace..209d93bd7 100644 --- a/external_imported/vcpkg/ports/status-code/vcpkg.json +++ b/external_imported/vcpkg/ports/status-code/vcpkg.json @@ -1,7 +1,21 @@ { "name": "status-code", - "version-string": "1.0.0-20211208", - "port-version": 1, + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", - "homepage": "https://github.com/ned14/status-code" + "homepage": "https://github.com/ned14/status-code", + "license": "Apache-2.0 OR BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/stb/portfile.cmake b/external_imported/vcpkg/ports/stb/portfile.cmake index 439d154a0..0ba5ba0de 100644 --- a/external_imported/vcpkg/ports/stb/portfile.cmake +++ b/external_imported/vcpkg/ports/stb/portfile.cmake @@ -1,14 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nothings/stb - REF b42009b3b9d4ca35bc703f5310eedc74f584be58 # accessed on 2020-09-14 - SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d + REF af1a5bc352164740c1cc1354942b1c6b72eacb8a # committed on 2021-09-10 + SHA512 5937baa1a9b7342ddc0e41c37ba0ea6b0c878f670a81b55bb124681e6b5e381fdc1d9557c96637e3ba082d6d968ed67a78b47f16aa5555c1c43394d1f9e57f2d HEAD_REF master ) -file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +# originally deleted due to patent US6867776, but it has expired and it has yet to be restored +# see https://github.com/nothings/stb/commit/59e7dec3e8bb0a8d4050d03c2dc32cf71ffa87c6 +vcpkg_download_distfile( + STB_PERLIN_H + URLS "https://raw.githubusercontent.com/nothings/stb/2bb4a0accd4003c1db4c24533981e01b1adfd656/stb_perlin.h" + FILENAME stb_perlin.h + SHA512 9dbc77a530ea368a47988393c7228ffaa8622ce5ffd83770306eaa6282bf289f7f6e55f4a4a5c746798e8c8a49e180344fd8837983ec734664abf9077e37d39f +) + +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(COPY ${HEADER_FILES} "${STB_PERLIN_H}" 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 ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -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 "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/stb/vcpkg.json b/external_imported/vcpkg/ports/stb/vcpkg.json index f7dd85dac..957afbd3c 100644 --- a/external_imported/vcpkg/ports/stb/vcpkg.json +++ b/external_imported/vcpkg/ports/stb/vcpkg.json @@ -1,7 +1,8 @@ { "name": "stb", - "version-string": "2020-09-14", + "version-date": "2021-09-10", "port-version": 1, "description": "public domain header-only libraries", - "homepage": "https://github.com/nothings/stb" + "homepage": "https://github.com/nothings/stb", + "license": "MIT OR CC-PDDC" } diff --git a/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch b/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch new file mode 100644 index 000000000..2e07871bd --- /dev/null +++ b/external_imported/vcpkg/ports/stduuid/fix-gsl-polyfill.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45a7dc..039ee53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,11 +37,11 @@ if (UUID_TIME_GENERATOR) + endif() + + # Using span from std +-if (NOT UUID_USING_CXX20_SPAN) +- target_include_directories(${PROJECT_NAME} INTERFACE +- $ +- $) +- install(DIRECTORY gsl DESTINATION include) ++if (UUID_USING_CXX20_SPAN) ++ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20) ++else() ++ find_package(Microsoft.GSL CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL) + endif () + + # Install step and imported target +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 7217b72..fb981d2 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@) + endif () + endif () + ++if (NOT "@UUID_USING_CXX20_SPAN@") ++ find_dependency(Microsoft.GSL) ++endif () ++ + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") + + check_required_components(@PROJECT_NAME@) +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch b/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch new file mode 100644 index 000000000..f80d5b6a6 --- /dev/null +++ b/external_imported/vcpkg/ports/stduuid/fix-install-directory.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fffb92c..f45a7dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF) + add_library(${PROJECT_NAME} INTERFACE) + target_include_directories(${PROJECT_NAME} INTERFACE + $ +- $) ++ $ ++ $) + + # Using system uuid generator + if (UUID_SYSTEM_GENERATOR) +@@ -44,7 +45,7 @@ if (NOT UUID_USING_CXX20_SPAN) + endif () + + # Install step and imported target +-install(FILES include/uuid.h DESTINATION include) ++install(FILES include/uuid.h DESTINATION include/stduuid) + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets) + install(EXPORT ${PROJECT_NAME}-targets + DESTINATION lib/cmake/${PROJECT_NAME}) diff --git a/external_imported/vcpkg/ports/stduuid/fix-libuuid-dependency.patch b/external_imported/vcpkg/ports/stduuid/fix-libuuid-dependency.patch new file mode 100644 index 000000000..59134811d --- /dev/null +++ b/external_imported/vcpkg/ports/stduuid/fix-libuuid-dependency.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 039ee53..d4218a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,11 +23,8 @@ if (UUID_SYSTEM_GENERATOR) + find_library(CFLIB CoreFoundation REQUIRED) + target_link_libraries(${PROJECT_NAME} INTERFACE ${CFLIB}) + else () +- find_package(Libuuid REQUIRED) +- if (Libuuid_FOUND) +- target_include_directories(${PROJECT_NAME} INTERFACE ${Libuuid_INCLUDE_DIRS}) +- target_link_libraries(${PROJECT_NAME} INTERFACE ${Libuuid_LIBRARIES}) +- endif () ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE unofficial::UUID::uuid) + endif () + endif () + +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index fb981d2..8a3c8ab 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -4,8 +4,7 @@ include(CMakeFindDependencyMacro) + if (@UUID_SYSTEM_GENERATOR@) + if (WIN32 OR APPLE) + else () +- list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +- find_dependency(Libuuid REQUIRED) ++ find_dependency(unofficial-libuuid CONFIG) + endif () + endif () + diff --git a/external_imported/vcpkg/ports/stduuid/portfile.cmake b/external_imported/vcpkg/ports/stduuid/portfile.cmake new file mode 100644 index 000000000..27a3bf8d3 --- /dev/null +++ b/external_imported/vcpkg/ports/stduuid/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusbancila/stduuid + REF v1.2.2 + SHA512 30970c25992e1ba35d96e3b2fc8530466c1070b8b913b8c37e9f698f39121a5a74361e2c4db4c2ba2feddb0ce9b2f14b78c4761cdac09b89a6a0117b179b08a7 + HEAD_REF master + PATCHES + fix-install-directory.patch + fix-gsl-polyfill.patch + fix-libuuid-dependency.patch +) + +# the debug build is not necessary, because stduuid deployed files are header-only +set(VCPKG_BUILD_TYPE release) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + system-gen UUID_SYSTEM_GENERATOR + INVERTED_FEATURES + gsl-span UUID_USING_CXX20_SPAN +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUUID_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +if("gsl-span" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#include " "#include ") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 1") +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/stduuid/vcpkg.json b/external_imported/vcpkg/ports/stduuid/vcpkg.json new file mode 100644 index 000000000..840ce796b --- /dev/null +++ b/external_imported/vcpkg/ports/stduuid/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "stduuid", + "version": "1.2.2", + "description": "A C++17 cross-platform implementation for UUIDs", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "gsl-span": { + "description": "Using span from gsl instead of std", + "dependencies": [ + "ms-gsl" + ] + }, + "system-gen": { + "description": "Enable operating system uuid generator", + "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/stftpitchshift/portfile.cmake b/external_imported/vcpkg/ports/stftpitchshift/portfile.cmake new file mode 100644 index 000000000..1b6c2232e --- /dev/null +++ b/external_imported/vcpkg/ports/stftpitchshift/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jurihock/stftPitchShift + HEAD_REF main + REF v1.4.1 + SHA512 69e68af5baeb1bbeae440d2b2dc7a510a72b8b49cd9b23e0934eb8070d31c9a2e98759ea6d609f81caa3c57e1615cc50028dd13a9d04e82725a41da79175a868 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVCPKG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" +) + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +file( + REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" +) diff --git a/external_imported/vcpkg/ports/stftpitchshift/vcpkg.json b/external_imported/vcpkg/ports/stftpitchshift/vcpkg.json new file mode 100644 index 000000000..dea081ce3 --- /dev/null +++ b/external_imported/vcpkg/ports/stftpitchshift/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "stftpitchshift", + "version": "1.4.1", + "description": "STFT based multi pitch shifting with optional formant preservation.", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/string-theory/portfile.cmake b/external_imported/vcpkg/ports/string-theory/portfile.cmake index 83605de51..3277af3a9 100644 --- a/external_imported/vcpkg/ports/string-theory/portfile.cmake +++ b/external_imported/vcpkg/ports/string-theory/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zrax/string_theory - REF 3.5 - SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6 + REF 3.6 + SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/string-theory/vcpkg.json b/external_imported/vcpkg/ports/string-theory/vcpkg.json index aeb3ef9ea..ba3752a62 100644 --- a/external_imported/vcpkg/ports/string-theory/vcpkg.json +++ b/external_imported/vcpkg/ports/string-theory/vcpkg.json @@ -1,8 +1,9 @@ { "name": "string-theory", - "version": "3.5", + "version": "3.6", "description": "Flexible modern C++ string library with type-safe formatting.", "homepage": "https://github.com/zrax/string_theory", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/stronk/portfile.cmake b/external_imported/vcpkg/ports/stronk/portfile.cmake new file mode 100644 index 000000000..6bc759eb4 --- /dev/null +++ b/external_imported/vcpkg/ports/stronk/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO twig-energy/stronk + REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 + HEAD_REF main + SHA512 889c7a58082ab506f0c3b8b11e2f7d70f0b9a9ed67322310b43f070b79b71c3c115d1942319e7b461da80a0708c750503705d437d8228c54d7fa8f6e4626ad43 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/stronk/vcpkg.json b/external_imported/vcpkg/ports/stronk/vcpkg.json new file mode 100644 index 000000000..b8f102b6d --- /dev/null +++ b/external_imported/vcpkg/ports/stronk/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "stronk", + "version-semver": "0.2.0", + "description": "An easy to customize, strong type library with built in support for unit-like behavior", + "homepage": "https://github.com/twig-energy/stronk", + "license": "MIT", + "dependencies": [ + { + "name": "boost-type-index", + "version>=": "1.78.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "abseil": { + "description": "Dependencies for abseil extension", + "dependencies": [ + { + "name": "abseil", + "version>=": "20211102.1" + } + ] + }, + "fmt": { + "description": "Dependencies for fmt extension", + "dependencies": [ + { + "name": "fmt", + "version>=": "9.0.0" + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/stxxl/0001-fix-visual-studio.patch b/external_imported/vcpkg/ports/stxxl/0001-fix-visual-studio.patch index 3506c51ab..287b0ae3d 100644 --- a/external_imported/vcpkg/ports/stxxl/0001-fix-visual-studio.patch +++ b/external_imported/vcpkg/ports/stxxl/0001-fix-visual-studio.patch @@ -1,272 +1,289 @@ -diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h -index 33ec8cf..4079a57 100644 ---- a/include/stxxl/bits/algo/ksort.h -+++ b/include/stxxl/bits/algo/ksort.h -@@ -299,11 +299,7 @@ create_runs( - template --struct run_cursor2_cmp : public std::binary_function< -- run_cursor2, -- run_cursor2, -- bool -- > +diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h +index 33ec8cf..8101741 100644 +--- a/include/stxxl/bits/algo/ksort.h ++++ b/include/stxxl/bits/algo/ksort.h +@@ -299,11 +299,7 @@ create_runs( + template +-struct run_cursor2_cmp : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > +struct run_cursor2_cmp - { - typedef run_cursor2 cursor_type; - KeyExtractor keyobj; -@@ -327,7 +323,7 @@ private: - }; - - template --class key_comparison : public std::binary_function + { + typedef run_cursor2 cursor_type; + KeyExtractor keyobj; +@@ -327,7 +323,7 @@ private: + }; + + template +-class key_comparison : public std::binary_function +class key_comparison - { - KeyExtractor ke; - -diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h -index 524e40d..69234c4 100644 ---- a/include/stxxl/bits/algo/sort_helper.h -+++ b/include/stxxl/bits/algo/sort_helper.h -@@ -51,7 +51,6 @@ struct trigger_entry - - template - struct trigger_entry_cmp -- : public std::binary_function - { - typedef TriggerEntryType trigger_entry_type; - ValueCmp cmp; -@@ -67,11 +66,6 @@ template - struct run_cursor2_cmp -- : public std::binary_function< -- run_cursor2, -- run_cursor2, -- bool -- > - { - typedef BlockType block_type; - typedef PrefetcherType prefetcher_type; -diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h -index 9df12ff..7110246 100644 ---- a/include/stxxl/bits/compat/unique_ptr.h -+++ b/include/stxxl/bits/compat/unique_ptr.h -@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE - - template - struct compat_unique_ptr { --#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400) - typedef std::unique_ptr result; --#else -- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x -- typedef std::auto_ptr result; --#endif - }; - - STXXL_END_NAMESPACE -diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h -index d7c619f..c6b2fcc 100644 ---- a/include/stxxl/bits/containers/btree/leaf.h -+++ b/include/stxxl/bits/containers/btree/leaf.h -@@ -66,7 +66,7 @@ public: - typedef node_cache leaf_cache_type; - - public: -- struct value_compare : public std::binary_function + { + KeyExtractor ke; + +diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h +index 524e40d..69234c4 100644 +--- a/include/stxxl/bits/algo/sort_helper.h ++++ b/include/stxxl/bits/algo/sort_helper.h +@@ -51,7 +51,6 @@ struct trigger_entry + + template + struct trigger_entry_cmp +- : public std::binary_function + { + typedef TriggerEntryType trigger_entry_type; + ValueCmp cmp; +@@ -67,11 +66,6 @@ template + struct run_cursor2_cmp +- : public std::binary_function< +- run_cursor2, +- run_cursor2, +- bool +- > + { + typedef BlockType block_type; + typedef PrefetcherType prefetcher_type; +diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h +index 9df12ff..7110246 100644 +--- a/include/stxxl/bits/compat/unique_ptr.h ++++ b/include/stxxl/bits/compat/unique_ptr.h +@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE + + template + struct compat_unique_ptr { +-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400) + typedef std::unique_ptr result; +-#else +- // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x +- typedef std::auto_ptr result; +-#endif + }; + + STXXL_END_NAMESPACE +diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h +index d7c619f..969adfd 100644 +--- a/include/stxxl/bits/containers/btree/leaf.h ++++ b/include/stxxl/bits/containers/btree/leaf.h +@@ -66,7 +66,7 @@ public: + typedef node_cache leaf_cache_type; + + public: +- struct value_compare : public std::binary_function + struct value_compare - { - key_compare comp; - -diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h -index 13dec7b..a4c47d8 100644 ---- a/include/stxxl/bits/containers/btree/node.h -+++ b/include/stxxl/bits/containers/btree/node.h -@@ -71,7 +71,7 @@ public: - typedef node_cache node_cache_type; - - private: -- struct value_compare : public std::binary_function + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h +index 13dec7b..c26cfff 100644 +--- a/include/stxxl/bits/containers/btree/node.h ++++ b/include/stxxl/bits/containers/btree/node.h +@@ -71,7 +71,7 @@ public: + typedef node_cache node_cache_type; + + private: +- struct value_compare : public std::binary_function + struct value_compare - { - key_compare comp; - -diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h -index 0759bd2..ecf19cd 100644 ---- a/include/stxxl/bits/containers/hash_map/hash_map.h -+++ b/include/stxxl/bits/containers/hash_map/hash_map.h -@@ -1258,10 +1258,7 @@ protected: - * lexicographically by Note: the hash-value has already - * been computed. - */ -- struct Cmp : public std::binary_function< -- std::pair, -- std::pair, bool -- > + { + key_compare comp; + +diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h +index 0759bd2..edcc2ac 100644 +--- a/include/stxxl/bits/containers/hash_map/hash_map.h ++++ b/include/stxxl/bits/containers/hash_map/hash_map.h +@@ -1258,10 +1258,7 @@ protected: + * lexicographically by Note: the hash-value has already + * been computed. + */ +- struct Cmp : public std::binary_function< +- std::pair, +- std::pair, bool +- > + struct Cmp - { - self_type& map_; - Cmp(self_type& map) : map_(map) { } -@@ -1520,7 +1517,7 @@ protected: - - public: - //! Construct an equality predicate from the comparison operator -- struct equal_to : public std::binary_function + { + self_type& map_; + Cmp(self_type& map) : map_(map) { } +@@ -1520,7 +1517,7 @@ protected: + + public: + //! Construct an equality predicate from the comparison operator +- struct equal_to : public std::binary_function + struct equal_to - { - //! reference to hash_map - const self_type& m_map; -diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h -index 933a216..30828a0 100644 ---- a/include/stxxl/bits/io/wbtl_file.h -+++ b/include/stxxl/bits/io/wbtl_file.h -@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file - size_type curpos; - request_ptr backend_request; - -- struct FirstFit : public std::binary_function + { + //! reference to hash_map + const self_type& m_map; +diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h +index 933a216..d9f0674 100644 +--- a/include/stxxl/bits/io/wbtl_file.h ++++ b/include/stxxl/bits/io/wbtl_file.h +@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file + size_type curpos; + request_ptr backend_request; + +- struct FirstFit : public std::binary_function + struct FirstFit - { - bool operator () ( - const place& entry, -diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h -index 19ade8b..887f0e6 100644 ---- a/include/stxxl/bits/mng/block_alloc.h -+++ b/include/stxxl/bits/mng/block_alloc.h -@@ -138,7 +138,7 @@ private: - perm[i] = i; - - stxxl::random_number rnd; -- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL); + { + bool operator () ( + const place& entry, +diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h +index 19ade8b..dac408f 100644 +--- a/include/stxxl/bits/mng/block_alloc.h ++++ b/include/stxxl/bits/mng/block_alloc.h +@@ -138,7 +138,7 @@ private: + perm[i] = i; + + stxxl::random_number rnd; +- std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL); + std::shuffle(perm.begin(), perm.end(), std::mt19937(std::random_device()())); - } - - public: -diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h -index a82ee34..5aba23a 100644 ---- a/include/stxxl/bits/mng/block_alloc_interleaved.h -+++ b/include/stxxl/bits/mng/block_alloc_interleaved.h -@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping - perms[i][j] = j; - - random_number rnd; -- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL); + } + + public: +diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h +index a82ee34..83925a3 100644 +--- a/include/stxxl/bits/mng/block_alloc_interleaved.h ++++ b/include/stxxl/bits/mng/block_alloc_interleaved.h +@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping + perms[i][j] = j; + + random_number rnd; +- std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL); + std::shuffle(perms[i].begin(), perms[i].end(), std::mt19937(std::random_device()())); - } - } - -diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h -index 59ad085..c1e0f83 100644 ---- a/include/stxxl/bits/mng/disk_allocator.h -+++ b/include/stxxl/bits/mng/disk_allocator.h -@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable - { - typedef std::pair place; - -- struct first_fit : public std::binary_function + } + } + +diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h +index 59ad085..a4e534e 100644 +--- a/include/stxxl/bits/mng/disk_allocator.h ++++ b/include/stxxl/bits/mng/disk_allocator.h +@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable + { + typedef std::pair place; + +- struct first_fit : public std::binary_function + struct first_fit - { - bool operator () ( - const place& entry, -@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) - - sortseq::iterator space; - space = std::find_if(free_space.begin(), free_space.end(), -- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + { + bool operator () ( + const place& entry, +@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + + sortseq::iterator space; + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); - - if (space == free_space.end() && requested_size == BlockSize) - { -@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) - grow_file(BlockSize); - - space = std::find_if(free_space.begin(), free_space.end(), -- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + + if (space == free_space.end() && requested_size == BlockSize) + { +@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID* begin, BID* end) + grow_file(BlockSize); + + space = std::find_if(free_space.begin(), free_space.end(), +- bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL); - } - - if (space != free_space.end()) -diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h -index d973861..c858d87 100644 ---- a/include/stxxl/bits/parallel.h -+++ b/include/stxxl/bits/parallel.h -@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle; - #elif STXXL_PARALLEL - - using std::sort; --using std::random_shuffle; - - #else - -diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h -index 141d515..7dae74f 100644 ---- a/include/stxxl/bits/parallel/base.h -+++ b/include/stxxl/bits/parallel/base.h -@@ -33,7 +33,6 @@ namespace parallel { - */ - template - class binary_negate -- : public std::binary_function - { - protected: - Predicate pred; -@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b) - * Constructs predicate for equality from strict weak ordering predicate - */ - template --class equal_from_less : public std::binary_function + } + + if (space != free_space.end()) +diff --git a/include/stxxl/bits/msvc_compatibility.h b/include/stxxl/bits/msvc_compatibility.h +index c2c937d..0cb22e5 100644 +--- a/include/stxxl/bits/msvc_compatibility.h ++++ b/include/stxxl/bits/msvc_compatibility.h +@@ -19,10 +19,12 @@ + + #include + ++#if _MSC_VER < 1900 + inline double log2(double x) + { + return (log(x) / log(2.)); + } ++#endif // ^^^ _MSC_VER < 1900 + + // http://msdn.microsoft.com/en-us/library/2ts7cx93.aspx + #define snprintf _snprintf +diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h +index d973861..c858d87 100644 +--- a/include/stxxl/bits/parallel.h ++++ b/include/stxxl/bits/parallel.h +@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle; + #elif STXXL_PARALLEL + + using std::sort; +-using std::random_shuffle; + + #else + +diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h +index 141d515..1c970f9 100644 +--- a/include/stxxl/bits/parallel/base.h ++++ b/include/stxxl/bits/parallel/base.h +@@ -33,7 +33,6 @@ namespace parallel { + */ + template + class binary_negate +- : public std::binary_function + { + protected: + Predicate pred; +@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b) + * Constructs predicate for equality from strict weak ordering predicate + */ + template +-class equal_from_less : public std::binary_function +class equal_from_less - { - private: - Comparator& comp; -@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b, - - /** Similar to std::equal_to, but allows two different types. */ - template --struct equal_to : std::binary_function + { + private: + Comparator& comp; +@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b, + + /** Similar to std::equal_to, but allows two different types. */ + template +-struct equal_to : std::binary_function +struct equal_to - { - bool operator () (const T1& t1, const T2& t2) const - { -@@ -136,7 +135,7 @@ struct equal_to : std::binary_function - - /** Similar to std::less, but allows two different types. */ - template --struct less : std::binary_function + { + bool operator () (const T1& t1, const T2& t2) const + { +@@ -136,7 +135,7 @@ struct equal_to : std::binary_function + + /** Similar to std::less, but allows two different types. */ + template +-struct less : std::binary_function +struct less - { - bool operator () (const T1& t1, const T2& t2) const - { -diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h -index 57e7599..f41d9aa 100644 ---- a/include/stxxl/bits/parallel/multiseq_selection.h -+++ b/include/stxxl/bits/parallel/multiseq_selection.h -@@ -35,7 +35,6 @@ namespace parallel { - //! Compare a pair of types lexcigraphically, ascending. - template - class lexicographic -- : public std::binary_function, std::pair, bool> - { - protected: - Comparator& m_comp; -@@ -60,7 +59,6 @@ public: - //! Compare a pair of types lexcigraphically, descending. - template - class lexicographic_rev -- : public std::binary_function, std::pair, bool> - { - protected: - Comparator& m_comp; -diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp -index 310d76a..6d52e2e 100644 ---- a/lib/io/wbtl_file.cpp -+++ b/lib/io/wbtl_file.cpp -@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block() - // mapping_lock has to be aquired by caller - sortseq::iterator space = - std::find_if(free_space.begin(), free_space.end(), -- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL); + { + bool operator () (const T1& t1, const T2& t2) const + { +diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h +index 57e7599..f41d9aa 100644 +--- a/include/stxxl/bits/parallel/multiseq_selection.h ++++ b/include/stxxl/bits/parallel/multiseq_selection.h +@@ -35,7 +35,6 @@ namespace parallel { + //! Compare a pair of types lexcigraphically, ascending. + template + class lexicographic +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +@@ -60,7 +59,6 @@ public: + //! Compare a pair of types lexcigraphically, descending. + template + class lexicographic_rev +- : public std::binary_function, std::pair, bool> + { + protected: + Comparator& m_comp; +diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp +index 310d76a..5f1a766 100644 +--- a/lib/io/wbtl_file.cpp ++++ b/lib/io/wbtl_file.cpp +@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block() + // mapping_lock has to be aquired by caller + sortseq::iterator space = + std::find_if(free_space.begin(), free_space.end(), +- bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL); + std::bind(FirstFit(), std::placeholders::_1, write_block_size) _STXXL_FORCE_SEQUENTIAL); - - if (space != free_space.end()) - { + + if (space != free_space.end()) + { diff --git a/external_imported/vcpkg/ports/stxxl/vcpkg.json b/external_imported/vcpkg/ports/stxxl/vcpkg.json index e6a4029b0..107a43249 100644 --- a/external_imported/vcpkg/ports/stxxl/vcpkg.json +++ b/external_imported/vcpkg/ports/stxxl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "stxxl", - "version-string": "2018-11-15", - "port-version": 4, + "version-date": "2018-11-15", + "port-version": 5, "description": "Standard Template Library for Extra Large Data Sets" } diff --git a/external_imported/vcpkg/ports/sundials/portfile.cmake b/external_imported/vcpkg/ports/sundials/portfile.cmake index 34ceecc99..b340a361d 100644 --- a/external_imported/vcpkg/ports/sundials/portfile.cmake +++ b/external_imported/vcpkg/ports/sundials/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LLNL/sundials - REF v5.8.0 - SHA512 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 + REF e2f29c34f324829302037a1492db480be8828084 + SHA512 9af9a5d7a44de1f2afbc35d8e2ec3d35a2d15f1b708be7a90bf849a0d0576fda6c73fae6b8954025805ac1ca25468558c02dcc2fd86b5767699518988817d4d8 HEAD_REF master PATCHES install-dlls-in-bin.patch @@ -12,20 +12,20 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -D_BUILD_EXAMPLES=OFF -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC} -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED} ) -vcpkg_cmake_install(DISABLE_PARALLEL) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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) file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") diff --git a/external_imported/vcpkg/ports/sundials/vcpkg.json b/external_imported/vcpkg/ports/sundials/vcpkg.json index df5c71f14..bcb330e61 100644 --- a/external_imported/vcpkg/ports/sundials/vcpkg.json +++ b/external_imported/vcpkg/ports/sundials/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sundials", - "version-semver": "5.8.0", + "version-semver": "6.2.0", "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)", "homepage": "https://computation.llnl.gov/projects/sundials", "dependencies": [ diff --git a/external_imported/vcpkg/ports/superlu/portfile.cmake b/external_imported/vcpkg/ports/superlu/portfile.cmake index 7b4f8d25a..7ffea59ad 100644 --- a/external_imported/vcpkg/ports/superlu/portfile.cmake +++ b/external_imported/vcpkg/ports/superlu/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu @@ -9,21 +13,18 @@ vcpkg_from_github( remove-make.inc.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DXSDK_ENABLE_Fortran=OFF -Denable_tests=OFF -Denable_blaslib=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/superlu/vcpkg.json b/external_imported/vcpkg/ports/superlu/vcpkg.json index fc100ad2e..2428d96f0 100644 --- a/external_imported/vcpkg/ports/superlu/vcpkg.json +++ b/external_imported/vcpkg/ports/superlu/vcpkg.json @@ -1,11 +1,20 @@ { "name": "superlu", "version-date": "2020-01-07", - "port-version": 5, + "port-version": 6, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", + "license": "BSD-4-Clause-UC", "supports": "!(uwp | arm)", "dependencies": [ - "blas" + "blas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/symengine/fix-build.patch b/external_imported/vcpkg/ports/symengine/fix-build.patch deleted file mode 100644 index 5087428e6..000000000 --- a/external_imported/vcpkg/ports/symengine/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/symengine/mp_boost.cpp b/symengine/mp_boost.cpp -index db20930c4..f3997707e 100644 ---- a/symengine/mp_boost.cpp -+++ b/symengine/mp_boost.cpp -@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class &i) - if (i == 0) { - return ULONG_MAX; - } -- return find_lsb(i, int_<0>()); -+ return find_lsb(i, {}); - } - - // define simple 2x2 matrix with exponentiation by repeated squaring diff --git a/external_imported/vcpkg/ports/symengine/portfile.cmake b/external_imported/vcpkg/ports/symengine/portfile.cmake index f9e140498..dc0329930 100644 --- a/external_imported/vcpkg/ports/symengine/portfile.cmake +++ b/external_imported/vcpkg/ports/symengine/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF v0.7.0 - SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348 + REF 7b1880824c2cce98787ae29a317682ba6c294484 #v0.9.0 + SHA512 745b2616b88032ff047a28e46b703bc1912d109524f8aa411a5b7a650a6d89d3f16dc92812381e95b13bc5cf61218d2ff3db9d3809443264340eae180968cbcf HEAD_REF master - PATCHES - fix-build.patch ) vcpkg_check_features( diff --git a/external_imported/vcpkg/ports/symengine/vcpkg.json b/external_imported/vcpkg/ports/symengine/vcpkg.json index 3efe22af9..825797818 100644 --- a/external_imported/vcpkg/ports/symengine/vcpkg.json +++ b/external_imported/vcpkg/ports/symengine/vcpkg.json @@ -1,9 +1,9 @@ { "name": "symengine", - "version": "0.7.0", - "port-version": 2, + "version": "0.9.0", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", + "license": "BSD-3-Clause", "dependencies": [ "boost-math", "boost-random", diff --git a/external_imported/vcpkg/ports/szip/portfile.cmake b/external_imported/vcpkg/ports/szip/portfile.cmake index 038736e7a..1072e9881 100644 --- a/external_imported/vcpkg/ports/szip/portfile.cmake +++ b/external_imported/vcpkg/ports/szip/portfile.cmake @@ -8,18 +8,29 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF szip-${SZIP_VERSION} + REF "szip-${SZIP_VERSION}" PATCHES fix-linkage-config.patch mingw-lib-names.patch ) +if (VCPKG_TARGET_IS_IOS) + # when cross-compiling, try_run will not work. + # LFS "large file support" is keyed on + # 1) 64-bit off_t (https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/64bitPorting/transition/transition.html table 2-1) + # 2) stat works properly, which is true + set(extra_opts + -DTEST_LFS_WORKS_RUN=TRUE + -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT="" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip + ${extra_opts} ) vcpkg_cmake_install() @@ -62,7 +73,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib") endif() vcpkg_fixup_pkgconfig() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/szip/copyright") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/szip/data") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/szip/vcpkg.json b/external_imported/vcpkg/ports/szip/vcpkg.json index 7c83b1a15..3144709c2 100644 --- a/external_imported/vcpkg/ports/szip/vcpkg.json +++ b/external_imported/vcpkg/ports/szip/vcpkg.json @@ -1,9 +1,10 @@ { "name": "szip", "version": "2.1.1", - "port-version": 7, + "port-version": 9, "description": "Szip compression software, providing lossless compression of scientific data", "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/taglib/portfile.cmake b/external_imported/vcpkg/ports/taglib/portfile.cmake index a951b7e64..c376de69a 100644 --- a/external_imported/vcpkg/ports/taglib/portfile.cmake +++ b/external_imported/vcpkg/ports/taglib/portfile.cmake @@ -13,7 +13,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS ${WINRT_OPTIONS} ) vcpkg_cmake_install() @@ -32,12 +31,6 @@ endif() # remove the debug/include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# copyright file -file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/taglib-config.cmd" "${CURRENT_PACKAGES_DIR}/debug/bin/taglib-config.cmd") # Contains absolute paths # remove bin directory for static builds (taglib creates a cmake batch file there) @@ -48,3 +41,7 @@ endif() vcpkg_copy_pdbs() +# copyright file +file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/taglib") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/taglib/COPYING.LGPL" "${CURRENT_PACKAGES_DIR}/share/taglib/copyright") diff --git a/external_imported/vcpkg/ports/taglib/vcpkg.json b/external_imported/vcpkg/ports/taglib/vcpkg.json index 54e9759ba..2a3f1c97a 100644 --- a/external_imported/vcpkg/ports/taglib/vcpkg.json +++ b/external_imported/vcpkg/ports/taglib/vcpkg.json @@ -1,10 +1,10 @@ { "name": "taglib", "version-semver": "1.12.0", - "port-version": 2, + "port-version": 3, "description": "TagLib Audio Meta-Data Library", "homepage": "https://taglib.org/", - "license": "LGPL-2.1 OR MPL-1.1", + "license": "LGPL-2.1-only OR MPL-1.1", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/taskflow/portfile.cmake b/external_imported/vcpkg/ports/taskflow/portfile.cmake index 87c60ac15..675132df1 100644 --- a/external_imported/vcpkg/ports/taskflow/portfile.cmake +++ b/external_imported/vcpkg/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF bfad4b9a0cc5acad5fc99fb6ff6b904b79f27f93 #v3.3.0 - SHA512 489807c84438a727832e9d530c9b2948240bebee48f210ce4a8c69917cbb71306df378440621b1bf091e4aa62c86681d71afd38a3343c8ea872a4eefcabc496e + REF v3.4.0 + SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/taskflow/vcpkg.json b/external_imported/vcpkg/ports/taskflow/vcpkg.json index 9d2cbca95..40cae6918 100644 --- a/external_imported/vcpkg/ports/taskflow/vcpkg.json +++ b/external_imported/vcpkg/ports/taskflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "taskflow", - "version": "3.3.0", + "version": "3.4.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", "homepage": "https://github.com/taskflow/taskflow", "license": "MIT", diff --git a/external_imported/vcpkg/ports/tbb/CMakeLists.txt b/external_imported/vcpkg/ports/tbb/CMakeLists.txt deleted file mode 100644 index ae53c40f2..000000000 --- a/external_imported/vcpkg/ports/tbb/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -project(tbb CXX) - -file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*) -file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src) - -include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) -if(NOT BUILD_SHARED_LIBS) - set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) -endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}") - if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") - set(arch "arch=arm64") - endif() -endif() - -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR) - set(arch "arch=${CMAKE_SYSTEM_PROCESSOR}") - if(CMAKE_CXX_COMPILER) - set(CPLUS "CPLUS=${CMAKE_CXX_COMPILER}") - endif() - if(CMAKE_C_COMPILER) - set(CONLY "CONLY=${CMAKE_C_COMPILER}") - endif() - endif() -endif() - -tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) - -set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) -if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(SUBDIR "${SUBDIR}_release") -else() - set(SUBDIR "${SUBDIR}_debug") -endif() - -file(GLOB OUTPUTS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*) - -install(FILES ${OUTPUTS} DESTINATION lib) diff --git a/external_imported/vcpkg/ports/tbb/fix-static-build.patch b/external_imported/vcpkg/ports/tbb/fix-static-build.patch deleted file mode 100644 index 18f3e2b49..000000000 --- a/external_imported/vcpkg/ports/tbb/fix-static-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tbb/cilk-tbb-interop.h b/src/tbb/cilk-tbb-interop.h -index 295734b..f35531e 100644 ---- a/src/tbb/cilk-tbb-interop.h -+++ b/src/tbb/cilk-tbb-interop.h -@@ -29,6 +29,8 @@ - #else - #ifdef IN_CILK_RUNTIME - #define CILK_EXPORT __declspec(dllexport) -+#elif defined(IN_CILK_STATIC) -+#define CILK_EXPORT /* nothing */ - #else - #define CILK_EXPORT __declspec(dllimport) - #endif // IN_CILK_RUNTIME diff --git a/external_imported/vcpkg/ports/tbb/portfile.cmake b/external_imported/vcpkg/ports/tbb/portfile.cmake index e826081f8..c6a46dee1 100644 --- a/external_imported/vcpkg/ports/tbb/portfile.cmake +++ b/external_imported/vcpkg/ports/tbb/portfile.cmake @@ -3,136 +3,36 @@ set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneTBB - REF eca91f16d7490a8abfdee652dadf457ec820cc37 # 2020_U3 - SHA512 7144e1dc68304b5358e6ea330431b6f0c61fadb147efa353a5b242777d6fabf7b8cf99b79cffb51b49b911dd17a9f1879619d6eebdf319f23ec3235c89cffc25 - HEAD_REF tbb_2019 - PATCHES - fix-static-build.patch - terminate-when-buildtool-notfound.patch + REF v2021.5.0 + SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46 + HEAD_REF onetbb_2021 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -if (NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - ) - - vcpkg_install_cmake() - - # Settings for TBBConfigInternal.cmake.in - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(TBB_LIB_EXT a) - else() - if (VCPKG_TARGET_IS_LINUX) - set(TBB_LIB_EXT "so.2") - elseif(VCPKG_TARGET_IS_OSX) - set(TBB_LIB_EXT "dylib") - else() - set(TBB_LIB_EXT "so") - endif() - endif() - set(TBB_LIB_PREFIX lib) -else() - if (VCPKG_CRT_LINKAGE STREQUAL static) - set(RELEASE_CONFIGURATION Release-MT) - set(DEBUG_CONFIGURATION Debug-MT) - else() - set(RELEASE_CONFIGURATION Release) - set(DEBUG_CONFIGURATION Debug) - endif() - - macro(CONFIGURE_PROJ_FILE arg) - set(CONFIGURE_FILE_NAME ${arg}) - set(CONFIGURE_BAK_FILE_NAME ${arg}.bak) - if (NOT EXISTS ${CONFIGURE_BAK_FILE_NAME}) - configure_file(${CONFIGURE_FILE_NAME} ${CONFIGURE_BAK_FILE_NAME} COPYONLY) - endif() - configure_file(${CONFIGURE_BAK_FILE_NAME} ${CONFIGURE_FILE_NAME} COPYONLY) - file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "DynamicLibrary<\/ConfigurationType>" - "StaticLibrary<\/ConfigurationType>" SLN_CONFIGURE "${SLN_CONFIGURE}") - string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" - "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_STATIC" SLN_CONFIGURE "${SLN_CONFIGURE}") - else() - string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" - "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}") - endif() - file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") - endmacro() - - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbb.vcxproj) - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc.vcxproj) - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc_proxy.vcxproj) - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH build/vs2013/makefile.sln - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - ) - # Settings for TBBConfigInternal.cmake.in - set(TBB_LIB_EXT lib) - set(TBB_LIB_PREFIX) -endif() - -file(COPY - ${SOURCE_PATH}/include/tbb - ${SOURCE_PATH}/include/serial - DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -# Settings for TBBConfigInternal.cmake.in -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc) -else() - set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy) -endif() - -file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef) -string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}") -string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}") -string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}") -set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}") -set(TBB_RELEASE_DIR "\${_tbb_root}/lib") -set(TBB_DEBUG_DIR "\${_tbb_root}/debug/lib") - -configure_file( - ${SOURCE_PATH}/cmake/templates/TBBConfigInternal.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake - @ONLY +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTBB_TEST=OFF + -DTBB_STRICT=OFF ) -configure_file( - ${SOURCE_PATH}/cmake/templates/TBBConfigVersion.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfigVersion.cmake - @ONLY -) - -file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake _contents) -string(REPLACE - "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" - "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)\nget_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" - _contents - "${_contents}" -) -string(REPLACE - "set(_tbb_release_lib \"/${TBB_LIB_PREFIX}" - "set(_tbb_release_lib \"\${_tbb_root}/lib/${TBB_LIB_PREFIX}" - _contents - "${_contents}" -) -string(REPLACE - "set(_tbb_debug_lib \"/${TBB_LIB_PREFIX}" - "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/${TBB_LIB_PREFIX}" - _contents - "${_contents}" +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # These are duplicate libraries provided on Windows -- users should use the tbb12 libraries instead + "${CURRENT_PACKAGES_DIR}/lib/tbb.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/tbb_debug.lib" ) -string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}") +file(READ "${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake" _contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +${_contents}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE 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/external_imported/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch b/external_imported/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch deleted file mode 100644 index 9599b48cd..000000000 --- a/external_imported/vcpkg/ports/tbb/terminate-when-buildtool-notfound.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/TBBBuild.cmake b/cmake/TBBBuild.cmake -index a2222e3..756d85c 100644 ---- a/cmake/TBBBuild.cmake -+++ b/cmake/TBBBuild.cmake -@@ -158,7 +158,7 @@ function(tbb_build) - mark_as_advanced(TBB_MAKE_TOOL) - - if (NOT TBB_MAKE_TOOL) -- message(STATUS "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") -+ message(FATAL_ERROR "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") - set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE) - return() - endif() diff --git a/external_imported/vcpkg/ports/tbb/usage b/external_imported/vcpkg/ports/tbb/usage deleted file mode 100644 index ecea9834c..000000000 --- a/external_imported/vcpkg/ports/tbb/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package tbb provides CMake targets: - - find_package(TBB CONFIG REQUIRED) - target_link_libraries(main PRIVATE TBB::tbb) diff --git a/external_imported/vcpkg/ports/tbb/vcpkg.json b/external_imported/vcpkg/ports/tbb/vcpkg.json index 09ab4cd1e..32a12b26f 100644 --- a/external_imported/vcpkg/ports/tbb/vcpkg.json +++ b/external_imported/vcpkg/ports/tbb/vcpkg.json @@ -1,8 +1,18 @@ { "name": "tbb", - "version-string": "2020_U3", - "port-version": 8, + "version": "2021.5.0", "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/01org/tbb", - "supports": "!(uwp | arm | arm64) | linux | osx" + "license": "Apache-2.0", + "supports": "(windows & !uwp) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/tclap/portfile.cmake b/external_imported/vcpkg/ports/tclap/portfile.cmake index d23ae531d..9688be8f7 100644 --- a/external_imported/vcpkg/ports/tclap/portfile.cmake +++ b/external_imported/vcpkg/ports/tclap/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO tclap - FILENAME "tclap-1.2.2.tar.gz" - SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107 + FILENAME "tclap-1.2.5.tar.gz" + SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10 ) file(COPY "${SOURCE_PATH}/include/tclap" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") diff --git a/external_imported/vcpkg/ports/tclap/vcpkg.json b/external_imported/vcpkg/ports/tclap/vcpkg.json index c8ad1ac88..25488bc26 100644 --- a/external_imported/vcpkg/ports/tclap/vcpkg.json +++ b/external_imported/vcpkg/ports/tclap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tclap", - "version-string": "1.2.2", - "port-version": 4, + "version": "1.2.5", "description": "Templatized command-line argument parser for C++", - "homepage": "https://sourceforge.net/projects/tclap/" + "homepage": "https://sourceforge.net/projects/tclap/", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/teemo/portfile.cmake b/external_imported/vcpkg/ports/teemo/portfile.cmake index 6d0a1a7ee..a6db35396 100644 --- a/external_imported/vcpkg/ports/teemo/portfile.cmake +++ b/external_imported/vcpkg/ports/teemo/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/teemo - REF abfff2b724f3ae9f7968392178005f648fe666e3 - SHA512 56b1791159179c7f84523bf3d4b21f5272fce11843da0f0993e58563414a11637ccee50fe5a520089e16df5e17acf2308c2993266156ee49d9d07b1d7211f151 + REF 03f40f92bfbf3b83dc597a60ba36582505adfa54 + SHA512 86962883dfe09f90c4892deb0235e4f71fc295fb837e2b33a9bcf240b4f91d0e191157968d28a6ec02dfe3f8cb9a3869c6bb5986b8a0ea96250fce6c27fe1172 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/teemo/vcpkg.json b/external_imported/vcpkg/ports/teemo/vcpkg.json index ed999e2eb..c4428ccf1 100644 --- a/external_imported/vcpkg/ports/teemo/vcpkg.json +++ b/external_imported/vcpkg/ports/teemo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "teemo", - "version": "2.6", - "port-version": 1, + "version": "2.7", "maintainers": "winsoft666 ", "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", "homepage": "https://github.com/winsoft666/teemo", diff --git a/external_imported/vcpkg/ports/tensorpipe/fix-cmakelists.patch b/external_imported/vcpkg/ports/tensorpipe/fix-cmakelists.patch deleted file mode 100644 index 172ac1e67..000000000 --- a/external_imported/vcpkg/ports/tensorpipe/fix-cmakelists.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 640054e..18de9ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,6 +23,6 @@ include(MiscCheck) - - add_subdirectory(tensorpipe) - --install(EXPORT TensorpipeTargets -- DESTINATION share/cmake/Tensorpipe -- FILE TensorpipeTargets.cmake) -+install(EXPORT tensorpipeTargets -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME} # share/tensorpipe -+ FILE tensorpipeTargets.cmake) -diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt -index d8624b4..dce5c6f 100644 ---- a/tensorpipe/CMakeLists.txt -+++ b/tensorpipe/CMakeLists.txt -@@ -168,8 +168,9 @@ set(TP_PUBLIC_HEADERS ${TP_PUBLIC_HEADERS} - transport/uv/error.h - transport/uv/factory.h - transport/uv/utility.h) --find_package(uv REQUIRED) --target_link_libraries(tensorpipe PRIVATE uv::uv) -+# `libuv` in vcpkg -+find_package(unofficial-libuv CONFIG REQUIRED) -+target_link_libraries(tensorpipe PUBLIC unofficial::libuv::libuv ${CMAKE_DL_LIBS}) - - ### shm - -@@ -233,11 +234,14 @@ configure_file(config.h.in config.h) - - ## Libnop - --# We should keep libnop headers private as they should not be exposed to downstream users, --# but they're currently transitively included by tensorpipe/transport/connection.h (which --# is still unclear whether it should be a public or private header). --target_include_directories(tensorpipe PUBLIC $) -- -+# `libnop` in vcpkg -+find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h") -+if(LIBNOP_INCLUDE_DIRS-NOTFOUND) -+ message(FATAL_ERROR "Failed to find header of the 'libnop' package from vcpkg.") -+else() -+ message(STATUS "Using 'libnop': ${LIBNOP_INCLUDE_DIRS}") -+endif() -+target_include_directories(tensorpipe PUBLIC $) - - ## Python bindings - -@@ -262,10 +266,17 @@ endif() - - ## Install - -+install(DIRECTORY channel common core transport util -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe -+ FILES_MATCHING PATTERN "*.h") -+install(FILES tensorpipe.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tensorpipe) -+ - install(TARGETS tensorpipe -- EXPORT TensorpipeTargets -- LIBRARY DESTINATION ${TP_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${TP_INSTALL_LIBDIR}) -+ EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - foreach(_header_file ${TP_PUBLIC_HEADERS}) - get_filename_component(_TP_HEADER_SUBDIR "${_header_file}" DIRECTORY) diff --git a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake index b81a37c89..5598679b6 100644 --- a/external_imported/vcpkg/ports/tensorpipe/portfile.cmake +++ b/external_imported/vcpkg/ports/tensorpipe/portfile.cmake @@ -1,14 +1,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile(INSTALL_PACKAGE_CONFIG_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/pytorch/tensorpipe/pull/435.diff" + FILENAME tensorpipe-pr-435.patch + SHA512 7bcf604a967da36b8af936f8b8ab87b442834024b0b2cb886811c15e80893be842fbee2667bbbc39886814ec9b2f4ed0c2527de51fdb7dc293b25cce515f5e4b +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/tensorpipe - REF c5a21994bc766659f7f85edb75478e13f429f46c - SHA512 05a3989286610edea2f0fcfb9197c563e947f0386f2b52110dd060053d68b62477fcd4778a45a3030b9a53b6ceccead91e4dd96c9f0153023e97414459fbd8dd + REF 52791a2fd214b2a9dc5759d36725909c1daa7f2e + SHA512 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e PATCHES - fix-cmakelists.patch + "${INSTALL_PACKAGE_CONFIG_PATCH}" + use-vcpkg.patch support-test.patch - support-pybind11.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -25,7 +31,7 @@ if("pybind11" IN_LIST FEATURES) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DTP_ENABLE_SHM=${VCPKG_TARGET_IS_LINUX} @@ -33,12 +39,15 @@ vcpkg_cmake_configure( -DTP_ENABLE_CMA=OFF -DTP_BUILD_LIBUV=OFF # will use libuv package -DTP_ENABLE_CUDA_GDR=OFF + MAYBE_UNUSED_VARIABLES + TP_ENABLE_CUDA_GDR + TP_ENABLE_CUDA_IPC ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -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) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/external_imported/vcpkg/ports/tensorpipe/support-pybind11.patch b/external_imported/vcpkg/ports/tensorpipe/support-pybind11.patch deleted file mode 100644 index 7a87cd285..000000000 --- a/external_imported/vcpkg/ports/tensorpipe/support-pybind11.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt -index 41958dd..02562b4 100644 ---- a/tensorpipe/python/CMakeLists.txt -+++ b/tensorpipe/python/CMakeLists.txt -@@ -4,13 +4,17 @@ - # This source code is licensed under the BSD-style license found in the - # LICENSE file in the root directory of this source tree. - --if(NOT (COMMAND pybind11_add_module)) -- add_subdirectory( -- ${PROJECT_SOURCE_DIR}/third_party/pybind11 -- ${PROJECT_BINARY_DIR}/third_party/pybind11 -- EXCLUDE_FROM_ALL) --endif() -+find_package(pybind11 CONFIG REQUIRED) - --set(PYBIND11_CPP_STANDARD -std=c++14) - pybind11_add_module(pytensorpipe tensorpipe.cc) --target_link_libraries(pytensorpipe PRIVATE tensorpipe) -+set_target_properties(pytensorpipe -+PROPERTIES -+ CXX_STANDARD 14 -+) -+target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) -+ -+install(TARGETS pytensorpipe -+ EXPORT tensorpipeTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/external_imported/vcpkg/ports/tensorpipe/support-test.patch b/external_imported/vcpkg/ports/tensorpipe/support-test.patch index 16c54ab37..af1280485 100644 --- a/external_imported/vcpkg/ports/tensorpipe/support-test.patch +++ b/external_imported/vcpkg/ports/tensorpipe/support-test.patch @@ -1,39 +1,39 @@ diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index c0320aa..1414bdd 100644 +index 53e8643..c49ada6 100644 --- a/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt -@@ -86,11 +86,8 @@ if(TP_USE_CUDA) - endif() - - --add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest -- ${PROJECT_BINARY_DIR}/third_party/googletest) -+find_package(GTest CONFIG REQUIRED) - - target_link_libraries(tensorpipe_test PRIVATE - tensorpipe -- uv::uv -- gmock -- gtest_main) -+ unofficial::libuv::libuv GTest::gmock GTest::gtest_main) - -diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt -index fecc731..031e40d 100644 ---- a/tensorpipe/test/CMakeLists.txt -+++ b/tensorpipe/test/CMakeLists.txt -@@ -80,10 +80,11 @@ if(TP_USE_CUDA) +@@ -93,25 +93,24 @@ if(TP_USE_CUDA) channel/cuda_ipc/cuda_ipc_test.cc ) endif() - -- target_sources(tensorpipe_test PRIVATE +- list(APPEND TP_TEST_SRCS - channel/cuda_gdr/cuda_gdr_test.cc - ) +- + if(TP_ENABLE_CUDA_GDR) -+ target_sources(tensorpipe_test PRIVATE ++ list(APPEND TP_TEST_SRCS + channel/cuda_gdr/cuda_gdr_test.cc + ) + endif() + cuda_add_library(tensorpipe_cuda_kernel channel/kernel.cu) + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda_kernel) + + list(APPEND TP_TEST_LINK_LIBRARIES tensorpipe_cuda) endif() +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest +- ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) ++find_package(GTest CONFIG REQUIRED) + + list(APPEND TP_TEST_LINK_LIBRARIES + tensorpipe +- uv::uv +- gmock +- gtest_main) ++ unofficial::libuv::libuv ++ GTest::gmock ++ GTest::gtest_main) + + add_executable(tensorpipe_test ${TP_TEST_SRCS}) diff --git a/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch b/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch new file mode 100644 index 000000000..b69d01c18 --- /dev/null +++ b/external_imported/vcpkg/ports/tensorpipe/use-vcpkg.patch @@ -0,0 +1,52 @@ +diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt +index efcffc2..dd9bd16 100644 +--- a/tensorpipe/CMakeLists.txt ++++ b/tensorpipe/CMakeLists.txt +@@ -119,8 +119,12 @@ list(APPEND TP_PUBLIC_HDRS + transport/uv/utility.h) + + # Add uv package +-find_package(uv REQUIRED) +-list(APPEND TP_LINK_LIBRARIES uv::uv) ++find_package(libuv CONFIG REQUIRED) ++if (TARGET uv) ++list(APPEND TP_LINK_LIBRARIES uv) ++else() ++list(APPEND TP_LINK_LIBRARIES uv_a) ++endif() + + ### shm + +@@ -184,7 +188,8 @@ configure_file(config.h.in config.h) + # We should keep libnop headers private as they should not be exposed to downstream users, + # but they're currently transitively included by tensorpipe/transport/connection.h (which + # is still unclear whether it should be a public or private header). +-list(APPEND TP_INCLUDE_DIRS $) ++find_path(LIBNOP_INCLUDE_DIRS "nop/serializer.h" REQUIRED) ++list(APPEND TP_INCLUDE_DIRS $) + + + ## Target +diff --git a/tensorpipe/python/CMakeLists.txt b/tensorpipe/python/CMakeLists.txt +index b722381..688886a 100644 +--- a/tensorpipe/python/CMakeLists.txt ++++ b/tensorpipe/python/CMakeLists.txt +@@ -4,16 +4,11 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + +-if(NOT (COMMAND pybind11_add_module)) +- add_subdirectory( +- ${PROJECT_SOURCE_DIR}/third_party/pybind11 +- ${PROJECT_BINARY_DIR}/third_party/pybind11 +- EXCLUDE_FROM_ALL) +-endif() ++find_package(pybind11 CONFIG REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++14) + pybind11_add_module(pytensorpipe tensorpipe.cc) +-target_link_libraries(pytensorpipe PRIVATE tensorpipe) ++target_link_libraries(pytensorpipe PRIVATE tensorpipe pybind11::module) + + install(TARGETS pytensorpipe + EXPORT TensorpipeTargets diff --git a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json index 3ddcb1d5a..fb8fb8459 100644 --- a/external_imported/vcpkg/ports/tensorpipe/vcpkg.json +++ b/external_imported/vcpkg/ports/tensorpipe/vcpkg.json @@ -1,9 +1,10 @@ { "name": "tensorpipe", - "version-date": "2021-04-26", + "version-date": "2022-03-16", "port-version": 1, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", + "license": "BSD-3-Clause", "supports": "linux | osx", "dependencies": [ "libnop", diff --git a/external_imported/vcpkg/ports/termcolor/portfile.cmake b/external_imported/vcpkg/ports/termcolor/portfile.cmake index 5a781d65d..bde6d1390 100644 --- a/external_imported/vcpkg/ports/termcolor/portfile.cmake +++ b/external_imported/vcpkg/ports/termcolor/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ikalnytskyi/termcolor - REF 67eb0aa55e48ead9fe2aab049f0b1aa7943ba0ea #v2.0.0 - SHA512 c076f0acafa455fb3ed58bca5f0a0989dc3824e9b4f264fc5aa5b599068cc6551ccc2cfe1180a4ff0f8424e6adbfbbfeed50d395ab5f288b8c678cfa42e8fa17 + REF b3cb0f365f8435588df7a6b12a82b2ac5fc1fe95 #v2.1.0 + SHA512 8a95c654b68728a2258eba1c40daf0e5cc69ba24e15e839f75341a694a20a930c042820d68c661ca1971b68dcc93f895513dc73774818b94e205a3a73199b550 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${port}/ TARGET_PATH share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${port}/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/termcolor/vcpkg.json b/external_imported/vcpkg/ports/termcolor/vcpkg.json index 5ea5c349c..8ec81e13b 100644 --- a/external_imported/vcpkg/ports/termcolor/vcpkg.json +++ b/external_imported/vcpkg/ports/termcolor/vcpkg.json @@ -1,6 +1,17 @@ { "name": "termcolor", - "version-semver": "2.0.0", + "version": "2.1.0", "description": "Termcolor is a header-only C++ library for printing colored messages to the terminal.", - "homepage": "https://github.com/ikalnytskyi/termcolor" + "homepage": "https://github.com/ikalnytskyi/termcolor", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/tesseract/fix-depend-libarchive.patch b/external_imported/vcpkg/ports/tesseract/fix-depend-libarchive.patch new file mode 100644 index 000000000..5d510e16e --- /dev/null +++ b/external_imported/vcpkg/ports/tesseract/fix-depend-libarchive.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -792,7 +792,8 @@ if(OpenCL_FOUND) + target_link_libraries(libtesseract PUBLIC OpenCL::OpenCL) + endif() + if(LibArchive_FOUND) +- target_link_libraries(libtesseract PUBLIC ${LibArchive_LIBRARIES}) ++ find_package(LibArchive REQUIRED) ++ target_link_libraries(libtesseract PRIVATE LibArchive::LibArchive) + endif(LibArchive_FOUND) + if(CURL_FOUND) + if(NOT CURL_LIBRARIES) diff --git a/external_imported/vcpkg/ports/tesseract/fix-tiff-linkage.patch b/external_imported/vcpkg/ports/tesseract/fix-tiff-linkage.patch deleted file mode 100644 index f4720c022..000000000 --- a/external_imported/vcpkg/ports/tesseract/fix-tiff-linkage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f154663..c07b827 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ endif() - add_executable (tesseract ${tesseractmain_src} ${tesseractmain_rsc}) - target_link_libraries (tesseract libtesseract) - if (HAVE_TIFFIO_H) -- target_link_libraries(tesseract tiff) -+ target_link_libraries(tesseract TIFF::TIFF) - endif() - - if (OPENMP_BUILD AND UNIX) diff --git a/external_imported/vcpkg/ports/tesseract/fix-timeval.patch b/external_imported/vcpkg/ports/tesseract/fix-timeval.patch deleted file mode 100644 index 5a3274830..000000000 --- a/external_imported/vcpkg/ports/tesseract/fix-timeval.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..3755632 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,9 @@ - - #include - #include -+#ifndef _WIN32 -+#include -+#endif - #ifdef _WIN32 - #include // for timeval - #endif diff --git a/external_imported/vcpkg/ports/tesseract/portfile.cmake b/external_imported/vcpkg/ports/tesseract/portfile.cmake index 6978f5625..a30d57a38 100644 --- a/external_imported/vcpkg/ports/tesseract/portfile.cmake +++ b/external_imported/vcpkg/ports/tesseract/portfile.cmake @@ -1,11 +1,13 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(tesseract_patch fix-depend-libarchive.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract - REF 4.1.1 - SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 - PATCHES - fix-tiff-linkage.patch - fix-timeval.patch # Remove this patch in the next update + REF 5ad5325a0aa8effc47ca033625b6a51682f82767 #v5.2.0 + SHA512 c6ed442c9deb28772aeb918142dab08d5b55eeeeccb0c1d3f13cf51bb72af227afb7f14c19a5c8db40d6a7b8cfeccb3af08a78adfcd7431e4a06f65372709ceb + PATCHES ${tesseract_patch} ) # The built-in cmake FindICU is better @@ -30,29 +32,35 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DSTATIC=${BUILD_STATIC} -DUSE_SYSTEM_ICU=True - -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} + -DSW_BUILD=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_OpenCL + STATIC + TARGET_ARCHITECTURE ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tesseract) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" - "find_package(Leptonica REQUIRED)" + "find_dependency(Leptonica)" [[ -find_package(Leptonica REQUIRED) -find_package(LibArchive REQUIRED) +find_dependency(CURL) +find_dependency(Leptonica) +find_dependency(LibArchive) ]] ) vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract41" "-ltesseract41d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract52" "-ltesseract52d") endif() vcpkg_fixup_pkgconfig() @@ -68,6 +76,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tesseract/vcpkg.json b/external_imported/vcpkg/ports/tesseract/vcpkg.json index 6b2477d6b..ffc6df5eb 100644 --- a/external_imported/vcpkg/ports/tesseract/vcpkg.json +++ b/external_imported/vcpkg/ports/tesseract/vcpkg.json @@ -1,11 +1,13 @@ { "name": "tesseract", - "version": "4.1.1", - "port-version": 10, + "version": "5.2.0", + "port-version": 2, "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", - "supports": "!arm", + "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ + "curl", "leptonica", "libarchive", { diff --git a/external_imported/vcpkg/ports/tgui/devendor-stb.patch b/external_imported/vcpkg/ports/tgui/devendor-stb.patch new file mode 100644 index 000000000..d346b312f --- /dev/null +++ b/external_imported/vcpkg/ports/tgui/devendor-stb.patch @@ -0,0 +1,27 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ebabb8a..4a166dc 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,6 +173,9 @@ else() + set_target_properties(tgui PROPERTIES RELWITHDEBINFO_POSTFIX -s) + endif() + ++find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) ++target_include_directories(tgui PRIVATE "${STB_INCLUDE_DIR}") ++ + # Add the backend files to the library. + # Without the ability to call target_link_libraries in a subdirectory (which was only added in CMake 3.13 in policy CMP0079), + # the code would be more complicated when using add_subdirectory. So we just avoid creating a new scope by using include. +diff --git a/src/Loading/ImageLoader.cpp b/src/Loading/ImageLoader.cpp +index e3ec9c5..d2f691d 100644 +--- a/src/Loading/ImageLoader.cpp ++++ b/src/Loading/ImageLoader.cpp +@@ -45,7 +45,7 @@ + #define STB_IMAGE_STATIC + #define STBI_WINDOWS_UTF8 + #define STB_IMAGE_IMPLEMENTATION +-#include ++#include + + #if defined(__GNUC__) + #pragma GCC diagnostic pop diff --git a/external_imported/vcpkg/ports/tgui/fix-dependencies.patch b/external_imported/vcpkg/ports/tgui/fix-dependencies.patch index ad6b7107c..9432abbc1 100644 --- a/external_imported/vcpkg/ports/tgui/fix-dependencies.patch +++ b/external_imported/vcpkg/ports/tgui/fix-dependencies.patch @@ -1,27 +1,100 @@ +diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in +index 5b58350..c9398b7 100644 +--- a/cmake/TGUIConfig.cmake.in ++++ b/cmake/TGUIConfig.cmake.in +@@ -44,6 +44,28 @@ + # add_executable(myapp ...) + # target_link_libraries(myapp tgui) + ++include(CMakeFindDependencyMacro) ++if("@TGUI_HAS_BACKEND_SFML@") ++ find_dependency(SFML CONFIG COMPONENTS graphics) ++endif() ++if("@TGUI_HAS_BACKEND_SDL@") ++ find_dependency(SDL2 CONFIG) ++ find_dependency(SDL2_ttf CONFIG) ++ find_dependency(Threads) ++endif() ++if("@EXPORT_USE_OPENGL@") ++ cmake_policy(PUSH) ++ if (POLICY CMP0072) ++ cmake_policy(SET CMP0072 NEW) ++ endif() ++ find_package(OpenGL REQUIRED) ++ cmake_policy(POP) ++endif() ++if("@EXPORT_USE_THREADS@") ++ set(THREADS_PREFER_PTHREAD_FLAG ON) ++ find_package(Threads REQUIRED) ++endif() ++ + set(FIND_TGUI_PATHS + "${CMAKE_CURRENT_LIST_DIR}/../.." + ${TGUI_ROOT} +@@ -58,7 +80,7 @@ set(FIND_TGUI_PATHS + /opt) + + # Choose which target definitions must be imported +-if (TGUI_STATIC_LIBRARIES) ++if (NOT "@BUILD_SHARED_LIBS@") + set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") + if (TGUI_IS_FRAMEWORK_INSTALL) + message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ +@@ -77,7 +99,10 @@ if (EXISTS "${targets_config_file}") + include("${targets_config_file}") + + # Search for X11 on Linux and BSD +- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$" OR CMAKE_SYSTEM_NAME MATCHES "^OpenBSD$") ++ if(TARGET TGUI_X11) ++ find_dependency(X11) ++ set_property(TARGET TGUI_X11 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${TGUI_X11_LIB}") ++ elseif(0) + find_library(TGUI_X11_LIB NAMES X11 PATHS ${FIND_TGUI_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH) + mark_as_advanced(TGUI_X11_LIB) + if(TGUI_X11_LIB) diff --git a/src/Backends/SDL/CMakeLists.txt b/src/Backends/SDL/CMakeLists.txt -index d86f11d..1e31e21 100644 +index d86f11d..3f3f3ce 100644 --- a/src/Backends/SDL/CMakeLists.txt +++ b/src/Backends/SDL/CMakeLists.txt -@@ -1,10 +1,10 @@ - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules) - --find_package(SDL2 REQUIRED) --find_package(SDL2_ttf REQUIRED) -+find_package(SDL2 CONFIG REQUIRED) -+find_package(sdl2-ttf CONFIG REQUIRED) +@@ -4,7 +4,11 @@ find_package(SDL2 REQUIRED) + find_package(SDL2_ttf REQUIRED) # Link to SDL and set include and library search directories -target_link_libraries(tgui PRIVATE SDL2::Core SDL2::TTF) -+target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2::SDL2_ttf) ++if(TARGET SDL2_ttf::SDL2_ttf) ++ target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf) ++else() ++ target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static) ++endif() # Add the backend source files to the library target_sources(tgui PRIVATE -@@ -19,7 +19,7 @@ target_sources(tgui PRIVATE +@@ -19,10 +23,15 @@ target_sources(tgui PRIVATE ) add_library(tgui-sdl-interface INTERFACE) -target_link_libraries(tgui-sdl-interface INTERFACE SDL2::Core SDL2::TTF SDL2::Main) -+target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2::SDL2_ttf SDL2::SDL2main) ++if(TARGET SDL2_ttf::SDL2_ttf) ++ target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf SDL2::SDL2main) ++else() ++ target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static SDL2::SDL2main) ++endif() # Also link to OpenGL or OpenGL ES if(NOT TGUI_USE_GLES) ++ set(EXPORT_USE_OPENGL 1 CACHE INTERNAL "") + find_package(OpenGL REQUIRED) + target_link_libraries(tgui PRIVATE OpenGL::GL) + target_link_libraries(tgui-sdl-interface INTERFACE OpenGL::GL) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a166dc..a53b58f 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -213,6 +213,7 @@ if(TGUI_OS_LINUX OR TGUI_OS_BSD) + target_link_libraries(tgui PRIVATE TGUI_X11) + + # For the FileDialog we need to link to pthreads and dl on Linux and BSD (to load system icons in the background) ++ set(EXPORT_USE_THREADS 1 CACHE INTERNAL "") + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(tgui PRIVATE Threads::Threads) diff --git a/external_imported/vcpkg/ports/tgui/fix-usage.patch b/external_imported/vcpkg/ports/tgui/fix-usage.patch deleted file mode 100644 index cbc43b4e7..000000000 --- a/external_imported/vcpkg/ports/tgui/fix-usage.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in -index 63e8a45..01804cd 100644 ---- a/cmake/TGUIConfig.cmake.in -+++ b/cmake/TGUIConfig.cmake.in -@@ -44,6 +44,9 @@ - # add_executable(myapp ...) - # target_link_libraries(myapp tgui) - -+include(CMakeFindDependencyMacro) -+find_dependency(SFML COMPONENTS graphics CONFIG) -+ - set(FIND_TGUI_PATHS - "${CMAKE_CURRENT_LIST_DIR}/../.." - ${TGUI_ROOT} -@@ -58,7 +61,7 @@ set(FIND_TGUI_PATHS - /opt) - - # Choose which target definitions must be imported --if (TGUI_STATIC_LIBRARIES) -+if (NOT @TGUI_SHARED_LIBS@) - set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") - if (TGUI_IS_FRAMEWORK_INSTALL) - message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ diff --git a/external_imported/vcpkg/ports/tgui/portfile.cmake b/external_imported/vcpkg/ports/tgui/portfile.cmake index fc5fa414f..4ec9efbaa 100644 --- a/external_imported/vcpkg/ports/tgui/portfile.cmake +++ b/external_imported/vcpkg/ports/tgui/portfile.cmake @@ -1,3 +1,13 @@ +if(NOT "sdl2" IN_LIST FEATURES AND NOT "sfml" IN_LIST FEATURES) + message(FATAL_ERROR "At least one of the backend features must be selected: sdl2 sfml") +endif() + +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +elseif(VCPKG_TARGET_IS_IOS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO texus/TGUI @@ -5,16 +15,17 @@ vcpkg_from_github( SHA512 109e64c114336979a4bd0d44765e4bc26cb4ecb6e4db92d7441230d148438b084d01cb56dd292f09a6fd28b0f7420044455ffb519147cc3aea71e322142cd9a0 HEAD_REF 0.9 PATCHES - fix-usage.patch fix-dependencies.patch + devendor-stb.patch ) -set(TGUI_SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/tgui) -set(TGUI_TOOLS_PATH ${CURRENT_PACKAGES_DIR}/tools/tgui) +file(REMOVE_RECURSE "${SOURCE_PATH}/src/Backends/SDL/cmake_modules") # Config available +file(REMOVE_RECURSE "${SOURCE_PATH}/include/TGUI/extlibs/stb") -# Enable static build -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" TGUI_SHARED_LIBS) +set(TGUI_SHARE_PATH "${CURRENT_PACKAGES_DIR}/share/${PORT}") +set(TGUI_TOOLS_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" TGUI_USE_STATIC_STD_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -26,11 +37,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} - -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH} - -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS} + OPTIONS + ${FEATURE_OPTIONS} + "-DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH}" + "-DCMAKE_INSTALL_DOCDIR=${TGUI_SHARE_PATH}" + -DTGUI_USE_STATIC_STD_LIBS=${TGUI_USE_STATIC_STD_LIBS} -DTGUI_BACKEND=Custom - -DTGUI_BUILD_EXAMPLES=OFF + -DTGUI_BUILD_DOC=OFF + -DTGUI_BUILD_FRAMEWORK=OFF + -DTGUI_INSTALL_PKGCONFIG_FILES=OFF + OPTIONS_DEBUG + -DTGUI_BUILD_GUI_BUILDER=OFF + MAYBE_UNUSED_VARIABLES + TGUI_BUILD_FRAMEWORK ) vcpkg_cmake_install() @@ -52,14 +71,13 @@ if("tool" IN_LIST FEATURES) endif() endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/glad" - "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/stb" -) # All folders are empty - -file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc") - -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # Empty folders + "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" + "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/glad" +) -# Handle copyright -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}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/external_imported/vcpkg/ports/tgui/usage b/external_imported/vcpkg/ports/tgui/usage new file mode 100644 index 000000000..af9c2504c --- /dev/null +++ b/external_imported/vcpkg/ports/tgui/usage @@ -0,0 +1,4 @@ +tgui provides CMake targets: + + find_package(TGUI CONFIG REQUIRED) + target_link_libraries(main PRIVATE tgui) diff --git a/external_imported/vcpkg/ports/tgui/vcpkg.json b/external_imported/vcpkg/ports/tgui/vcpkg.json index 2dce59186..b7bba45c8 100644 --- a/external_imported/vcpkg/ports/tgui/vcpkg.json +++ b/external_imported/vcpkg/ports/tgui/vcpkg.json @@ -1,11 +1,12 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 3, + "port-version": 4, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "license": "Zlib", "dependencies": [ + "stb", { "name": "vcpkg-cmake", "host": true @@ -16,46 +17,28 @@ } ], "default-features": [ - "sdl2", "sfml" ], "features": { "sdl2": { - "description": "build the SDL backend", + "description": "Build the SDL backend", "dependencies": [ + { + "name": "opengl", + "platform": "!android & !ios" + }, "sdl2", "sdl2-ttf" ] }, "sfml": { - "description": "build the SFML backend", + "description": "Build the SFML backend", "dependencies": [ - { - "name": "glad", - "features": [ - "egl" - ], - "platform": "!android & !ios" - }, - { - "name": "opengl", - "platform": "android | ios" - }, - "sfml", - "stb" + "sfml" ] }, "tool": { - "description": "Build GUI builder", - "dependencies": [ - { - "name": "tgui", - "features": [ - "sdl2", - "sfml" - ] - } - ] + "description": "Build GUI builder" } } } diff --git a/external_imported/vcpkg/ports/theia/fix-external-dependencies.patch b/external_imported/vcpkg/ports/theia/fix-external-dependencies.patch index fc6e540f3..812aad431 100644 --- a/external_imported/vcpkg/ports/theia/fix-external-dependencies.patch +++ b/external_imported/vcpkg/ports/theia/fix-external-dependencies.patch @@ -158,7 +158,7 @@ index 9c1b150..1adbfed 100644 # This "exports" all targets which have been put into the export set # "TheiaExport". This means that CMake generates a file with the given -@@ -319,9 +270,5 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" +@@ -319,9 +270,4 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" # in the public API of Theia and should thus be present in THEIA_INCLUDE_DIRS. install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" @@ -167,7 +167,6 @@ index 9c1b150..1adbfed 100644 - "${CMAKE_SOURCE_DIR}/cmake/FindGflags.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindSuiteSparse.cmake" -+ "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in index a3ea187..7e9d912 100644 diff --git a/external_imported/vcpkg/ports/theia/portfile.cmake b/external_imported/vcpkg/ports/theia/portfile.cmake index c68a4a685..07f96f050 100644 --- a/external_imported/vcpkg/ports/theia/portfile.cmake +++ b/external_imported/vcpkg/ports/theia/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( ) file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindOpenImageIO.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) diff --git a/external_imported/vcpkg/ports/theia/vcpkg.json b/external_imported/vcpkg/ports/theia/vcpkg.json index c02f1aecd..a5105373c 100644 --- a/external_imported/vcpkg/ports/theia/vcpkg.json +++ b/external_imported/vcpkg/ports/theia/vcpkg.json @@ -1,9 +1,10 @@ { "name": "theia", - "version-string": "0.8", - "port-version": 6, + "version": "0.8", + "port-version": 7, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", + "license": "BSD-3-Clause", "dependencies": [ "cereal", { diff --git a/external_imported/vcpkg/ports/thor/portfile.cmake b/external_imported/vcpkg/ports/thor/portfile.cmake index 8371f1613..c45ca4297 100644 --- a/external_imported/vcpkg/ports/thor/portfile.cmake +++ b/external_imported/vcpkg/ports/thor/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Bromeon/Thor REF v2.0 @@ -6,24 +6,23 @@ vcpkg_from_github(ARCHIVE HEAD_REF master PATCHES fix-dependency-sfml.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") -file(REMOVE_RECURSE ${SOURCE_PATH}/extlibs) -file(COPY ${CURRENT_INSTALLED_DIR}/include/Aurora DESTINATION ${SOURCE_PATH}/extlibs/aurora/include) +file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") +file(COPY "${CURRENT_INSTALLED_DIR}/include/Aurora" DESTINATION "${SOURCE_PATH}/extlibs/aurora/include") file(WRITE "${SOURCE_PATH}/extlibs/aurora/License.txt") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" THOR_STATIC_STD_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" THOR_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS} -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -48,10 +47,10 @@ if(LICENSE) file(REMOVE ${LICENSE}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/Aurora) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/Aurora") if(NOT VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -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/external_imported/vcpkg/ports/thor/vcpkg.json b/external_imported/vcpkg/ports/thor/vcpkg.json index 3b1c3cfee..513787366 100644 --- a/external_imported/vcpkg/ports/thor/vcpkg.json +++ b/external_imported/vcpkg/ports/thor/vcpkg.json @@ -1,11 +1,16 @@ { "name": "thor", "version": "2.0", - "port-version": 4, + "port-version": 6, "description": "Extends the multimedia library SFML with higher-level features", - "homepage": "www.bromeon.ch/libraries/thor", + "homepage": "https://bromeon.ch/libraries/thor/", + "license": "Zlib", "dependencies": [ "aurora", - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/thrift/pc-suffix.patch b/external_imported/vcpkg/ports/thrift/pc-suffix.patch new file mode 100644 index 000000000..8fb0dc6da --- /dev/null +++ b/external_imported/vcpkg/ports/thrift/pc-suffix.patch @@ -0,0 +1,44 @@ +diff --git a/lib/cpp/thrift-nb.pc.in b/lib/cpp/thrift-nb.pc.in +index 2c6a96973..e99eff2bc 100644 +--- a/lib/cpp/thrift-nb.pc.in ++++ b/lib/cpp/thrift-nb.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Nonblocking API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftnb ++Libs: -L${libdir} -lthriftnb@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-qt5.pc.in b/lib/cpp/thrift-qt5.pc.in +index a8b16663e..2720bea79 100644 +--- a/lib/cpp/thrift-qt5.pc.in ++++ b/lib/cpp/thrift-qt5.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Qt5 API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftqt5 ++Libs: -L${libdir} -lthriftqt5@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift-z.pc.in b/lib/cpp/thrift-z.pc.in +index 467d2e11c..cde44158a 100644 +--- a/lib/cpp/thrift-z.pc.in ++++ b/lib/cpp/thrift-z.pc.in +@@ -26,5 +26,5 @@ Name: Thrift + Description: Thrift Zlib API + Version: @VERSION@ + Requires: thrift = @VERSION@ +-Libs: -L${libdir} -lthriftz ++Libs: -L${libdir} -lthriftz@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} +diff --git a/lib/cpp/thrift.pc.in b/lib/cpp/thrift.pc.in +index d11e6db29..77da61c3e 100644 +--- a/lib/cpp/thrift.pc.in ++++ b/lib/cpp/thrift.pc.in +@@ -25,5 +25,5 @@ includedir=@includedir@ + Name: Thrift + Description: Thrift C++ API + Version: @VERSION@ +-Libs: -L${libdir} -lthrift ++Libs: -L${libdir} -lthrift@THRIFT_RUNTIME_POSTFIX@ + Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/thrift/portfile.cmake b/external_imported/vcpkg/ports/thrift/portfile.cmake index f2b42b530..f9f2b70f0 100644 --- a/external_imported/vcpkg/ports/thrift/portfile.cmake +++ b/external_imported/vcpkg/ports/thrift/portfile.cmake @@ -2,7 +2,9 @@ # - Thrift doesn't yet support building as a DLL on Windows, # - x64-linux only builds static anyway. # From https://github.com/apache/thrift/blob/master/CHANGES.md -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_find_acquire_program(FLEX) vcpkg_find_acquire_program(BISON) @@ -10,11 +12,12 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF cecee50308fc7e6f77f55b3fd906c1c6c471fa2f #0.13.0 - SHA512 4097fd7951a4d47f2fadc520a54fd1b91b10769d65e899c6bab490dd7ac459e12bb2aa335df8fdfc61a32095033bfac928a54660abb1ee54ca14a144216c3339 + REF 2a93df80f27739ccabb5b885cb12a8dc7595ecdf #0.16.0 + SHA512 aed4f60b8a4eca5b4bce26f6f29d1178684d2b4e6de290ab1e696ac78a9f85d941afe5dca99d1d22d640371ad538b930cf445f9f899a2e322f39b0cceec307a3 HEAD_REF master PATCHES "correct-paths.patch" + "pc-suffix.patch" ) if (VCPKG_TARGET_IS_OSX) @@ -22,53 +25,69 @@ if (VCPKG_TARGET_IS_OSX) please use command \`brew install bison\` to install bison") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" shared_lib) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" static_lib) + # note we specify values for WITH_STATIC_LIB and WITH_SHARED_LIB because even though # they're marked as deprecated, Thrift incorrectly hard-codes a value for BUILD_SHARED_LIBS. -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS - -DWITH_SHARED_LIB=off - -DWITH_STATIC_LIB=on - -DWITH_STDTHREADS=ON - -DBUILD_TESTING=off - -DBUILD_JAVA=off - -DBUILD_C_GLIB=off - -DBUILD_PYTHON=off - -DBUILD_CPP=on - -DBUILD_HASKELL=off - -DBUILD_TUTORIALS=off + --trace-expand + -DLIB_INSTALL_DIR:PATH=lib + -DWITH_SHARED_LIB=${shared_lib} + -DWITH_STATIC_LIB=${static_lib} + -DBUILD_TESTING=OFF + -DBUILD_JAVA=OFF + -DWITH_C_GLIB=OFF + -DBUILD_C_GLIB=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE + -DBUILD_PYTHON=OFF + -DBUILD_CPP=ON + -DWITH_CPP=ON + -DWITH_ZLIB=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_ZLIB=TRUE + -DWITH_LIBEVENT=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_Libevent=TRUE + -DWITH_OPENSSL=ON + -DCMAKE_FIND_PACKAGE_REQUIRE_OpenSSL=TRUE + -DBUILD_TUTORIALS=OFF -DFLEX_EXECUTABLE=${FLEX} + -DWITH_QT5=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Gradle=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_Java=TRUE + -DBUILD_JAVASCRIPT=OFF + -DBUILD_NODEJS=OFF -DBISON_EXECUTABLE=${BISON} + 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 + ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/thrift) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift" "${CURRENT_PACKAGES_DIR}/bin/thrift.exe") if(COMPILER) - file(COPY ${COMPILER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/thrift) - file(REMOVE ${COMPILER}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/thrift) + vcpkg_copy_tools(TOOL_NAMES thrift AUTO_CLEAN) endif() -file(GLOB COMPILERD "${CURRENT_PACKAGES_DIR}/debug/bin/thrift" "${CURRENT_PACKAGES_DIR}/debug/bin/thrift.exe") -if(COMPILERD) - file(REMOVE ${COMPILERD}) -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") endif() -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) diff --git a/external_imported/vcpkg/ports/thrift/vcpkg.json b/external_imported/vcpkg/ports/thrift/vcpkg.json index df0a2a109..5b556459a 100644 --- a/external_imported/vcpkg/ports/thrift/vcpkg.json +++ b/external_imported/vcpkg/ports/thrift/vcpkg.json @@ -1,9 +1,9 @@ { "name": "thrift", - "version-string": "0.13.0", - "port-version": 2, + "version": "0.16.0", "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", "dependencies": [ "boost-date-time", "boost-locale", @@ -12,6 +12,14 @@ "boost-smart-ptr", "libevent", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/external_imported/vcpkg/ports/tidy-html5/debug-postfix.patch b/external_imported/vcpkg/ports/tidy-html5/debug-postfix.patch new file mode 100644 index 000000000..2c882f09a --- /dev/null +++ b/external_imported/vcpkg/ports/tidy-html5/debug-postfix.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 979ae25..4eb88a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -210,7 +210,9 @@ if(WIN32 AND MSVC) + set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" ) + + # to distinguish between debug and release lib in windows ++ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set( CMAKE_DEBUG_POSTFIX "d" ) # little effect in unix ++ endif() + else() + # add any gcc flags + endif() +diff --git a/tidy.pc.cmake.in b/tidy.pc.cmake.in +index 7d819f1..cbdd299 100644 +--- a/tidy.pc.cmake.in ++++ b/tidy.pc.cmake.in +@@ -7,5 +7,5 @@ Name: @LIB_NAME@ + Description: @LIBTIDY_DESCRIPTION@ + URL: @LIBTIDY_URL@ + Version: @LIBTIDY_VERSION@ +-Libs: -L${libdir} -l@LIB_NAME@ ++Libs: -L${libdir} -l@LIB_NAME@@CMAKE_DEBUG_POSTFIX@ + Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/tidy-html5/disable-doc.patch b/external_imported/vcpkg/ports/tidy-html5/disable-doc.patch new file mode 100644 index 000000000..105c76685 --- /dev/null +++ b/external_imported/vcpkg/ports/tidy-html5/disable-doc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8efec25..d2edac2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -508,7 +508,7 @@ endif () + # Create man pages + ################################################# + +-if (UNIX AND SUPPORT_CONSOLE_APP) ++if (0) + find_program( XSLTPROC_FOUND xsltproc ) + if (XSLTPROC_FOUND) + ## NOTE: man name must match exe ie currently `${LIB_NAME}.1` not `tidy.1` diff --git a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake index 350d98859..504e94807 100644 --- a/external_imported/vcpkg/ports/tidy-html5/portfile.cmake +++ b/external_imported/vcpkg/ports/tidy-html5/portfile.cmake @@ -1,35 +1,32 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO htacg/tidy-html5 - REF d1b906991a7587688d384b648c55731f9be52506 - SHA512 ac1229f95db9ab6367d7650e27b87e76a0874e01c9d404e8c5fb75ba2761318218b658a4f7522188fda8008974393a333a8a5fbed8e3a472c98445f13e459ad5 + REF 5.8.0 + SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44 HEAD_REF master + PATCHES + disable-doc.patch + static-vs-shared.patch + debug-postfix.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS - -DBUILD_SHARED_LIB=OFF - -DTIDY_CONSOLE_SHARED=OFF + -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB} + -DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB} ) -vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin") vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd${VCPKG_TARGET_EXECUTABLE_SUFFIX}" +) vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_fixup_pkgconfig() diff --git a/external_imported/vcpkg/ports/tidy-html5/static-vs-shared.patch b/external_imported/vcpkg/ports/tidy-html5/static-vs-shared.patch new file mode 100644 index 000000000..92b6c8e92 --- /dev/null +++ b/external_imported/vcpkg/ports/tidy-html5/static-vs-shared.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2edac2..979ae25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,11 +395,11 @@ endif () + + #------------------------------------------------------------------------ + # Static Library +-# The static library always builds. ++if(NOT BUILD_SHARED_LIB) + #------------------------------------------------------------------------ + set(name tidy-static) + add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) +-if (WIN32) ++if (0) + set_target_properties( ${name} PROPERTIES + OUTPUT_NAME ${LIB_NAME}_static ) + else () +@@ -415,12 +415,14 @@ install(TARGETS ${name} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ) +-install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) + if(MSVC) + # install(FILES $ DESTINATION lib OPTIONAL) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${name}.dir/Debug/${name}.pdb ++ OPTIONAL + DESTINATION lib CONFIGURATIONS Debug ) + endif() ++endif() ++install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) + + #------------------------------------------------------------------------ + # Dynamic Library diff --git a/external_imported/vcpkg/ports/tidy-html5/vcpkg.json b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json index 1c16d8657..ecbe011c3 100644 --- a/external_imported/vcpkg/ports/tidy-html5/vcpkg.json +++ b/external_imported/vcpkg/ports/tidy-html5/vcpkg.json @@ -1,15 +1,10 @@ { "name": "tidy-html5", - "version": "5.7.28", - "port-version": 5, + "version": "5.8.0", "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", - "homepage": "https://github.com/htacg/tidy-html5", + "homepage": "https://www.html-tidy.org", "license": null, "dependencies": [ - { - "name": "libxslt", - "host": true - }, { "name": "vcpkg-cmake", "host": true diff --git a/external_imported/vcpkg/ports/tiff/android-libm.patch b/external_imported/vcpkg/ports/tiff/android-libm.patch new file mode 100644 index 000000000..16e63feb1 --- /dev/null +++ b/external_imported/vcpkg/ports/tiff/android-libm.patch @@ -0,0 +1,14 @@ +diff --color -Naur v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake +--- v4.4.0-1eba4caf45.clean/cmake/FindCMath.cmake 2022-06-09 13:28:09.894347027 +0200 ++++ v4.4.0-1eba4caf45.patched/cmake/FindCMath.cmake 2022-06-09 13:29:36.220230025 +0200 +@@ -31,8 +31,9 @@ + include(CheckLibraryExists) + + check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW) ++find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) ++ + if(NOT CMath_HAVE_LIBC_POW) +- find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + + set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY}) diff --git a/external_imported/vcpkg/ports/tiff/cmakelists.patch b/external_imported/vcpkg/ports/tiff/cmakelists.patch index 67c953714..0e244a09b 100644 --- a/external_imported/vcpkg/ports/tiff/cmakelists.patch +++ b/external_imported/vcpkg/ports/tiff/cmakelists.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dddbaf6..ee57b7b 100644 +index 770b0fac..df44e99e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -133,16 +133,28 @@ find_package(CMath REQUIRED) +@@ -131,16 +131,28 @@ find_package(CMath REQUIRED) # Release support include(Release) @@ -29,30 +29,30 @@ index dddbaf6..ee57b7b 100644 add_subdirectory(html) +endif() - - message(STATUS "") + # pkg-config support + include(PkgConfig) diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index 90105b2..db5f140 100755 +index b6b31677..5c21e29f 100755 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt -@@ -161,7 +161,7 @@ if(CXX_SUPPORT) +@@ -189,7 +189,7 @@ if(CXX_SUPPORT) set(tiffxx_HEADERS tiffio.hxx) -- add_library(tiffxx) -+ add_library(tiffxx STATIC) +- add_library(tiffxx ../placeholder.h) ++ add_library(tiffxx STATIC ../placeholder.h) target_sources(tiffxx PRIVATE ${tiffxx_HEADERS} tif_stream.cxx) -@@ -189,6 +189,7 @@ if(CXX_SUPPORT) +@@ -217,6 +217,7 @@ if(CXX_SUPPORT) endif() +if(NOT CMAKE_CROSSCOMPILING) - add_executable(mkg3states) + add_executable(mkg3states ../placeholder.h) target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h) target_link_libraries(mkg3states tiff port) -@@ -198,3 +199,4 @@ add_custom_target(faxtable +@@ -226,3 +227,4 @@ add_custom_target(faxtable COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c" COMMAND mkg3states -b -c const "tif_fax3sm.c" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch b/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch deleted file mode 100644 index f5bcdec3e..000000000 --- a/external_imported/vcpkg/ports/tiff/fix-pkgconfig.patch +++ /dev/null @@ -1,104 +0,0 @@ -From f337e19d0d0564b1b000ecd5dfbefed6c37f4d5b Mon Sep 17 00:00:00 2001 -From: Matthias Kuhn -Date: Tue, 21 Dec 2021 07:57:09 +0000 -Subject: [PATCH] Fix pkgconfig - ---- - CMakeLists.txt | 4 ++-- - libtiff-4.pc.in | 3 ++- - libtiff/CMakeLists.txt | 19 +++++++++++++++++++ - 3 files changed, 23 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2188f97..93e6a34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,8 +124,6 @@ include(WindowsSupport) - # Orthogonal features - include(LibraryFeatures) - --# pkg-config support --include(PkgConfig) - - # math.h/libm portability - find_package(CMath REQUIRED) -@@ -156,6 +154,8 @@ add_subdirectory(man) - add_subdirectory(html) - endif() - -+# pkg-config support -+include(PkgConfig) - - message(STATUS "") - message(STATUS "Libtiff is now configured for ${CMAKE_SYSTEM}") -diff --git a/libtiff-4.pc.in b/libtiff-4.pc.in -index abe75a6..8899725 100644 ---- a/libtiff-4.pc.in -+++ b/libtiff-4.pc.in -@@ -5,7 +5,8 @@ includedir=@includedir@ - - Name: libtiff - Description: Tag Image File Format (TIFF) library. --Version: @VERSION@ -+Version: @LIBTIFF_VERSION_FULL@ - Libs: -L${libdir} -ltiff - Libs.private: @tiff_libs_private@ - Cflags: -I${includedir} -+Requires.private: @tiff_requires_private@ -diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index db5f140..32721ec 100755 ---- a/libtiff/CMakeLists.txt -+++ b/libtiff/CMakeLists.txt -@@ -106,14 +106,19 @@ target_include_directories(tiff - ${TIFF_INCLUDES} - ) - -+set(tiff_libs_private "") -+set(tiff_requires_private "") -+ - if(ZIP_SUPPORT) - target_link_libraries(tiff PRIVATE ZLIB::ZLIB) -+ string(APPEND tiff_requires_private " zlib") - endif() - if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT) - target_link_libraries(tiff PRIVATE Deflate::Deflate) - endif() - if(JPEG_SUPPORT) - target_link_libraries(tiff PRIVATE JPEG::JPEG) -+ string(APPEND tiff_requires_private " libjpeg") - if(JPEG_DUAL_MODE_8_12) - target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR}) - target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES}) -@@ -127,15 +132,29 @@ if(LERC_SUPPORT) - endif() - if(LZMA_SUPPORT) - target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA) -+ string(APPEND tiff_requires_private " liblzma") - endif() - if(ZSTD_SUPPORT) - target_link_libraries(tiff PRIVATE ZSTD::ZSTD) -+ string(APPEND tiff_requires_private " libzstd") - endif() - if(WEBP_SUPPORT) - target_link_libraries(tiff PRIVATE WebP::WebP) -+ string(APPEND tiff_requires_private " libwebp") - endif() - target_link_libraries(tiff PRIVATE CMath::CMath) - -+include(CheckLibraryExists) -+ -+CHECK_LIBRARY_EXISTS(m sin "" HAVE_LIB_M) -+ -+if (HAVE_LIB_M) -+ string(APPEND tiff_libs_private " -lm") -+endif() -+ -+set(tiff_libs_private "${tiff_libs_private}" PARENT_SCOPE) -+set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE) -+ - set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION}) - if(NOT CYGWIN) - # This property causes shared libraries on Linux to have the full version --- -2.25.1 - diff --git a/external_imported/vcpkg/ports/tiff/portfile.cmake b/external_imported/vcpkg/ports/tiff/portfile.cmake index c8d53313f..c974e9de9 100644 --- a/external_imported/vcpkg/ports/tiff/portfile.cmake +++ b/external_imported/vcpkg/ports/tiff/portfile.cmake @@ -1,15 +1,16 @@ -set(LIBTIFF_VERSION 4.3.0) +set(LIBTIFF_VERSION 4.4.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF v${LIBTIFF_VERSION} - SHA512 eaa2503dc1805283e0590b06e3e660a793fe849ae8b975b2d69369695d65a40640787c156574faaca856917be799eeb844e60f55555e1f219dd513cef66ea95d + SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7 HEAD_REF master - PATCHES cmakelists.patch - fix-pkgconfig.patch - FindCMath.patch + PATCHES + cmakelists.patch + FindCMath.patch + android-libm.patch ) set(EXTRA_OPTIONS "") @@ -36,17 +37,20 @@ vcpkg_cmake_configure( -DBUILD_DOCS=OFF -DBUILD_CONTRIB=OFF -DBUILD_TESTS=OFF - -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. -Dlibdeflate=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF -Dlerc=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc") if(EXISTS "${_file}") vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd") diff --git a/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 40b159093..1acf30fad 100644 --- a/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/external_imported/vcpkg/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -17,7 +17,7 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(@webp@) find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) - list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) + list(APPEND z_vcpkg_tiff_libraries ${WebP_LIBRARIES}) endif() if(@lzma@) find_package(LibLZMA ${z_vcpkg_tiff_find_options}) diff --git a/external_imported/vcpkg/ports/tiff/vcpkg.json b/external_imported/vcpkg/ports/tiff/vcpkg.json index 59f4c26e8..5160ce19b 100644 --- a/external_imported/vcpkg/ports/tiff/vcpkg.json +++ b/external_imported/vcpkg/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", - "version": "4.3.0", - "port-version": 6, + "version": "4.4.0", + "port-version": 1, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, @@ -9,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/external_imported/vcpkg/ports/tinydir/portfile.cmake b/external_imported/vcpkg/ports/tinydir/portfile.cmake index b5e5647bc..6f5204fe1 100644 --- a/external_imported/vcpkg/ports/tinydir/portfile.cmake +++ b/external_imported/vcpkg/ports/tinydir/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cxong/tinydir - REF 1.2.4 - SHA512 476b81a089d378152c2ab644b88fe860f4a6dba9594ef5c2ae138487cb54b8f6da5538c114463619043f694b992e2de5fec925bd746f8e7fd341ebcdcaac98c0 + REF 1.2.5 + SHA512 d86a8709b92c9b6847bd85b4b307a411edf30156a06557641a051f74a7c19898451616772ee53ad2d8fc6c2ea2285c4c4edf2197f36cf48ede6d539d24ebb2cf HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/tinydir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinydir RENAME copyright) -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/tinydir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tinydir" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tinydir/vcpkg.json b/external_imported/vcpkg/ports/tinydir/vcpkg.json index 7326cdd20..037891565 100644 --- a/external_imported/vcpkg/ports/tinydir/vcpkg.json +++ b/external_imported/vcpkg/ports/tinydir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinydir", - "version-string": "1.2.4", - "port-version": 1, + "version": "1.2.5", "description": "Lightweight, portable and easy to integrate C directory and file reader", - "homepage": "https://github.com/cxong/tinydir" + "homepage": "https://github.com/cxong/tinydir", + "license": "BSD-2-Clause" } diff --git a/external_imported/vcpkg/ports/tinyobjloader/portfile.cmake b/external_imported/vcpkg/ports/tinyobjloader/portfile.cmake index 224947e5b..c513670e9 100644 --- a/external_imported/vcpkg/ports/tinyobjloader/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyobjloader/portfile.cmake @@ -3,28 +3,33 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyobjloader - REF v2.0.0-rc2 - SHA512 936f7897a87fe00d474231ad5f69816da127f14296c3591144c26c6058bd11ea1490c2db6b8c4a8adf629ae148423705d0c4020f4ed034921f0f2f711498f3bb + REF v2.0.0rc9 + SHA512 e188d6077cb19f9044da9c98c2c4284cad09f4ee745f4746d0df5b22a379d3b32fe20aa998151d6dc08e7f113f50abf80a7509d63c36de46547ce43b5fe1fa54 HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - double TINYOBJLOADER_USE_DOUBLE + FEATURES + double TINYOBJLOADER_USE_DOUBLE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DCMAKE_INSTALL_DOCDIR:STRING=share/tinyobjloader # FEATURES ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/tinyobjloader/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/tinyobjloader/cmake) +if("double" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tiny_obj_loader.h" "#ifdef TINYOBJLOADER_USE_DOUBLE" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/tiny_obj_loader.h" "#ifdef TINYOBJLOADER_USE_DOUBLE" "#if 0") +endif() file( REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/external_imported/vcpkg/ports/tinyobjloader/vcpkg.json b/external_imported/vcpkg/ports/tinyobjloader/vcpkg.json index 30bd1bb6f..a37b24903 100644 --- a/external_imported/vcpkg/ports/tinyobjloader/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyobjloader/vcpkg.json @@ -1,8 +1,18 @@ { "name": "tinyobjloader", - "version-string": "2.0.0-rc2", - "port-version": 2, + "version": "2.0.0-rc9", "description": "Tiny but powerful single file wavefront obj loader", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "double": { "description": "enable double(64bit) precision" diff --git a/external_imported/vcpkg/ports/tinyspline/portfile.cmake b/external_imported/vcpkg/ports/tinyspline/portfile.cmake index 6e0772d87..3d6dc3453 100644 --- a/external_imported/vcpkg/ports/tinyspline/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyspline/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msteinbeck/tinyspline - REF v0.3.0 - SHA512 9B02ACA5C56341E8DDC057E2AEB78632695DAC3A4D2C628A43028E4216FC79942F68DD3105B1B92ACAE0D009109C56EC437AB638FB7334EBDD68543BE2D8D7F6 + REF v0.4.0 + SHA512 45c3e6937c0c48c3a6953cea26f31a0217a3943f5bca3b4432010b615d30d7e46081625409917a15cf88d671c1c0e0c9c3e61a65a81c842a9a36c2acd8fc6c26 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/tinyspline/vcpkg.json b/external_imported/vcpkg/ports/tinyspline/vcpkg.json index 03f32869a..0cb155e92 100644 --- a/external_imported/vcpkg/ports/tinyspline/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyspline/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tinyspline", - "version": "0.3.0", - "port-version": 1, + "version": "0.4.0", "description": "Library for NURBS, B-Splines, and Bézier curves, allowing you to handle splines with ease", "homepage": "https://github.com/msteinbeck/tinyspline", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/tinyutf8/fixbuild.patch b/external_imported/vcpkg/ports/tinyutf8/fixbuild.patch deleted file mode 100644 index a2008089d..000000000 --- a/external_imported/vcpkg/ports/tinyutf8/fixbuild.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eef0c41..5d2c0d1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required(VERSION 3.1) - project(tinyutf8) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - - option(TINYUTF8_BUILD_STATIC "Build as static library" On) - -@@ -12,3 +12,14 @@ else() - endif() - - add_library(tinyutf8 ${LIB_BUILD_TYPE} tinyutf8.cpp) -+ -+if(MSVC) -+ ADD_DEFINITIONS(-D_UNICODE) -+endif() -+ -+install(TARGETS tinyutf8 -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+ -+install(FILES tinyutf8.h DESTINATION include) -diff --git a/tinyutf8.cpp b/tinyutf8.cpp -index ca07b1e..502312f 100644 ---- a/tinyutf8.cpp -+++ b/tinyutf8.cpp -@@ -1,6 +1,6 @@ - #include "tinyutf8.h" - - // Explicit template instantiations for utf8_string --template struct tiny_utf8::basic_utf8_string<>; --template extern std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); --template extern std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); -\ No newline at end of file -+template class tiny_utf8::basic_utf8_string<>; -+extern template std::ostream& operator<<( std::ostream& stream , const tiny_utf8::basic_utf8_string<>& str ); -+extern template std::istream& operator>>( std::istream& stream , tiny_utf8::basic_utf8_string<>& str ); diff --git a/external_imported/vcpkg/ports/tinyutf8/portfile.cmake b/external_imported/vcpkg/ports/tinyutf8/portfile.cmake index 2dad4fbaa..3cd8124ba 100644 --- a/external_imported/vcpkg/ports/tinyutf8/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyutf8/portfile.cmake @@ -3,25 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DuffsDevice/tinyutf8 - REF 68eaf247a3761c324b1a3806a954d773dfe9106b - SHA512 e8bd51ea66a84d236be7c2028b6f3a67b5b01f0fac758729f3152542c8a6a859ddb3f72d6c5abb058c909bf84862ed816e2235cfde6bfa7edaa8026a4f7f4b2a + REF 84d9878051cd89eb930ebfc2b686d2edfdb9db10 #version 4.4.3 + SHA512 dee248c3269c54a9bb616a08868236a049cdc629a1b668f39af59a69c672751067ce01a7f81df28ac41b500749019e543721ceae903ae9c11ea5282f2d308da4 HEAD_REF master - PATCHES fixbuild.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TINYUTF8_BUILD_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTINYUTF8_BUILD_STATIC=${TINYUTF8_BUILD_STATIC} + -DTINYUTF8_BUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -configure_file(${SOURCE_PATH}/LICENCE ${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENCE" "${CURRENT_PACKAGES_DIR}/share/tinyutf8/copyright" COPYONLY) # remove unneeded files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/external_imported/vcpkg/ports/tinyutf8/vcpkg.json b/external_imported/vcpkg/ports/tinyutf8/vcpkg.json index 008757cdd..943328888 100644 --- a/external_imported/vcpkg/ports/tinyutf8/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyutf8/vcpkg.json @@ -1,6 +1,12 @@ { "name": "tinyutf8", - "version-string": "4.0.2", - "port-version": 1, - "description": "TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project." + "version": "4.4.3", + "description": "TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project.", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/tinyxml2/portfile.cmake b/external_imported/vcpkg/ports/tinyxml2/portfile.cmake index 3c4d0e7d7..424107590 100644 --- a/external_imported/vcpkg/ports/tinyxml2/portfile.cmake +++ b/external_imported/vcpkg/ports/tinyxml2/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dtinyxml2_BUILD_TESTING=OFF ) vcpkg_cmake_install() @@ -19,4 +21,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/readme.md" 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/external_imported/vcpkg/ports/tinyxml2/vcpkg.json b/external_imported/vcpkg/ports/tinyxml2/vcpkg.json index c059fc809..60601c5d2 100644 --- a/external_imported/vcpkg/ports/tinyxml2/vcpkg.json +++ b/external_imported/vcpkg/ports/tinyxml2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "tinyxml2", "version-semver": "9.0.0", + "port-version": 1, "description": "A simple, small, efficient, C++ XML parser", "homepage": "https://github.com/leethomason/tinyxml2", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/tmx/libxml2.patch b/external_imported/vcpkg/ports/tmx/libxml2.patch new file mode 100644 index 000000000..4c43310be --- /dev/null +++ b/external_imported/vcpkg/ports/tmx/libxml2.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abb5e18..30b88c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,6 @@ else() + message("Zlib not wanted") + endif() + +-include(FindLibXml2) + find_package(LibXml2 REQUIRED) + target_link_libraries(tmx LibXml2::LibXml2) + diff --git a/external_imported/vcpkg/ports/tmx/portfile.cmake b/external_imported/vcpkg/ports/tmx/portfile.cmake index ee7616910..0c96c0eeb 100644 --- a/external_imported/vcpkg/ports/tmx/portfile.cmake +++ b/external_imported/vcpkg/ports/tmx/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF tmx_1.2.0 HEAD_REF master SHA512 cb29c67af560a1844e798d3fe2677a6b71866943b233c0700212b91de35f252a0a465c33911a2c432aa54be309e3ac10770bc95c6450227e39abe049c1fbbdd1 + PATCHES + libxml2.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/tmx/vcpkg.json b/external_imported/vcpkg/ports/tmx/vcpkg.json index 764177045..016d673d0 100644 --- a/external_imported/vcpkg/ports/tmx/vcpkg.json +++ b/external_imported/vcpkg/ports/tmx/vcpkg.json @@ -1,8 +1,9 @@ { "name": "tmx", "version": "1.2.0", - "port-version": 1, + "port-version": 2, "description": "A portable C library to load tiled maps in your games.", + "license": "BSD-2-Clause", "dependencies": [ "libxml2", { diff --git a/external_imported/vcpkg/ports/tmxlite/portfile.cmake b/external_imported/vcpkg/ports/tmxlite/portfile.cmake index ff1fb37a8..aaf079cb7 100644 --- a/external_imported/vcpkg/ports/tmxlite/portfile.cmake +++ b/external_imported/vcpkg/ports/tmxlite/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fallahn/tmxlite - REF v1.3.0 + REF v1.3.0 HEAD_REF master - SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 + SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 ) vcpkg_cmake_configure( @@ -18,4 +18,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/readme.md" 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) diff --git a/external_imported/vcpkg/ports/tmxlite/vcpkg.json b/external_imported/vcpkg/ports/tmxlite/vcpkg.json index 66cbcf47d..fdecfa92a 100644 --- a/external_imported/vcpkg/ports/tmxlite/vcpkg.json +++ b/external_imported/vcpkg/ports/tmxlite/vcpkg.json @@ -1,7 +1,9 @@ { "name": "tmxlite", "version": "1.3.0", + "port-version": 1, "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/toml11/portfile.cmake b/external_imported/vcpkg/ports/toml11/portfile.cmake index 3e5729bc7..fe37147cc 100644 --- a/external_imported/vcpkg/ports/toml11/portfile.cmake +++ b/external_imported/vcpkg/ports/toml11/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ToruNiina/toml11 - REF v3.7.0 - SHA512 093833ea4354ab91f54c0a346e51d38e297b8c347241f679c023e65fe580edca7852d934a0a0d371524426f61e58ee3a9638061b1230cd72be7ff55fcf12370c + REF v3.7.1 + SHA512 a4710972ab9b1ff836b2191243d628e0c4672fbfe95ede50c49796aaa75bb05d3ac71164102651d5c7342a4ac88781dfe417957b8b8ce373989f627231966550 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dtoml11_BUILD_TEST=OFF ) diff --git a/external_imported/vcpkg/ports/toml11/vcpkg.json b/external_imported/vcpkg/ports/toml11/vcpkg.json index de82e84e0..b94992dd9 100644 --- a/external_imported/vcpkg/ports/toml11/vcpkg.json +++ b/external_imported/vcpkg/ports/toml11/vcpkg.json @@ -1,8 +1,9 @@ { "name": "toml11", - "version": "3.7.0", + "version": "3.7.1", "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", "homepage": "https://github.com/ToruNiina/toml11", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake b/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake index 5c5dca582..dd0d7b869 100644 --- a/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake +++ b/external_imported/vcpkg/ports/tomlplusplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus - REF v3.0.1 - SHA512 bfb05d16715d1e8b54177e905c0a83470e7472c9c474874d70528558bbf0b0ba0daae67e1e44d99c45de3f87918bca57e889caba2e3da5e351045aee7e6a144b + REF v3.1.0 + SHA512 b5223fa978b606f6b14fa74495884ccd491fa6017ef44b2ac9a384fa1df7100745145163e2a139255927fb51e5ecd779ee2643c19579eab6e4533b15e75c9be9 HEAD_REF master ) @@ -15,12 +15,11 @@ vcpkg_configure_meson( ) vcpkg_install_meson() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tomlplusplus) cmake_path(NATIVE_PATH SOURCE_PATH native_source_path) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tomlplusplus/tomlplusplusConfig.cmake" "${native_source_path}" "") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" - "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -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/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json index 39bfa48c4..2ecfcff54 100644 --- a/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json +++ b/external_imported/vcpkg/ports/tomlplusplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tomlplusplus", - "version": "3.0.1", + "version": "3.1.0", "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", "license": "MIT", diff --git a/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch b/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch new file mode 100644 index 000000000..f712a4974 --- /dev/null +++ b/external_imported/vcpkg/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -0,0 +1,44 @@ +diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj +index 7be39025..ddb49fbc 100644 +--- a/profiler/build/win32/Tracy.vcxproj ++++ b/profiler/build/win32/Tracy.vcxproj +@@ -60,7 +60,7 @@ + Disabled + true + _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + false + true +@@ -70,9 +70,8 @@ + Fast + + +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + + + true +@@ -86,7 +85,7 @@ + true + true + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) +- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + true + true + AdvancedVectorExtensions2 +@@ -97,9 +96,8 @@ + + true + true +- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Windows +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + + + true diff --git a/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch b/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch new file mode 100644 index 000000000..2c9f4c753 --- /dev/null +++ b/external_imported/vcpkg/ports/tracy/002-fix-capstone-5.patch @@ -0,0 +1,26 @@ +diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp +index cc56298..7b9370a 100644 +--- a/server/TracySourceView.cpp ++++ b/server/TracySourceView.cpp +@@ -2,7 +2,7 @@ + #include + #include + +-#include ++#include + + #include "imgui.h" + #include "TracyCharUtil.hpp" +diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp +index fcb1718..2433e59 100644 +--- a/server/TracyWorker.cpp ++++ b/server/TracyWorker.cpp +@@ -19,7 +19,7 @@ + #include + #include + +-#include ++#include + + #define ZDICT_STATIC_LINKING_ONLY + #include "../zstd/zdict.h" diff --git a/external_imported/vcpkg/ports/tracy/portfile.cmake b/external_imported/vcpkg/ports/tracy/portfile.cmake index d5063151d..2c01885ab 100644 --- a/external_imported/vcpkg/ports/tracy/portfile.cmake +++ b/external_imported/vcpkg/ports/tracy/portfile.cmake @@ -1,24 +1,174 @@ + +# It is possible to run into some issues when profiling when we uses Tracy client as a shared client +# As as safety measure let's build Tracy as a static library for now +# More details on Tracy Discord (e.g. https://discord.com/channels/585214693895962624/585214693895962630/953599951328403506) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF 9ba7171c3dd6f728268a820ee268a62c75f2dfb6 - SHA512 a2898cd04a532a5cc71fd6c5fd3893ebff68df25fc38e8d988ba4a8a6cbe33e3d0049661029d002160b94b57421e5c5b7400658b404e51bfab721d204dd0cc5d + REF a8511d357650282c6915f7aa9775e9c4945e42b5 + SHA512 6e0ff0be7621490b607eaae46d4ec13ea66b0061ed580c99d75eda3a7c9479b34c70da9ad844bd4a05e329bb40cebf48e7c6bab05d2a946d56b2d432c7ddc125 HEAD_REF master + PATCHES + 001-fix-vcxproj-vcpkg.patch + 002-fix-capstone-5.patch ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} ) - vcpkg_cmake_install() -vcpkg_copy_pdbs() +if(VCPKG_TARGET_IS_LINUX) + set(any_tracy_tool_requested OFF) + if(profiler IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + gtk+-3.0 + tbb + +These can be installed on Ubuntu systems via sudo apt install libgtk-3-dev libtbb-dev") + set(any_tracy_tool_requested ON) + else() + foreach(CLI_TOOL capture csvexport import-chrome update) + if(${CLI_TOOL} IN_LIST FEATURES) + message(WARNING +"Tracy currently requires the following libraries from the system package manager to build its tools: + tbb + +These can be installed on Ubuntu systems via sudo apt install libtbb-dev") + set(any_tracy_tool_requested ON) + break() + endif() + endforeach() + endif() + +endif() + +vcpkg_list(SET tracy_tools) +if("cli-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools capture csvexport import-chrome update) +endif() +if("gui-tools" IN_LIST FEATURES) + vcpkg_list(APPEND tracy_tools profiler) +endif() + +function(tracy_tool_install_make tracy_TOOL tracy_TOOL_NAME) + foreach(buildtype IN ITEMS "debug" "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") + if("${buildtype}" STREQUAL "debug") + set(short_buildtype "-dbg") + set(path_suffix "/debug") + else() + set(short_buildtype "-rel") + set(path_suffix "") + endif() + + file(COPY "${SOURCE_PATH}/${tracy_TOOL}/build/unix" DESTINATION "${SOURCE_PATH}/${tracy_TOOL}/_build") + file(RENAME "${SOURCE_PATH}/${tracy_TOOL}/_build/unix" "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + file(REMOVE_RECURSE "${SOURCE_PATH}/${tracy_TOOL}/_build") + + set(path_makefile_dir "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}") + cmake_path(RELATIVE_PATH path_makefile_dir + BASE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}" + OUTPUT_VARIABLE relative_path_makefile_dir) + vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") + + message(STATUS "Building ${tracy_TOOL_NAME} ${TARGET_TRIPLET}${short_buildtype}") + vcpkg_build_make( + BUILD_TARGET ${buildtype} + SUBPATH ${relative_path_makefile_dir} + LOGFILE_ROOT "build-${tracy_TOOL}" + ) + vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + + file(INSTALL "${SOURCE_PATH}/${tracy_TOOL}/build/unix${short_buildtype}/${tracy_TOOL_NAME}-${buildtype}" DESTINATION "${CURRENT_PACKAGES_DIR}${path_suffix}/tools/${PORT}" RENAME "${tracy_TOOL_NAME}") + endif() + endforeach() +endfunction() + +if("capture" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "capture/build/win32/capture.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(capture capture) + endif() +endif() + +if("csvexport" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "csvexport/build/win32/csvexport.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(csvexport csvexport) + endif() +endif() + +if("import-chrome" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "import-chrome/build/win32/import-chrome.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(import-chrome import-chrome) + endif() +endif() + +if("profiler" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "profiler/build/win32/Tracy.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(profiler Tracy) + endif() +endif() + +if("update" IN_LIST tracy_tools) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "update/build/win32/update.vcxproj" + USE_VCPKG_INTEGRATION + ) + else() + tracy_tool_install_make(update update) + endif() +endif() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME Tracy) vcpkg_fixup_pkgconfig() +foreach(TOOL capture csvexport import-chrome profiler update) + if(${TOOL} IN_LIST tracy_tools) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + break() + endif() +endforeach() + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/tracy/vcpkg.json b/external_imported/vcpkg/ports/tracy/vcpkg.json index 9821d14bf..f507334a3 100644 --- a/external_imported/vcpkg/ports/tracy/vcpkg.json +++ b/external_imported/vcpkg/ports/tracy/vcpkg.json @@ -1,8 +1,9 @@ { "name": "tracy", - "version": "0.8.0", + "version-semver": "0.8.2", "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", "supports": "!(windows & (arm | uwp))", "dependencies": [ { @@ -17,5 +18,37 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "cli-tools": { + "description": "Build Tracy command-line tools: `capture`, `csvexport`, `import-chrome` and `update`", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + } + ] + }, + "gui-tools": { + "description": "Build Tracy GUI tool: `profiler` (aka `Tracy` executable)", + "supports": "!(windows & x86)", + "dependencies": [ + { + "name": "capstone", + "features": [ + "arm", + "arm64", + "x86" + ] + }, + "freetype", + "glfw3" + ] + } + } } diff --git a/external_imported/vcpkg/ports/trantor/portfile.cmake b/external_imported/vcpkg/ports/trantor/portfile.cmake index f2dcdfb46..d7cec3fb1 100644 --- a/external_imported/vcpkg/ports/trantor/portfile.cmake +++ b/external_imported/vcpkg/ports/trantor/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.5 - SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 + REF v1.5.6 + SHA512 9c9827b1640fa23f2941c6c10ffe692d4207595de1cb149f94140c0f20d4fe6c45e3efcc50d464bd40aff80443dfe3bdd8db263302755ab8f639a920e497c0b3 HEAD_REF master PATCHES - vcpkg.patch ) vcpkg_cmake_configure( diff --git a/external_imported/vcpkg/ports/trantor/vcpkg.json b/external_imported/vcpkg/ports/trantor/vcpkg.json index 3af0abe63..67440de43 100644 --- a/external_imported/vcpkg/ports/trantor/vcpkg.json +++ b/external_imported/vcpkg/ports/trantor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.5", + "version-semver": "1.5.6", "description": "A non-blocking I/O cross-platform TCP network library, using C++14", "homepage": "https://github.com/an-tao/trantor", "license": "BSD-2-Clause", diff --git a/external_imported/vcpkg/ports/trantor/vcpkg.patch b/external_imported/vcpkg/ports/trantor/vcpkg.patch deleted file mode 100644 index 7735262b1..000000000 --- a/external_imported/vcpkg/ports/trantor/vcpkg.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33b8e2c..e8c1cc2 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,6 +148,9 @@ if(HAVE_C-ARES) - set(private_headers - ${private_headers} - trantor/net/inner/AresResolver.h) -+ if(APPLE) -+ target_link_libraries(${PROJECT_NAME} PRIVATE resolv) -+ endif() - else() - set(TRANTOR_SOURCES - ${TRANTOR_SOURCES} diff --git a/external_imported/vcpkg/ports/tre/CMakeLists.txt b/external_imported/vcpkg/ports/tre/CMakeLists.txt index 09113fca1..b31aa8c72 100644 --- a/external_imported/vcpkg/ports/tre/CMakeLists.txt +++ b/external_imported/vcpkg/ports/tre/CMakeLists.txt @@ -25,6 +25,9 @@ set (SRCS include_directories(win32 include/tre) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H) +if (WIN32) + add_definitions(-DHAVE_MALLOC_H) +endif() add_library(tre ${SRCS}) install( diff --git a/external_imported/vcpkg/ports/tre/fix-config.patch b/external_imported/vcpkg/ports/tre/fix-config.patch new file mode 100644 index 000000000..89303ae8d --- /dev/null +++ b/external_imported/vcpkg/ports/tre/fix-config.patch @@ -0,0 +1,17 @@ +diff --git a/win32/config.h b/win32/config.h +index 93b8210..db7a9e1 100644 +--- a/win32/config.h ++++ b/win32/config.h +@@ -20,7 +20,6 @@ + /* #undef HAVE_ALLOCA_H */ + + /* Define to 1 if you have and it should be used. */ +-#define HAVE_MALLOC_H 1 + + /* Define if the GNU dcgettext() function is already present or preinstalled. + */ +@@ -180,4 +179,3 @@ + /* Avoid silly warnings about "insecure" functions. */ + #define _CRT_SECURE_NO_DEPRECATE 1 + +-#define snprintf sprintf_s diff --git a/external_imported/vcpkg/ports/tre/portfile.cmake b/external_imported/vcpkg/ports/tre/portfile.cmake index cbc904e6e..d92265c7d 100644 --- a/external_imported/vcpkg/ports/tre/portfile.cmake +++ b/external_imported/vcpkg/ports/tre/portfile.cmake @@ -4,12 +4,10 @@ vcpkg_from_github( REF 6fb7206b935b35814c5078c20046dbe065435363 SHA512 f1d664719eab23b665d71e34ca3d11f8ba49da23ff20dc28f46d4ce30fe155c12208ba7fd212dbeb20a7037e069909f0c2120ce1fc01074656399805e3289a90 HEAD_REF master + PATCHES + fix-config.patch ) -file(READ ${SOURCE_PATH}/win32/config.h CONFIG_H) -string(REPLACE "#define snprintf sprintf_s" "" CONFIG_H ${CONFIG_H}) -file(WRITE ${SOURCE_PATH}/win32/config.h "${CONFIG_H}") - if(VCPKG_TARGET_IS_MINGW) vcpkg_replace_string(${SOURCE_PATH}/win32/tre.def "tre.dll" "libtre.dll") endif() diff --git a/external_imported/vcpkg/ports/tre/vcpkg.json b/external_imported/vcpkg/ports/tre/vcpkg.json index cada62dae..7d072060f 100644 --- a/external_imported/vcpkg/ports/tre/vcpkg.json +++ b/external_imported/vcpkg/ports/tre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tre", - "version-string": "0.8.0", - "port-version": 3, + "version": "0.8.0", + "port-version": 4, "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.", "homepage": "https://github.com/laurikari/tre" } diff --git a/external_imported/vcpkg/ports/tree-sitter/CMakeLists.txt b/external_imported/vcpkg/ports/tree-sitter/CMakeLists.txt new file mode 100644 index 000000000..aef0bddb6 --- /dev/null +++ b/external_imported/vcpkg/ports/tree-sitter/CMakeLists.txt @@ -0,0 +1,51 @@ +cmake_minimum_required(VERSION 3.20) + +project( + tree-sitter + LANGUAGES C + VERSION 0.20.6 +) + +set(TS_SOVERSION_MAJOR 0) +set(TS_SOVERSION_MINOR 0) + +file(GLOB TS_SRC_FILES "${PROJECT_SOURCE_DIR}/src/*.c") +list(REMOVE_ITEM TS_SRC_FILES "${PROJECT_SOURCE_DIR}/src/lib.c") # skip amalgamation + +include(GNUInstallDirs) + +add_library(tree-sitter ${TS_SRC_FILES}) +target_include_directories( + tree-sitter + PRIVATE $ + PUBLIC $ + $) + +set_target_properties( + tree-sitter + PROPERTIES C_STANDARD 99 + C_STANDARD_REQUIRED ON + POSITION_INDEPENDENT_CODE ON + SOVERSION ${TS_SOVERSION_MAJOR}.${TS_SOVERSION_MINOR}) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tree-sitter.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter.pc" @ONLY) + +install( + TARGETS tree-sitter + EXPORT unofficial-tree-sitter-config + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + +install(FILES "${PROJECT_SOURCE_DIR}/include/tree_sitter/api.h" + "${PROJECT_SOURCE_DIR}/include/tree_sitter/parser.h" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/tree_sitter") + +install( + EXPORT unofficial-tree-sitter-config + NAMESPACE unofficial::tree-sitter:: + DESTINATION share/unofficial-tree-sitter) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch b/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch new file mode 100644 index 000000000..b75bbc10e --- /dev/null +++ b/external_imported/vcpkg/ports/tree-sitter/pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/tree-sitter.pc.in b/lib/tree-sitter.pc.in +similarity index 61% +rename from tree-sitter.pc.in +rename to lib/tree-sitter.pc.in +index f98816cb..71a3b4f9 100644 +--- a/tree-sitter.pc.in ++++ b/lib/tree-sitter.pc.in +@@ -1,10 +1,10 @@ +-prefix=@PREFIX@ +-libdir=@LIBDIR@ +-includedir=@INCLUDEDIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=${prefix}@/lib ++includedir=${prefix}/include + + Name: tree-sitter + Description: An incremental parsing system for programming tools + URL: https://tree-sitter.github.io/ +-Version: @VERSION@ ++Version: @PROJECT_VERSION@ + Libs: -L${libdir} -ltree-sitter + Cflags: -I${includedir} diff --git a/external_imported/vcpkg/ports/tree-sitter/portfile.cmake b/external_imported/vcpkg/ports/tree-sitter/portfile.cmake new file mode 100644 index 000000000..46ec95667 --- /dev/null +++ b/external_imported/vcpkg/ports/tree-sitter/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tree-sitter/tree-sitter + REF ccd6bf554d922596ce905730d98a77af368bba5c #v0.20.6 + SHA512 ab7eeecafc9d7d17093e25479903fa8c77a84ce4c3a41d737d49bcf9348ab6cc55cf3d6cce0229781292c2b05342fbf45641e40545ea3fde09e441e02f2cdb83 + HEAD_REF master + PATCHES pkgconfig.patch +) + +# currently not supported upstream +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/lib") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lib" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-tree-sitter") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/tree-sitter/vcpkg.json b/external_imported/vcpkg/ports/tree-sitter/vcpkg.json new file mode 100644 index 000000000..935489c48 --- /dev/null +++ b/external_imported/vcpkg/ports/tree-sitter/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tree-sitter", + "version-semver": "0.20.6", + "description": "An incremental parsing system for programming tools.", + "homepage": "https://github.com/tree-sitter/tree-sitter", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch b/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch index fd3ee5f30..31e654317 100644 --- a/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch +++ b/external_imported/vcpkg/ports/triton/001-fix-dependency-z3.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8bbe47..966ded8 100644 +index c8da1610..106fdb8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -99,9 +99,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") +@@ -103,9 +103,9 @@ list(APPEND CMAKE_MODULE_PATH "${TRITON_ROOT}/CMakeModules/") # Find Z3 if(Z3_INTERFACE) message(STATUS "Compiling with Z3 SMT solver") @@ -15,28 +15,16 @@ index a8bbe47..966ded8 100644 # Find bitwuzla diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 683b5f2..5df941e 100644 +index 90cf6bfe..33f27d23 100644 --- a/src/libtriton/Config.cmake.in +++ b/src/libtriton/Config.cmake.in -@@ -19,6 +19,9 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun +@@ -47,8 +47,7 @@ endif() - include(CMakeFindDependencyMacro) - find_dependency(Boost) -+if (@Z3_INTERFACE@) + # Z3 include directories + if (TRITON_Z3_INTERFACE) +- include_directories("@Z3_INCLUDE_DIRS@") +- link_directories(BEFORE "@Z3_LIB_DIR@") + find_dependency(Z3 CONFIG) -+endif() - - # Triton include - include_directories("@CMAKE_INSTALL_PREFIX@/include") -@@ -37,11 +40,6 @@ if (TRITON_LLVM_INTERFACE) - include_directories("@LLVM_INCLUDE_DIRS@") endif() --# Z3 include directories --if (TRITON_Z3_INTERFACE) -- include_directories("@Z3_INCLUDE_DIRS@") --endif() -- # Bitwuzla include directories - if (TRITON_BITWUZLA_INTERFACE) - include_directories("@BITWUZLA_INCLUDE_DIRS@") diff --git a/external_imported/vcpkg/ports/triton/003-fix-capstone-5.patch b/external_imported/vcpkg/ports/triton/002-fix-capstone-5.patch similarity index 100% rename from external_imported/vcpkg/ports/triton/003-fix-capstone-5.patch rename to external_imported/vcpkg/ports/triton/002-fix-capstone-5.patch diff --git a/external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch b/external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch deleted file mode 100644 index d4814709e..000000000 --- a/external_imported/vcpkg/ports/triton/002-fix-dependency-capstone.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 966ded8..199a3ba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -129,8 +129,8 @@ endif() - - # Find Capstone - message(STATUS "Compiling with Capstone") --find_package(CAPSTONE REQUIRED) --include_directories(${CAPSTONE_INCLUDE_DIRS}) -+find_package(CAPSTONE CONFIG REQUIRED) -+set(CAPSTONE_LIBRARIES capstone::capstone) - - # Find boost - message(STATUS "Compiling with Boost headers") -diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 5df941e..23c5a27 100644 ---- a/src/libtriton/Config.cmake.in -+++ b/src/libtriton/Config.cmake.in -@@ -19,6 +19,7 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun - - include(CMakeFindDependencyMacro) - find_dependency(Boost) -+find_dependency(capstone CONFIG) - if (@Z3_INTERFACE@) - find_dependency(Z3 CONFIG) - endif() -@@ -26,9 +27,6 @@ endif() - # Triton include - include_directories("@CMAKE_INSTALL_PREFIX@/include") - --# Capstone include --include_directories("@CAPSTONE_INCLUDE_DIRS@") -- - # Python include directories - if (TRITON_PYTHON_BINDINGS) - include_directories("@PYTHON_INCLUDE_DIRS@") -diff --git a/src/libtriton/includes/triton/externalLibs.hpp b/src/libtriton/includes/triton/externalLibs.hpp -index 65678a0..d055f88 100644 ---- a/src/libtriton/includes/triton/externalLibs.hpp -+++ b/src/libtriton/includes/triton/externalLibs.hpp -@@ -29,14 +29,10 @@ namespace triton { - * \addtogroup extlibs - * @{ - */ -- #if defined(__unix__) || defined(__APPLE__) -- #include -- #include -- #include -- #include -- #elif _WIN32 -- #include -- #endif -+ #include -+ #include -+ #include -+ #include - /*! @} End of capstone namespace */ - }; - diff --git a/external_imported/vcpkg/ports/triton/003-fix-python.patch b/external_imported/vcpkg/ports/triton/003-fix-python.patch new file mode 100644 index 000000000..24c123784 --- /dev/null +++ b/external_imported/vcpkg/ports/triton/003-fix-python.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8da1610..40ab12c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,6 @@ if(PYTHON_BINDINGS) + find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) + find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) + include_directories(${PYTHON_INCLUDE_DIRS}) +- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") + cmake_path(GET PYTHON_LIBRARY PARENT_PATH PYTHON_LIB_DIR) + cmake_path(GET PYTHON_LIBRARY STEM LAST_ONLY PYTHON_LIB_NAME) + string(REGEX REPLACE "^lib" "" PYTHON_LIB_NAME ${PYTHON_LIB_NAME}) +diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt +index 7101cce8..a052b066 100644 +--- a/src/libtriton/CMakeLists.txt ++++ b/src/libtriton/CMakeLists.txt +@@ -330,9 +330,9 @@ if(PYTHON_BINDINGS) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + else() +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) ++ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) + endif() + else() + execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sys import version_info; print(f'lib/python{version_info[0]}.{version_info[1]}/site-packages')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/external_imported/vcpkg/ports/triton/004-fix-python.patch b/external_imported/vcpkg/ports/triton/004-fix-python.patch deleted file mode 100644 index 19c0604f5..000000000 --- a/external_imported/vcpkg/ports/triton/004-fix-python.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 966ded8..baf0ec3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,6 @@ if(PYTHON_BINDINGS) - find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) - find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) - include_directories(${PYTHON_INCLUDE_DIRS}) -- add_definitions("-DPYTHON_LIBRARIES=\"${PYTHON_LIBRARIES}\"") - add_custom_target(test-python - COMMAND ${PYTHONPATH_CMD} ${PYTHON_EXECUTABLE} -m unittest discover ${TRITON_ROOT}/src/testers/unittests - DEPENDS python-triton -diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt -index 6770b08..701d55b 100644 ---- a/src/libtriton/CMakeLists.txt -+++ b/src/libtriton/CMakeLists.txt -@@ -326,8 +326,8 @@ if(PYTHON_BINDINGS) - ) - execute_process (COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) - if(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CONFIG_NAME}/triton${PYTHON_SUFFIX} DESTINATION share/triton) - else() -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION ${PYTHON_SITE_PACKAGES}) -+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/triton${PYTHON_SUFFIX} DESTINATION share/triton) - endif() - endif() diff --git a/external_imported/vcpkg/ports/triton/portfile.cmake b/external_imported/vcpkg/ports/triton/portfile.cmake index 991631203..e542d25bc 100644 --- a/external_imported/vcpkg/ports/triton/portfile.cmake +++ b/external_imported/vcpkg/ports/triton/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JonathanSalwan/Triton - REF 64a2b9b0490c82e41b37e623b1d0da14e2382e7a - SHA512 ff99a270813043df2bc0da765e04aae4b9d5a911d20c6e5ffca1472eae8d6e1fcfff3cd56da023d6a77a647644839430bf72902acd84ec521a0e098f185d275c + REF 243026c9c1e07a5ca834c4aaf628d1079f6a85ea + SHA512 9e46c500203647de545286b78a7d4ae6da1796b8eed30fe7346ae6e51865ef70de1adb858c402c3687c471ad654cc6aefdff8893196f5ef7b45e4cee6dd9c577 PATCHES 001-fix-dependency-z3.patch - 002-fix-dependency-capstone.patch - 003-fix-capstone-5.patch - 004-fix-python.patch + 002-fix-capstone-5.patch + 003-fix-python.patch ) string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) @@ -16,14 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "python" PYTHON_BINDINGS + "boost" BOOST_INTERFACE ) -set(ADDITIONAL_OPTIONS ) +set(ADDITIONAL_OPTIONS "") if(PYTHON_BINDINGS) vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - ) + "-DPYTHON_EXECUTABLE=${PYTHON3}" + ) endif() vcpkg_cmake_configure( @@ -31,6 +31,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DZ3_INTERFACE=ON + -DTRITON_BOOST_INTERFACE=OFF -DBUILD_SHARED_LIBS=${DYNAMICLIB} -DMSVC_STATIC=${STATICCRT} -DBUILD_EXAMPLES=OFF @@ -46,8 +47,7 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # Remove duplicate files -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") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/triton/vcpkg.json b/external_imported/vcpkg/ports/triton/vcpkg.json index e97ea3d51..df49b5d39 100644 --- a/external_imported/vcpkg/ports/triton/vcpkg.json +++ b/external_imported/vcpkg/ports/triton/vcpkg.json @@ -1,15 +1,12 @@ { "name": "triton", "version": "0.9", - "port-version": 2, + "port-version": 4, "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", "homepage": "https://github.com/JonathanSalwan/Triton", "license": "Apache-2.0", "supports": "!arm", "dependencies": [ - "boost-math", - "boost-multiprecision", - "boost-numeric-conversion", { "name": "capstone", "default-features": false, @@ -30,6 +27,13 @@ "z3" ], "features": { + "boost": { + "description": "Use Boost as multiprecision library", + "dependencies": [ + "boost-multiprecision", + "boost-numeric-conversion" + ] + }, "python": { "description": "Build Triton with Python bindings", "dependencies": [ diff --git a/external_imported/vcpkg/ports/turbobase64/CMakeLists.txt b/external_imported/vcpkg/ports/turbobase64/CMakeLists.txt index c4fcebc47..c62f679e7 100644 --- a/external_imported/vcpkg/ports/turbobase64/CMakeLists.txt +++ b/external_imported/vcpkg/ports/turbobase64/CMakeLists.txt @@ -34,37 +34,33 @@ else () endif () if (ARCH_AMD64) - add_library(base64 + add_library(tb64 $ $ $ $) else () - add_library(base64 + add_library(tb64 $ $) endif () # End of Yandex code -target_include_directories(base64 SYSTEM PUBLIC $) -set_target_properties(base64 PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/turbob64.h") +include(CMakePackageConfigHelpers) +include(GNUInstallDirs) -install(TARGETS base64 - EXPORT base64Config - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - PUBLIC_HEADER DESTINATION "include" - COMPONENT dev +target_include_directories(tb64 PUBLIC + $ + $ ) -export(TARGETS base64 - NAMESPACE TURBO:: - FILE "share/base64/base64Config.cmake" - ) +install(TARGETS tb64 + EXPORT unofficial-turbobase64-config + ) +install(FILES "${CMAKE_SOURCE_DIR}/turbob64.h" TYPE INCLUDE) -install(EXPORT base64Config - DESTINATION "share/base64" - NAMESPACE TURBO:: +install(EXPORT unofficial-turbobase64-config + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-turbobase64" + NAMESPACE unofficial::turbobase64:: ) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/turbobase64/portfile.cmake b/external_imported/vcpkg/ports/turbobase64/portfile.cmake index e4db2c00b..ddd4266b1 100644 --- a/external_imported/vcpkg/ports/turbobase64/portfile.cmake +++ b/external_imported/vcpkg/ports/turbobase64/portfile.cmake @@ -6,14 +6,15 @@ vcpkg_from_github( HEAD_REF master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +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 ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/external_imported/vcpkg/ports/turbobase64/vcpkg.json b/external_imported/vcpkg/ports/turbobase64/vcpkg.json index b0e93558d..41ac724e6 100644 --- a/external_imported/vcpkg/ports/turbobase64/vcpkg.json +++ b/external_imported/vcpkg/ports/turbobase64/vcpkg.json @@ -1,8 +1,19 @@ { "name": "turbobase64", "version-date": "2020-01-12", - "port-version": 2, + "port-version": 3, "description": "Fastest Base64 SIMD/Neon library", "homepage": "https://github.com/powturbo/Turbo-Base64", - "supports": "!windows" + "license": "GPL-3.0-only", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/unixodbc/portfile.cmake b/external_imported/vcpkg/ports/unixodbc/portfile.cmake index f2e726b8c..c2d5f9776 100644 --- a/external_imported/vcpkg/ports/unixodbc/portfile.cmake +++ b/external_imported/vcpkg/ports/unixodbc/portfile.cmake @@ -1,9 +1,8 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lurcher/unixODBC - REF v2.3.9 - SHA512 473f8d39f5976b4c34394d880d6e511b73e33a1fbd6b828a0929787983cd9b5fe7e16776ed51776ce44b54aa61c62be689c0731489b3989acb99c135fb492ec5 + REF 6c8071b1bef4e4991e7b3023a1c1c712168a818e # v2.3.11 + SHA512 5c5b189e3b62935fdee5e25f5cf9b41fb2bc68fc9bd1652cab1b109032ab586978ba14d19e83328838b55e773f099046344bb4c84ec99edac309650ed863543e HEAD_REF master ) @@ -35,16 +34,21 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc" "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +foreach(FILE config.h unixodbc_conf.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +endforeach() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/unixodbc/usage b/external_imported/vcpkg/ports/unixodbc/usage index 7901a3ef2..9e6f2f5cf 100644 --- a/external_imported/vcpkg/ports/unixodbc/usage +++ b/external_imported/vcpkg/ports/unixodbc/usage @@ -1,4 +1,4 @@ The package unixodbc is compatible with built-in CMake targets: - FIND_PACKAGE(unixodbc REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE UNIX::odbc) for linkage + find_package(unixodbc REQUIRED) + target_link_libraries(main PRIVATE UNIX::odbc) diff --git a/external_imported/vcpkg/ports/unixodbc/vcpkg.json b/external_imported/vcpkg/ports/unixodbc/vcpkg.json index e844edf3c..4f3457179 100644 --- a/external_imported/vcpkg/ports/unixodbc/vcpkg.json +++ b/external_imported/vcpkg/ports/unixodbc/vcpkg.json @@ -1,8 +1,9 @@ { "name": "unixodbc", - "version": "2.3.9", + "version": "2.3.11", "port-version": 1, "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", + "license": "LGPL-2.1-only", "supports": "osx | linux" } diff --git a/external_imported/vcpkg/ports/unrar/portfile.cmake b/external_imported/vcpkg/ports/unrar/portfile.cmake index a7041a813..51d8f57b3 100644 --- a/external_imported/vcpkg/ports/unrar/portfile.cmake +++ b/external_imported/vcpkg/ports/unrar/portfile.cmake @@ -1,5 +1,5 @@ -set(UNRAR_VERSION "5.8.1") -set(UNRAR_SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612) +set(UNRAR_VERSION "6.1.7") +set(UNRAR_SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846) set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz) set(UNRAR_URL https://www.rarlab.com/rar/${UNRAR_FILENAME}) diff --git a/external_imported/vcpkg/ports/unrar/vcpkg.json b/external_imported/vcpkg/ports/unrar/vcpkg.json index 579dc62ea..64854fc52 100644 --- a/external_imported/vcpkg/ports/unrar/vcpkg.json +++ b/external_imported/vcpkg/ports/unrar/vcpkg.json @@ -1,7 +1,6 @@ { "name": "unrar", - "version": "5.8.1", - "port-version": 3, + "version": "6.1.7", "description": "rarlab's unrar library", "homepage": "https://www.rarlab.com", "license": null, diff --git a/external_imported/vcpkg/ports/upb/0001-make-cmakelists-py.patch b/external_imported/vcpkg/ports/upb/0001-make-cmakelists-py.patch new file mode 100644 index 000000000..15f333efe --- /dev/null +++ b/external_imported/vcpkg/ports/upb/0001-make-cmakelists-py.patch @@ -0,0 +1,141 @@ +diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py +index d64c14f6..ad3597c3 100755 +--- a/cmake/make_cmakelists.py ++++ b/cmake/make_cmakelists.py +@@ -316,10 +316,136 @@ class Converter(object): + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") + endif() + ++ if (MSVC) ++ add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS) ++ endif() ++ + enable_testing() + ++ set(CMAKE_CXX_STANDARD 11) ++ ++ if (VCPKG_UPB_BUILD_CODEGEN) ++ find_package(absl CONFIG REQUIRED) ++ find_package(protobuf CONFIG REQUIRED) ++ ++ if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++ endif() ++ endif() ++ ++ add_library(descriptor_upb_proto) ++ ++ add_library(utf8_range ++ ../third_party/utf8_range/naive.c ++ ../third_party/utf8_range/range2-neon.c ++ ../third_party/utf8_range/range2-sse.c ++ ../third_party/utf8_range/utf8_range.h ++ ) ++ + %(toplevel)s + ++ set(UPB_DESCRIPTOR_PROTO "${VCPKG_UPB_HOST_INCLUDE_DIR}/google/protobuf/descriptor.proto") ++ if (VCPKG_UPB_BUILD_CODEGEN) ++ set(UPB_CODEGEN_TARGETS protoc-gen-upb protoc-gen-upbdefs) ++ ++ add_executable(protoc-gen-upbdefs ++ ../upbc/common.h ++ ../upbc/common.cc ++ ../upbc/protoc-gen-upbdefs.cc ++ ) ++ target_link_libraries(protoc-gen-upbdefs PRIVATE ++ absl::flat_hash_map ++ absl::strings ++ protobuf::libprotobuf ++ protobuf::libprotoc ++ ) ++ ++ add_executable(protoc-gen-upb ++ ../upbc/common.h ++ ../upbc/common.cc ++ ../upbc/protoc-gen-upb.cc ++ ) ++ target_link_libraries(protoc-gen-upb PRIVATE ++ mini_table ++ port ++ upb ++ absl::flat_hash_map ++ absl::flat_hash_set ++ absl::strings ++ protobuf::libprotobuf ++ protobuf::libprotoc ++ ) ++ ++ set(PROTOC_PROGRAM "\$") ++ set(PROTOC_GEN_UPB_PROGRAM "\$") ++ set(PROTOC_GEN_UPBDEFS_PROGRAM "\$") ++ else() ++ find_program(PROTOC_PROGRAM protoc) ++ find_program(PROTOC_GEN_UPB_PROGRAM protoc-gen-upb) ++ find_program(PROTOC_GEN_UPBDEFS_PROGRAM protoc-gen-upbdefs) ++ endif() ++ ++ set(UPB_DESCRIPTOR_SOURCES ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.c" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.h" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.c" ++ ) ++ ++ add_custom_command( ++ OUTPUT ${UPB_DESCRIPTOR_SOURCES} ++ DEPENDS "${UPB_DESCRIPTOR_PROTO}" ++ COMMAND ++ "${PROTOC_PROGRAM}" ++ "-I${VCPKG_UPB_HOST_INCLUDE_DIR}" ++ "--plugin=protoc-gen-upb=${PROTOC_GEN_UPB_PROGRAM}" ++ "--plugin=protoc-gen-upbdefs=${PROTOC_GEN_UPBDEFS_PROGRAM}" ++ "--upb_out=${CMAKE_CURRENT_BINARY_DIR}" ++ "--upbdefs_out=${CMAKE_CURRENT_BINARY_DIR}" ++ "${UPB_DESCRIPTOR_PROTO}" ++ ) ++ ++ target_sources(descriptor_upb_proto PRIVATE ${UPB_DESCRIPTOR_SOURCES}) ++ ++ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) ++ set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) ++ set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) ++ set_target_properties(json PROPERTIES OUTPUT_NAME upb_json) ++ set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range) ++ set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table) ++ set_target_properties(extension_registry PROPERTIES OUTPUT_NAME upb_extension_registry) ++ set_target_properties(collections PROPERTIES OUTPUT_NAME upb_collections) ++ ++ install( ++ DIRECTORY ../upb ++ DESTINATION include ++ FILES_MATCHING ++ PATTERN "*.h" ++ PATTERN "*.hpp" ++ PATTERN "*.inc" ++ PATTERN "*.int.h" ++ ) ++ target_include_directories(upb PUBLIC $) ++ install(TARGETS ++ upb ++ utf8_range ++ fastdecode ++ json ++ port ++ table ++ descriptor_upb_proto ++ reflection ++ textformat ++ mini_table_internal ++ mini_table ++ extension_registry ++ collections ++ ${UPB_CODEGEN_TARGETS} ++ EXPORT upb-config ++ ) ++ install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) ++ + """) + + data = {} diff --git a/external_imported/vcpkg/ports/upb/0002-fix-uwp.patch b/external_imported/vcpkg/ports/upb/0002-fix-uwp.patch new file mode 100644 index 000000000..0b0b712dd --- /dev/null +++ b/external_imported/vcpkg/ports/upb/0002-fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/upb/json_decode.c b/upb/json_decode.c +index c4698f0..20226f5 100644 +--- a/upb/json_decode.c ++++ b/upb/json_decode.c +@@ -1217,7 +1217,7 @@ static void jsondec_struct(jsondec* d, upb_Message* msg, + static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg, + const upb_MessageDef* m) { + upb_MessageValue val; +- const upb_FieldDef* f; ++ const upb_FieldDef* f = 0; + upb_Message* submsg; + + switch (jsondec_peek(d)) { diff --git a/external_imported/vcpkg/ports/upb/add-all-libs-target.patch b/external_imported/vcpkg/ports/upb/add-all-libs-target.patch deleted file mode 100644 index 9a6a6d242..000000000 --- a/external_imported/vcpkg/ports/upb/add-all-libs-target.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index b4f43f9..c90968f 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -137,4 +137,20 @@ add_library(table INTERFACE) - target_link_libraries(table INTERFACE - port) - -+add_library(all_libs INTERFACE) -+target_link_libraries(all_libs -+ INTERFACE -+ upb -+ fastdecode -+ utf8_range -+ json -+ port -+ table -+ descriptor_upb_proto -+ reflection -+ textformat -+) -+set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) -+set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) -+set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) - diff --git a/external_imported/vcpkg/ports/upb/add-cmake-install.patch b/external_imported/vcpkg/ports/upb/add-cmake-install.patch deleted file mode 100644 index 51e740d03..000000000 --- a/external_imported/vcpkg/ports/upb/add-cmake-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index c90968f..50637ec 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -8,7 +8,7 @@ else() - cmake_policy(VERSION 3.12) - endif() - --cmake_minimum_required (VERSION 3.0) -+cmake_minimum_required (VERSION 3.14) - cmake_policy(SET CMP0048 NEW) - - project(upb) -@@ -154,3 +154,27 @@ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) - set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) - set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) - -+install( -+ DIRECTORY ../upb -+ DESTINATION include -+ FILES_MATCHING -+ PATTERN "*.h" -+ PATTERN "*.hpp" -+ PATTERN "*.inc" -+ PATTERN "*.int.h" -+) -+target_include_directories(upb PUBLIC $) -+install(TARGETS -+ upb -+ utf8_range -+ fastdecode -+ json -+ port -+ table -+ descriptor_upb_proto -+ reflection -+ textformat -+ all_libs -+ EXPORT upb-config -+) -+install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) diff --git a/external_imported/vcpkg/ports/upb/fix-cmakelists.patch b/external_imported/vcpkg/ports/upb/fix-cmakelists.patch deleted file mode 100644 index 2a01d62cc..000000000 --- a/external_imported/vcpkg/ports/upb/fix-cmakelists.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 6b4c50d..b4f43f9 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -66,6 +66,10 @@ endif() - enable_testing() - - add_library(port INTERFACE) -+add_library(descriptor_upb_proto INTERFACE) -+add_library(utf8_range -+ ../third_party/utf8_range/utf8_range.c -+ ../third_party/utf8_range/utf8_range.h) - add_library(upb - ../upb/decode.c - ../upb/decode_internal.h -@@ -84,7 +88,7 @@ add_library(upb - target_link_libraries(upb - fastdecode - port -- /third_party/utf8_range) -+ utf8_range) - add_library(fastdecode - ../upb/decode.h - ../upb/decode_internal.h -@@ -96,7 +100,7 @@ add_library(fastdecode - target_link_libraries(fastdecode - port - table -- /third_party/utf8_range) -+ utf8_range) - add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE) - target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE - table diff --git a/external_imported/vcpkg/ports/upb/fix-uwp.patch b/external_imported/vcpkg/ports/upb/fix-uwp.patch deleted file mode 100644 index c681fa336..000000000 --- a/external_imported/vcpkg/ports/upb/fix-uwp.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index a6b432f..003615e 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -59,6 +59,10 @@ elseif(UNIX) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") - endif() - -+if (MSVC) -+ add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS) -+endif() -+ - enable_testing() - - add_library(port INTERFACE) -diff --git a/upb/json_decode.c b/upb/json_decode.c -index bb33744..1fadd26 100644 ---- a/upb/json_decode.c -+++ b/upb/json_decode.c -@@ -1160,7 +1160,7 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) { - static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg, - const upb_msgdef *m) { - upb_msgval val; -- const upb_fielddef *f; -+ const upb_fielddef *f = NULL; - upb_msg *submsg; - - switch (jsondec_peek(d)) { diff --git a/external_imported/vcpkg/ports/upb/portfile.cmake b/external_imported/vcpkg/ports/upb/portfile.cmake index d7cdef245..374b8e4ea 100644 --- a/external_imported/vcpkg/ports/upb/portfile.cmake +++ b/external_imported/vcpkg/ports/upb/portfile.cmake @@ -3,24 +3,55 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF 160625a9728b4031a21ad1e1c0146ea2c3a851eb # 2021-10-19 - SHA512 13b205dd4278600e6ec05c829dc6c7e449747cccb118a3b83abc0ab5ef0ab180feb364ac84da8075471697fbba798ed3d9d763934d7fe9a64ac0560f5f9d3e83 + REF e4635f223e7d36dfbea3b722a4ca4807a7e882e2 # 2022-06-21 + SHA512 c5d48b1d87be7db65ad1f04f5ab43d694958d0e6892fd79c29993e564a402891fcd24ee9d34a9ca642ad20b80c02d3157675885edb6bd3bbc8cf5f29cc3be32c HEAD_REF master PATCHES - fix-uwp.patch - fix-cmakelists.patch - add-all-libs-target.patch - add-cmake-install.patch + 0001-make-cmakelists-py.patch + 0002-fix-uwp.patch ) +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/cmake/make_cmakelists.py" "cmake/CMakeLists.txt" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME make_cmakelists) + +vcpkg_replace_string("${SOURCE_PATH}/cmake/CMakeLists.txt" "/third_party/utf8_range)" "utf8_range)") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + codegen VCPKG_UPB_BUILD_CODEGEN +) + +if(NOT VCPKG_UPB_BUILD_CODEGEN) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" "${CURRENT_HOST_INSTALLED_DIR}/tools/upb") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/cmake" + OPTIONS ${FEATURE_OPTIONS} + "-DVCPKG_UPB_HOST_INCLUDE_DIR=${CURRENT_HOST_INSTALLED_DIR}/include" ) -vcpkg_cmake_install() +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_cmake_config_fixup() -vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") +if (VCPKG_UPB_BUILD_CODEGEN) + vcpkg_copy_tools( + AUTO_CLEAN + TOOL_NAMES + protoc-gen-upbdefs + protoc-gen-upb + ) +else() + configure_file("${CMAKE_CURRENT_LIST_DIR}/upb-config-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/upb/upb-config-vcpkg-tools.cmake" @ONLY) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/upb/fuzz" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/upb/upb-config-vcpkg-tools.cmake b/external_imported/vcpkg/ports/upb/upb-config-vcpkg-tools.cmake new file mode 100644 index 000000000..cd5f21ff6 --- /dev/null +++ b/external_imported/vcpkg/ports/upb/upb-config-vcpkg-tools.cmake @@ -0,0 +1,10 @@ +file(GLOB UPB_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/upb/protoc-gen-upb*") + +foreach(PLUGIN ${UPB_PLUGINS}) + get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE) + add_executable(upb::${PLUGIN_NAME} IMPORTED) + set_property(TARGET upb::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(upb::${PLUGIN_NAME} PROPERTIES + IMPORTED_LOCATION_RELEASE "${PLUGIN}" + ) +endforeach() diff --git a/external_imported/vcpkg/ports/upb/vcpkg.json b/external_imported/vcpkg/ports/upb/vcpkg.json index 2f9c03412..26897ea8f 100644 --- a/external_imported/vcpkg/ports/upb/vcpkg.json +++ b/external_imported/vcpkg/ports/upb/vcpkg.json @@ -1,9 +1,17 @@ { "name": "upb", - "version-date": "2021-10-19", + "version-date": "2022-06-21", "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", "homepage": "https://github.com/protocolbuffers/upb/", + "license": "BSD-2-Clause", "dependencies": [ + { + "name": "upb", + "host": true, + "features": [ + "codegen" + ] + }, { "name": "vcpkg-cmake", "host": true @@ -12,5 +20,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "codegen": { + "description": "Build code generator machinery", + "dependencies": [ + "abseil", + "protobuf" + ] + } + } } diff --git a/external_imported/vcpkg/ports/urdfdom-headers/fix-include-path.patch b/external_imported/vcpkg/ports/urdfdom-headers/fix-include-path.patch index 6ecfad8eb..e29dddaf7 100644 --- a/external_imported/vcpkg/ports/urdfdom-headers/fix-include-path.patch +++ b/external_imported/vcpkg/ports/urdfdom-headers/fix-include-path.patch @@ -1,12 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25c3704..247ca0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,7 +54,7 @@ install(FILES + DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} COMPONENT cmake) + + # Make the package config file +-if (NOT MSVC) ++if (1) + set(PACKAGE_DESC "Unified Robot Description Format") + set(pkg_conf_file "urdfdom_headers.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) diff --git a/cmake/urdfdom_headers-config.cmake.in b/cmake/urdfdom_headers-config.cmake.in -index 4686d39..026b65e 100644 +index b53e466..b35805a 100644 --- a/cmake/urdfdom_headers-config.cmake.in +++ b/cmake/urdfdom_headers-config.cmake.in @@ -3,8 +3,8 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED) endif() set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE) --set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/include") +-set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") +set(@PACKAGE_NAME@_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") -include("${@PACKAGE_NAME@_DIR}/@PACKAGE_NAME@Export.cmake") diff --git a/external_imported/vcpkg/ports/urdfdom-headers/portfile.cmake b/external_imported/vcpkg/ports/urdfdom-headers/portfile.cmake index eac0cb96e..08df291fd 100644 --- a/external_imported/vcpkg/ports/urdfdom-headers/portfile.cmake +++ b/external_imported/vcpkg/ports/urdfdom-headers/portfile.cmake @@ -1,41 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF a15d906ff16a7fcbf037687b9c63b946c0cc04a1 # 1.0.5 - SHA512 794acd3b077a1d8fa27d0a698cecbce42f3a7b30f867e79b9897b0d97dcd9e80d2cf3b0c75ee34f628f73afb871c439fffe4a1d7ed85c7fac6553fb1e5b56c36 + REF 2981892df9da19d10f58dc84de63820e4f554f63 # 1.1.0 + SHA512 cc47d2fb9781f4c7f1af25ccfb4dc8cc9e72d2ec22cb2fe16866bb0e7ed40494181a413dcd74cb0407b4f5c20262f076f8ae87d605ba0e5477a57ff29ba30967 HEAD_REF master PATCHES fix-include-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/urdfdom_headers) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake PACKAGE_NAME urdfdom_headers) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom_headers/cmake TARGET_PATH share/urdfdom_headers) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom_headers/cmake PACKAGE_NAME urdfdom_headers) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) - vcpkg_fixup_pkgconfig() -endif() - -# The config files for this project use underscore -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers) -endif() +vcpkg_fixup_pkgconfig() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -endif() +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/external_imported/vcpkg/ports/urdfdom-headers/vcpkg.json b/external_imported/vcpkg/ports/urdfdom-headers/vcpkg.json index 4326813b3..f0b3c11c7 100644 --- a/external_imported/vcpkg/ports/urdfdom-headers/vcpkg.json +++ b/external_imported/vcpkg/ports/urdfdom-headers/vcpkg.json @@ -1,7 +1,17 @@ { "name": "urdfdom-headers", - "version-string": "1.0.5", - "port-version": 2, + "version": "1.1.0", "description": "The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.", - "homepage": "https://github.com/ros/urdfdom_headers" + "homepage": "https://github.com/ros/urdfdom_headers", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/urdfdom/0001_use_math_defines.patch b/external_imported/vcpkg/ports/urdfdom/0001_use_math_defines.patch index b791533aa..5197b5693 100644 --- a/external_imported/vcpkg/ports/urdfdom/0001_use_math_defines.patch +++ b/external_imported/vcpkg/ports/urdfdom/0001_use_math_defines.patch @@ -1,26 +1,15 @@ -From a374a5b04db27fde58a11cc2ba5ea10a0d0a7dad Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sun, 3 Sep 2017 23:24:55 +0300 -Subject: [PATCH] define _USE_MATH_DEFINES - ---- - urdf_parser/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 333226e..2158965 100644 +index ac7c079..67f175d 100644 --- a/urdf_parser/CMakeLists.txt +++ b/urdf_parser/CMakeLists.txt -@@ -1,5 +1,9 @@ - include_directories(include) +@@ -23,6 +23,10 @@ macro(add_urdfdom_library) + SOVERSION ${URDF_MAJOR_MINOR_VERSION}) + endmacro() +if(MSVC) -+add_definitions(-D_USE_MATH_DEFINES) ++ add_definitions(-D_USE_MATH_DEFINES) +endif() + - add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp) - target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) --- -2.12.2.windows.2 - + if(TARGET console_bridge::console_bridge) + set(console_bridge_link_libs "console_bridge::console_bridge") + else() diff --git a/external_imported/vcpkg/ports/urdfdom/0002_fix_exports.patch b/external_imported/vcpkg/ports/urdfdom/0002_fix_exports.patch deleted file mode 100644 index 727883f8d..000000000 --- a/external_imported/vcpkg/ports/urdfdom/0002_fix_exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sun, 3 Sep 2017 23:55:11 +0300 -Subject: [PATCH] fix exports - ---- - urdf_parser/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 2158965..c209228 100644 ---- a/urdf_parser/CMakeLists.txt -+++ b/urdf_parser/CMakeLists.txt -@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS - add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp) - target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) -+set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - - add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp) - target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) -+set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - - # -------------------------------- - --- -2.12.2.windows.2 - diff --git a/external_imported/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch b/external_imported/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch deleted file mode 100644 index 4e149b1a0..000000000 --- a/external_imported/vcpkg/ports/urdfdom/0004_fix-dependency-console_bridge.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92762f1..f0d115d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --find_package(console_bridge 0.3 REQUIRED) -+find_package(console_bridge REQUIRED) - include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) - link_directories(${console_bridge_LIBRARY_DIRS}) - diff --git a/external_imported/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch b/external_imported/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch index a0b654fd0..902d6337d 100644 --- a/external_imported/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch +++ b/external_imported/vcpkg/ports/urdfdom/0005-fix-config-and-install.patch @@ -1,101 +1,40 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0d115d..9acbfbe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,17 +58,18 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" - - enable_testing() - --add_subdirectory(urdf_parser) -- - if(WIN32 AND NOT CYGWIN) - set(CMAKE_CONFIG_INSTALL_DIR CMake) - else() - set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/) - endif() - -+add_subdirectory(urdf_parser) -+ - set(PKG_NAME ${PROJECT_NAME}) - set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world) - set(PKG_DEPENDS urdfdom_headers console_bridge) -+set(PKG_EXPORTS urdfdom) - set(cmake_conf_file "cmake/urdfdom-config.cmake") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file} diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in -index fb81b47..8b4ef8f 100644 +index d8eb93d..3e5c42a 100644 --- a/cmake/urdfdom-config.cmake.in +++ b/cmake/urdfdom-config.cmake.in @@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED) endif() set(@PKG_NAME@_CONFIG_INCLUDED TRUE) --set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@") +-set(@PKG_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "@TinyXML_INCLUDE_DIRS@") +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - ++ +set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@") -+ + +if (0) foreach(lib @PKG_LIBRARIES@) set(onelib "${lib}-NOTFOUND") - find_library(onelib ${lib} -@@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@) - list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) - list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) + set(onelibd "${lib}-NOTFOUND") +@@ -29,10 +33,14 @@ foreach(lib @PKG_LIBRARIES@) + endif() + list(APPEND @PKG_NAME@_TARGETS @PROJECT_NAME@::${lib}) endforeach() +endif() + +include(CMakeFindDependencyMacro) +find_dependency(console_bridge) -+ -+foreach(exp @PKG_EXPORTS@) -+ include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) -+endforeach() -+ -+set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) -\ No newline at end of file -diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 731b57a..ebd0586 100644 ---- a/urdf_parser/CMakeLists.txt -+++ b/urdf_parser/CMakeLists.txt -@@ -39,10 +39,32 @@ if(BUILD_TESTING) - add_subdirectory(test) - endif() --INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test -- DESTINATION ${CMAKE_INSTALL_BINDIR}) --INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+INSTALL( -+ TARGETS -+ check_urdf -+ urdf_to_graphiz -+ urdf_mem_test -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+INSTALL( -+ TARGETS -+ urdfdom_model -+ urdfdom_world -+ urdfdom_sensor -+ urdfdom_model_state -+ EXPORT -+ urdfdom -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+install( -+ EXPORT urdfdom -+ DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} -+ NAMESPACE "${PROJECT_NAME}::" -+ FILE "urdfdomExport.cmake" -+) + foreach(dep @PKG_DEPENDS@) + if(NOT ${dep}_FOUND) +- find_package(${dep}) ++ find_dependency(${dep}) + endif() + list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) + list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) +@@ -41,3 +49,5 @@ endforeach() + foreach(exp @PKG_EXPORTS@) + include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) + endforeach() + - INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) diff --git a/external_imported/vcpkg/ports/urdfdom/portfile.cmake b/external_imported/vcpkg/ports/urdfdom/portfile.cmake index ef1dfa803..5a2e8a0ae 100644 --- a/external_imported/vcpkg/ports/urdfdom/portfile.cmake +++ b/external_imported/vcpkg/ports/urdfdom/portfile.cmake @@ -1,26 +1,26 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ros/urdfdom - REF 0da4b20675cdbe14b532d484a1c17df85b4e1584 # 1.0.4 - SHA512 cad59307fef466e2bbe3769a4123571d48223ea25a80dde76cb25c9f6dfc961570090d188ddaf8fc93f41f355ffa240eb00abe20cdea4a5ee3e49f56d1258686 - HEAD_REF master - PATCHES - 0001_use_math_defines.patch - 0002_fix_exports.patch - 0004_fix-dependency-console_bridge.patch - 0005-fix-config-and-install.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO ros/urdfdom + REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0 + SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276 + HEAD_REF master + PATCHES + 0001_use_math_defines.patch + 0005-fix-config-and-install.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz urdf_to_graphviz AUTO_CLEAN) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(CONFIG_PATH CMake) diff --git a/external_imported/vcpkg/ports/urdfdom/vcpkg.json b/external_imported/vcpkg/ports/urdfdom/vcpkg.json index 0b9ee602c..97764859e 100644 --- a/external_imported/vcpkg/ports/urdfdom/vcpkg.json +++ b/external_imported/vcpkg/ports/urdfdom/vcpkg.json @@ -1,9 +1,10 @@ { "name": "urdfdom", - "version": "1.0.4", - "port-version": 5, + "version": "3.1.0", "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", + "supports": "!staticcrt", "dependencies": [ "console-bridge", "tinyxml", diff --git a/external_imported/vcpkg/ports/usd/portfile.cmake b/external_imported/vcpkg/ports/usd/portfile.cmake index 58d328ea8..b1eda984b 100644 --- a/external_imported/vcpkg/ports/usd/portfile.cmake +++ b/external_imported/vcpkg/ports/usd/portfile.cmake @@ -1,6 +1,15 @@ # Don't file if the bin folder exists. We need exe and custom files. 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, +and does not expect to be updated to work with current versions soon. See +https://github.com/PixarAnimationStudios/USD/issues/1600 + +If you must use this port in your project, pin a version of tbb of 2020_U3 or older via a manifest file. +See https://vcpkg.io/en/docs/examples/versioning.getting-started.html for instructions. +]=]) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/USD diff --git a/external_imported/vcpkg/ports/usd/vcpkg.json b/external_imported/vcpkg/ports/usd/vcpkg.json index dd308fe5d..55dd4cc3e 100644 --- a/external_imported/vcpkg/ports/usd/vcpkg.json +++ b/external_imported/vcpkg/ports/usd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usd", "version-string": "20.08", - "port-version": 2, + "port-version": 3, "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", "supports": "!x86", diff --git a/external_imported/vcpkg/ports/usockets/CMakeLists.txt b/external_imported/vcpkg/ports/usockets/CMakeLists.txt index 69a742db1..b2daed66d 100644 --- a/external_imported/vcpkg/ports/usockets/CMakeLists.txt +++ b/external_imported/vcpkg/ports/usockets/CMakeLists.txt @@ -12,10 +12,12 @@ else() set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL") endif() -find_package(unofficial-libuv CONFIG REQUIRED) -find_path(LIBUV_INCLUDE_DIR uv.h) -find_library(LIBUV_LIBRARY NAMES libuv) -include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src") +find_package(libuv CONFIG REQUIRED) +if (TARGET uv) + set(LIBUV_LIBRARY uv) +else() + set(LIBUV_LIBRARY uv_a) +endif() file(GLOB SOURCES src/*.c src/eventing/*.c) @@ -39,7 +41,7 @@ endif() if (CMAKE_USE_NETWORK) list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/networking) - list(APPEND USOCKETS_EXT_LIBS Ws2_32) + list(APPEND USOCKETS_EXT_LIBS ws2_32) endif() add_library(uSockets ${SOURCES}) @@ -49,7 +51,7 @@ if (${LIBUS_USE_LIBUV}) endif() target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) -target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR}) +target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) install(TARGETS uSockets diff --git a/external_imported/vcpkg/ports/usockets/vcpkg.json b/external_imported/vcpkg/ports/usockets/vcpkg.json index 9300c6e94..f65c263ac 100644 --- a/external_imported/vcpkg/ports/usockets/vcpkg.json +++ b/external_imported/vcpkg/ports/usockets/vcpkg.json @@ -1,8 +1,10 @@ { "name": "usockets", "version": "0.8.1", + "port-version": 2, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", + "license": "Apache-2.0", "dependencies": [ "libuv", { diff --git a/external_imported/vcpkg/ports/utf8proc/export-cmake-targets.patch b/external_imported/vcpkg/ports/utf8proc/export-cmake-targets.patch index 9c75e4a46..26d2f9651 100644 --- a/external_imported/vcpkg/ports/utf8proc/export-cmake-targets.patch +++ b/external_imported/vcpkg/ports/utf8proc/export-cmake-targets.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea6b80e..5e5e829 100644 +index edf1d80..bf9d982 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ add_library (utf8proc +@@ -26,7 +26,7 @@ add_library (utf8proc ) # expose header path, for when this is part of a larger cmake project @@ -11,17 +11,16 @@ index ea6b80e..5e5e829 100644 if (BUILD_SHARED_LIBS) # Building shared library -@@ -51,10 +51,13 @@ set_target_properties (utf8proc PROPERTIES - - if (UTF8PROC_INSTALL) +@@ -57,10 +57,12 @@ if (UTF8PROC_INSTALL) + include(GNUInstallDirs) + install(FILES utf8proc.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") install(TARGETS utf8proc + EXPORT unofficial-utf8proc-config - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - + ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" + ) + install(EXPORT unofficial-utf8proc-config DESTINATION share/unofficial-utf8proc) -+ - install( - FILES - "${PROJECT_SOURCE_DIR}/utf8proc.h" + configure_file(libutf8proc.pc.cmakein libutf8proc.pc @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libutf8proc.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + endif() diff --git a/external_imported/vcpkg/ports/utf8proc/portfile.cmake b/external_imported/vcpkg/ports/utf8proc/portfile.cmake index e8e4f9c05..35aac48cf 100644 --- a/external_imported/vcpkg/ports/utf8proc/portfile.cmake +++ b/external_imported/vcpkg/ports/utf8proc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc - REF 3203baa7374d67132384e2830b2183c92351bffc # v2.6.1 - SHA512 582831c4c2d118f1c6f9e6de812878b96428d8fa1b9a2bbca32633a3853cb1981c917c724d2a8db51282ed13fd1654ca45f5d227731f5b90b17e7fc3acc93b07 + REF 8ca6144c85c165987cb1c5d8395c7314e13d4cd7 # v2.7.0 + SHA512 a33e2335e9978e7a49bc0ecf9128abd93466d9daffb052f9db88097e771588547df6ba07b6028c77621e60f3b85eab78a368d9b8266ecb97ad7bdfae2b4866fc PATCHES export-cmake-targets.patch ) @@ -30,4 +30,6 @@ else() endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" "${UTF8PROC_H}") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/utf8proc/vcpkg.json b/external_imported/vcpkg/ports/utf8proc/vcpkg.json index 4ecd90926..75a1bdcc4 100644 --- a/external_imported/vcpkg/ports/utf8proc/vcpkg.json +++ b/external_imported/vcpkg/ports/utf8proc/vcpkg.json @@ -1,8 +1,10 @@ { "name": "utf8proc", - "version": "2.6.1", + "version": "2.7.0", + "port-version": 1, "description": "Clean C library for processing UTF-8 Unicode data.", "homepage": "https://github.com/JuliaLang/utf8proc", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/utfcpp/portfile.cmake b/external_imported/vcpkg/ports/utfcpp/portfile.cmake index 7eb0f6242..6342ff583 100644 --- a/external_imported/vcpkg/ports/utfcpp/portfile.cmake +++ b/external_imported/vcpkg/ports/utfcpp/portfile.cmake @@ -6,24 +6,23 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUTF8_INSTALL=ON -DUTF8_SAMPLES=OFF -DUTF8_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/utf8cpp) +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/utf8cpp TARGET_PATH share/utf8cpp) + vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH lib/cmake/utf8cpp) endif() # Header only -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -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/external_imported/vcpkg/ports/utfcpp/vcpkg.json b/external_imported/vcpkg/ports/utfcpp/vcpkg.json index d7f0c4639..b8c6a1dca 100644 --- a/external_imported/vcpkg/ports/utfcpp/vcpkg.json +++ b/external_imported/vcpkg/ports/utfcpp/vcpkg.json @@ -1,6 +1,18 @@ { "name": "utfcpp", "version": "3.2.1", + "port-version": 1, "description": "UTF-8 with C++ in a Portable Way", - "homepage": "https://github.com/nemtrif/utfcpp" + "homepage": "https://github.com/nemtrif/utfcpp", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/uvatlas/openexr.patch b/external_imported/vcpkg/ports/uvatlas/openexr.patch new file mode 100644 index 000000000..ab1e79092 --- /dev/null +++ b/external_imported/vcpkg/ports/uvatlas/openexr.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e9c3d37..52c6f93 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -228,6 +228,7 @@ if(MSVC) + endif() + + if((MSVC_VERSION GREATER_EQUAL 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8) ++ AND NOT TARGET OpenEXR::OpenEXR # as dependency of package directxtex + AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0))) + foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) + target_compile_options(${t} PRIVATE "$<$>:/guard:ehcont>") diff --git a/external_imported/vcpkg/ports/uvatlas/portfile.cmake b/external_imported/vcpkg/ports/uvatlas/portfile.cmake index 21defe3fb..84c1e5cc8 100644 --- a/external_imported/vcpkg/ports/uvatlas/portfile.cmake +++ b/external_imported/vcpkg/ports/uvatlas/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF mar2022 - SHA512 8e532a754d1b07108c98e099221a1c6eb39e1386e2e61d8694e041fcdf0556d1aeaed703018b18aa0cc2972c1b874fedd4d7b5e5694c504e70d623a78e6eb421 + REF jul2022 + SHA512 fe857766d598c73badba6eda3128775f9195d0a1a7658e9b48a77dd631da4bbd31ab946bc98f8e9b229a6bc99a785ac3da693cb655be0f6a1393ad176e26b688 HEAD_REF main + PATCHES + openexr.patch ) if (VCPKG_HOST_IS_LINUX) @@ -30,14 +32,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/mar2022/uvatlastool.exe" - FILENAME "uvatlastool-mar2022.exe" - SHA512 d4179b755a9f8d81c180c86ae7e2d177dd0842f78fc81d96b87fa6551407a038edb8250529e45a9b783514e27cbe2a806bac4af47c3db5c34a6e4adc602f5ff4 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/jul2022/uvatlastool.exe" + FILENAME "uvatlastool-jul2022.exe" + SHA512 3c1f7d25f10a85895d75d4102e127af857c4eae1bb3773b84e0f48e30ba9be517469b1a7504c6859e5b75481fea427052af21f3491f6993bf3dc360829c086b8 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -46,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jul2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/external_imported/vcpkg/ports/uvatlas/vcpkg.json b/external_imported/vcpkg/ports/uvatlas/vcpkg.json index 98c6954a7..4bdbb8d40 100644 --- a/external_imported/vcpkg/ports/uvatlas/vcpkg.json +++ b/external_imported/vcpkg/ports/uvatlas/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uvatlas", - "version-date": "2022-03-24", + "version-date": "2022-07-30", + "port-version": 1, "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/external_imported/vcpkg/ports/uvw/CMakeLists.txt b/external_imported/vcpkg/ports/uvw/CMakeLists.txt index f359b7351..d768716f7 100644 --- a/external_imported/vcpkg/ports/uvw/CMakeLists.txt +++ b/external_imported/vcpkg/ports/uvw/CMakeLists.txt @@ -1,10 +1,14 @@ cmake_minimum_required(VERSION 3.8) project(uvw) -find_package(unofficial-libuv CONFIG REQUIRED) +find_package(libuv CONFIG REQUIRED) add_library(uvw INTERFACE) -target_link_libraries(uvw INTERFACE unofficial::libuv::libuv) +if (TARGET uv) + target_link_libraries(uvw INTERFACE uv) +else() + target_link_libraries(uvw INTERFACE uv_a) +endif() install(TARGETS uvw EXPORT uvw diff --git a/external_imported/vcpkg/ports/uvw/portfile.cmake b/external_imported/vcpkg/ports/uvw/portfile.cmake index a6eb493e7..21145e6f9 100644 --- a/external_imported/vcpkg/ports/uvw/portfile.cmake +++ b/external_imported/vcpkg/ports/uvw/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw - REF 77af4a3fc4d932a52652807506fc50d0e58e875c # v2.7.0_libuv_v1.39 - SHA512 b9ee4a60928fbcea84a9c551ce4d97095db68352546054116ecc8303eaeb46aecaef15ca2e5d3ebd14d8292be798fdea50b353ffdc727faa43c23cfd314ea407 + REF 3db9e8f75a4351325e1ea00e17586af2b00cf1ea # v2.12.1_libuv_v1.44 + SHA512 35e799fe877abc26ae44d20c9b5b292497d1468d9f89c0fc19b96a0b0712e35084480100e2fe7324353e2c3805c2f018e89192357d974bfd009af9b58bfcb7ec ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/uvw/") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright/readme/package files -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw) +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}") diff --git a/external_imported/vcpkg/ports/uvw/uvw-config.cmake b/external_imported/vcpkg/ports/uvw/uvw-config.cmake index 1fdc98f53..3a6d792f9 100644 --- a/external_imported/vcpkg/ports/uvw/uvw-config.cmake +++ b/external_imported/vcpkg/ports/uvw/uvw-config.cmake @@ -1,2 +1,2 @@ -find_package(unofficial-libuv CONFIG REQUIRED) +find_package(libuv CONFIG REQUIRED) include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake") diff --git a/external_imported/vcpkg/ports/uvw/vcpkg.json b/external_imported/vcpkg/ports/uvw/vcpkg.json index bd896d781..ea974cfb1 100644 --- a/external_imported/vcpkg/ports/uvw/vcpkg.json +++ b/external_imported/vcpkg/ports/uvw/vcpkg.json @@ -1,10 +1,19 @@ { "name": "uvw", - "version-string": "2.7.0", - "port-version": 1, + "version": "2.12.1", + "port-version": 2, "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", + "license": "MIT", "dependencies": [ - "libuv" + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/uwebsockets/portfile.cmake b/external_imported/vcpkg/ports/uwebsockets/portfile.cmake index 31984b177..52be4185d 100644 --- a/external_imported/vcpkg/ports/uwebsockets/portfile.cmake +++ b/external_imported/vcpkg/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF v20.11.0 - SHA512 cd4efb386b4d140c6ccbfa92e8be1d3c9b896474a3074b95ad35bedde9face80a1e4bae594359555010d76c2ccf8243b29e97079de8b0f18cda510274135b8e0 + REF e4c6fbf8defda2aeaf941e5c656bdc589d7d331c #v20.14.0 + SHA512 c58210819f26eacad4f2d269c1625e46391174a1840423fd198c03549b7a99be2e27ccd83c8711537618b8aa3087bcf71a6146582f221a205eb6d92c2f891ba1 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json index fe675dbb0..e36e533f2 100644 --- a/external_imported/vcpkg/ports/uwebsockets/vcpkg.json +++ b/external_imported/vcpkg/ports/uwebsockets/vcpkg.json @@ -1,8 +1,9 @@ { "name": "uwebsockets", - "version-semver": "20.11.0", + "version-semver": "20.14.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", "dependencies": [ "usockets", "zlib" diff --git a/external_imported/vcpkg/ports/v8/vcpkg.json b/external_imported/vcpkg/ports/v8/vcpkg.json index 5f82dceb8..eae65fcd0 100644 --- a/external_imported/vcpkg/ports/v8/vcpkg.json +++ b/external_imported/vcpkg/ports/v8/vcpkg.json @@ -1,10 +1,11 @@ { "name": "v8", "version": "9.1.269.39", - "port-version": 3, + "port-version": 4, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", - "supports": "!(arm | arm64 | uwp | osx)", + "license": "BSD-3-Clause", + "supports": "!(arm | arm64 | uwp | osx | linux)", "dependencies": [ { "name": "glib", diff --git a/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake b/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake index 83c60e6fa..62907f3b5 100644 --- a/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake +++ b/external_imported/vcpkg/ports/vamp-sdk/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH ) -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} -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() @@ -17,5 +15,4 @@ 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) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json b/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json index 1c2156b51..f032335d1 100644 --- a/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json +++ b/external_imported/vcpkg/ports/vamp-sdk/vcpkg.json @@ -1,16 +1,15 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "port-version": 2, + "port-version": 4, "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", + "license": "MIT", "supports": "!uwp", "dependencies": [ - "libsndfile", { - "name": "vcpkg-cmake", - "host": true + "name": "libsndfile", + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch b/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch new file mode 100644 index 000000000..a06321649 --- /dev/null +++ b/external_imported/vcpkg/ports/vc/Fix-internal-func-export.patch @@ -0,0 +1,16 @@ +diff --git a/src/support_x86.cpp b/src/support_x86.cpp +index 0ab9669..d5c17ba 100644 +--- a/src/support_x86.cpp ++++ b/src/support_x86.cpp +@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits) + #endif + } + +-Vc_TARGET_NO_SIMD +-bool isImplementationSupported(Implementation impl) ++ ++Vc_TARGET_NO_SIMD ++bool Vc_VDECL isImplementationSupported(Vc::Implementation impl) + { + CpuId::init(); + diff --git a/external_imported/vcpkg/ports/vc/portfile.cmake b/external_imported/vcpkg/ports/vc/portfile.cmake index 35a5461e9..d185dd587 100644 --- a/external_imported/vcpkg/ports/vc/portfile.cmake +++ b/external_imported/vcpkg/ports/vc/portfile.cmake @@ -1,23 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.2 - SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf + REF 1.4.3 + SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef HEAD_REF 1.4 - PATCHES - "correct_cmake_config_path.patch" + PATCHES + correct_cmake_config_path.patch + Fix-internal-func-export.patch #remove it in next version ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Vc/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Vc/") 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/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/external_imported/vcpkg/ports/vc/vcpkg.json b/external_imported/vcpkg/ports/vc/vcpkg.json index 14ab1d8bb..09bb05010 100644 --- a/external_imported/vcpkg/ports/vc/vcpkg.json +++ b/external_imported/vcpkg/ports/vc/vcpkg.json @@ -1,8 +1,18 @@ { "name": "vc", - "version": "1.4.2", - "port-version": 2, + "version": "1.4.3", "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", - "supports": "!arm64" + "license": "BSD-3-Clause", + "supports": "!arm64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch b/external_imported/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch index 35e9f5537..a84f436c4 100644 --- a/external_imported/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch +++ b/external_imported/vcpkg/ports/vcglib/consume-vcpkg-eigen3.patch @@ -1,125 +1,5 @@ -diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h -index 5b9d858..f091b4b 100644 ---- a/vcg/complex/algorithms/curve_on_manifold.h -+++ b/vcg/complex/algorithms/curve_on_manifold.h -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h -index d004d7b..13d5167 100644 ---- a/vcg/complex/algorithms/harmonic.h -+++ b/vcg/complex/algorithms/harmonic.h -@@ -24,7 +24,7 @@ - #define __VCGLIB_HARMONIC_FIELD - - #include --#include -+#include - - namespace vcg { - namespace tri { -diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h -index 2e1e24f..76311e2 100644 ---- a/vcg/complex/algorithms/implicit_smooth.h -+++ b/vcg/complex/algorithms/implicit_smooth.h -@@ -23,7 +23,7 @@ - #ifndef __VCG_IMPLICIT_SMOOTHER - #define __VCG_IMPLICIT_SMOOTHER - --#include -+#include - #include - #include - #include -diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h -index 41b5a29..f25d6f9 100644 ---- a/vcg/complex/algorithms/inertia.h -+++ b/vcg/complex/algorithms/inertia.h -@@ -24,8 +24,8 @@ - #define _VCG_INERTIA_ - - --#include --#include -+#include -+#include - #include - - namespace vcg -diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h -index cf5c36d..3b8f1a5 100644 ---- a/vcg/complex/algorithms/parametrization/poisson_solver.h -+++ b/vcg/complex/algorithms/parametrization/poisson_solver.h -@@ -24,7 +24,7 @@ - #ifndef VCG_POISSON_SOLVER - #define VCG_POISSON_SOLVER - --#include -+#include - - #include - #include -diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h -index 441121b..0a96146 100644 ---- a/vcg/complex/algorithms/update/curvature.h -+++ b/vcg/complex/algorithms/update/curvature.h -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - namespace vcg { - namespace tri { -diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h -index b2b8c63..ab04b6b 100644 ---- a/vcg/complex/algorithms/update/curvature_fitting.h -+++ b/vcg/complex/algorithms/update/curvature_fitting.h -@@ -38,11 +38,11 @@ - #include - #include - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - - namespace vcg { -diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h -index bd2c94f..fd837d7 100644 ---- a/vcg/complex/algorithms/update/fitmaps.h -+++ b/vcg/complex/algorithms/update/fitmaps.h -@@ -34,10 +34,10 @@ - #include - #include "vcg/complex/algorithms/update/curvature_fitting.h" - --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #include - diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h -index 5cae402..81f32ff 100644 +index 5cae402f..e8f82258 100644 --- a/vcg/math/eigen.h +++ b/vcg/math/eigen.h @@ -53,10 +53,10 @@ struct ei_to_vcgtype; @@ -130,96 +10,10 @@ index 5cae402..81f32ff 100644 -#include "../../eigenlib/Eigen/Geometry" -#include "../../eigenlib/Eigen/Array" -#include "../../eigenlib/Eigen/Core" -+#include "../../eigen3/Eigen/LU" -+#include "../../eigen3/Eigen/Geometry" -+#include "../../eigen3/Eigen/Array" -+#include "../../eigen3/Eigen/Core" - - // add support for unsigned char and short int - namespace Eigen { -diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h -index a138e57..5291e0e 100644 ---- a/vcg/math/matrix44.h -+++ b/vcg/math/matrix44.h -@@ -30,8 +30,8 @@ - #include - #include - #include --#include --#include -+#include +#include - - namespace vcg { - -diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h -index deabf86..bd725d1 100644 ---- a/vcg/math/polar_decomposition.h -+++ b/vcg/math/polar_decomposition.h -@@ -26,8 +26,8 @@ - - #include - #include --#include --#include -+#include -+#include - - namespace vcg{ - -diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h -index 8522056..99a9de1 100644 ---- a/vcg/math/quadric.h -+++ b/vcg/math/quadric.h -@@ -26,7 +26,7 @@ - #include - #include - #include --#include ++#include ++#include +#include - namespace vcg { - namespace math { -diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h -index e9e238a..6861969 100644 ---- a/vcg/space/fitting3.h -+++ b/vcg/space/fitting3.h -@@ -29,8 +29,8 @@ - #include - #include - --#include --#include -+#include -+#include - - namespace vcg { - -diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h -index e9ac0ff..c6ff376 100644 ---- a/vcg/space/point_matching.h -+++ b/vcg/space/point_matching.h -@@ -27,8 +27,8 @@ - #include - #include - --#include --#include -+#include -+#include - #include - - namespace vcg -diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h -index e1208cf..a403d54 100644 ---- a/wrap/igl/smooth_field.h -+++ b/wrap/igl/smooth_field.h -@@ -25,7 +25,7 @@ - #define SMOOTHER_FIELD_H - - //eigen stuff --#include -+#include - - //vcg stuff - #include + // add support for unsigned char and short int + namespace Eigen { diff --git a/external_imported/vcpkg/ports/vcglib/fix-build.patch b/external_imported/vcpkg/ports/vcglib/fix-build.patch new file mode 100644 index 000000000..635805cd2 --- /dev/null +++ b/external_imported/vcpkg/ports/vcglib/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/vcg/simplex/tetrahedron/pos.h b/vcg/simplex/tetrahedron/pos.h +index d47348ce..078b1f6a 100644 +--- a/vcg/simplex/tetrahedron/pos.h ++++ b/vcg/simplex/tetrahedron/pos.h +@@ -385,7 +385,7 @@ public: + void Assert() + #ifdef _DEBUG + { +- HETYPE ht=*this; ++ BasePosType ht=*this; + ht.FlipT(); + ht.FlipT(); + assert(ht==*this); diff --git a/external_imported/vcpkg/ports/vcglib/portfile.cmake b/external_imported/vcpkg/ports/vcglib/portfile.cmake index 1af58bdcb..24c4cb6ae 100644 --- a/external_imported/vcpkg/ports/vcglib/portfile.cmake +++ b/external_imported/vcpkg/ports/vcglib/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cnr-isti-vclab/vcglib - REF v1.0.1 - SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 - PATCHES consume-vcpkg-eigen3.patch + REF 2022.02 + SHA512 1a4b04c53eb52d0d9864f4e942f0a06e6f4fe5f2b5686fa534b6c68b715941147d89ed6d83bce9dc8d0c7029460824ab1f73231ba6b7c32472becfe641e2a7cb + PATCHES + consume-vcpkg-eigen3.patch + fix-build.patch ) -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY) - file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg) file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap) file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/vcglib/vcpkg.json b/external_imported/vcpkg/ports/vcglib/vcpkg.json index bde2be1d1..d8d489802 100644 --- a/external_imported/vcpkg/ports/vcglib/vcpkg.json +++ b/external_imported/vcpkg/ports/vcglib/vcpkg.json @@ -1,8 +1,8 @@ { "name": "vcglib", - "version-string": "1.0.1", - "port-version": 1, + "version-string": "2022.02", "description": "library for manipulation, processing, cleaning, simplifying triangle meshes.", + "license": "GPL-3.0-only", "dependencies": [ "eigen3" ] diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-config/README.md b/external_imported/vcpkg/ports/vcpkg-cmake-config/README.md deleted file mode 100644 index 18e7bb9ac..000000000 --- a/external_imported/vcpkg/ports/vcpkg-cmake-config/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# vcpkg-cmake-config - -`vcpkg-cmake-config` provides `vcpkg_cmake_config_fixup()`, -a function which both: - -- Fixes common mistakes in port build systems, like using absolute paths -- Merges the debug and release config files. - -This function should almost always be used when a port has `*config.cmake` files, -even when the buildsystem of the project is not CMake. diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json index a99271b63..db965341a 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,7 @@ { "name": "vcpkg-cmake-config", - "version-date": "2022-02-06" + "version-date": "2022-02-06", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index 4045ae1ea..368e5809a 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -1,58 +1,4 @@ -#[===[.md: -# vcpkg_cmake_config_fixup - -Merge release and debug CMake targets and configs to support multiconfig generators. - -Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. - -```cmake -vcpkg_cmake_config_fixup( - [PACKAGE_NAME ] - [CONFIG_PATH ] - [TOOLS_PATH ] - [DO_NOT_DELETE_PARENT_CONFIG_PATH] - [NO_PREFIX_CORRECTION] -) -``` - -For many ports, `vcpkg_cmake_config_fixup()` on its own should work, -as `PACKAGE_NAME` defaults to `${PORT}` and `CONFIG_PATH` defaults to `share/${PACKAGE_NAME}`. -For ports where the package name passed to `find_package` is distinct from the port name, -`PACKAGE_NAME` should be changed to be that name instead. -For ports where the directory of the `*config.cmake` files cannot be set, -use the `CONFIG_PATH` to change the directory where the files come from. - -By default the parent directory of CONFIG_PATH is removed if it is named "cmake". -Passing the `DO_NOT_DELETE_PARENT_CONFIG_PATH` option disable such behavior, -as it is convenient for ports that install -more than one CMake package configuration file. - -The `NO_PREFIX_CORRECTION` option disables the correction of `_IMPORT_PREFIX` -done by vcpkg due to moving the config files. -Currently the correction does not take into account how the files are moved, -and applies a rather simply correction which in some cases will yield the wrong results. - -## How it Works - -1. Moves `/debug//*targets-debug.cmake` to `/share/${PACKAGE_NAME}`. -2. Transforms all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. -3. Transforms all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. -4. Fixes `${_IMPORT_PREFIX}` in auto generated targets. -5. Replaces `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs. -6. Merges INTERFACE_LINK_LIBRARIES of release and debug configurations. -7. Replaces `${CURRENT_INSTALLED_DIR}` with `${VCPKG_IMPORT_PREFIX}` in targets. -8. Removes `/debug//*config.cmake`. - -## Examples - -* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) -* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) -* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) -#]===] -if(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD) - return() -endif() -set(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) function(vcpkg_cmake_config_fixup) cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH;TOOLS_PATH" "") diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt similarity index 89% rename from external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt rename to external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt index 190455d9a..fb1da4696 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt @@ -111,7 +111,7 @@ endif() if(CMAKE_CXX_COMPILER_TARGET) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"") - else() + elseif(CMAKE_CXX_COMPILE_OPTIONS_TARGET) string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") endif() endif() @@ -143,10 +143,18 @@ foreach(incdir IN LISTS CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) endforeach() foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) - if(MSVC) - # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. - # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare + # When using MSVC, maybe transform /flags to -flags. + # When cross compiling, "/flags" may be an absolute path starting with /, so don't transform. + # Otherwise, transform to improve compatibility with scripts interpreting "/flags" as a path. + if(MSVC AND "${CMAKE_HOST_SYSTEM_NAME}" MATCHES "Windows") + # This implementation is imperfect because it fails on directories with trailing spaces, + # but those are rare. string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag}" STREQUAL "CXX") + string(APPEND ${flag}_FLAGS " -ZW:nostdlib") + endif() + endif() endif() string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake new file mode 100644 index 000000000..4f3183adf --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/portfile.cmake @@ -0,0 +1,14 @@ +if(VCPKG_CROSSCOMPILING) + # make FATAL_ERROR in CI when issue #16773 fixed + message(WARNING "vcpkg-cmake-get-vars is a host-only port; please mark it as a host port in your dependencies.") +endif() + +file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake new file mode 100644 index 000000000..d5b5c2b1c --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg-port-config.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json new file mode 100644 index 000000000..33b547882 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-cmake-get-vars", + "version-date": "2022-05-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake similarity index 62% rename from external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake rename to external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake index e8a1feec4..8ce706bdf 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg_cmake_get_vars.cmake @@ -1,43 +1,6 @@ -#[===[.md: -# vcpkg_cmake_get_vars +include_guard(GLOBAL) -Runs a cmake configure with a dummy project to extract certain cmake variables - -## Usage -```cmake -vcpkg_cmake_get_vars() -``` - -`vcpkg_cmake_get_vars()` sets `` to -a path to a generated CMake file, with the detected `CMAKE_*` variables -re-exported as `VCPKG_DETECTED_CMAKE_*`. - -Additionally sets, for `RELEASE` and `DEBUG`: -- VCPKG_COMBINED_CXX_FLAGS_ -- VCPKG_COMBINED_C_FLAGS_ -- VCPKG_COMBINED_SHARED_LINKER_FLAGS_ -- VCPKG_COMBINED_STATIC_LINKER_FLAGS_ -- VCPKG_COMBINED_EXE_LINKER_FLAGS_ - -Most users should use these pre-combined flags instead of attempting -to read the `VCPKG_DETECTED_*` flags directly. - -## Notes -Avoid usage in portfiles. - -All calls to `vcpkg_cmake_get_vars` will result in the same output file; -the output file is not generated multiple times. - -### Basic Usage - -```cmake -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") -message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") -``` -#]===] - -set(Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}") +set(Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "") function(vcpkg_cmake_get_vars out_file) cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/README.md b/external_imported/vcpkg/ports/vcpkg-cmake/README.md deleted file mode 100644 index b84c58869..000000000 --- a/external_imported/vcpkg/ports/vcpkg-cmake/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# vcpkg-cmake - -This port contains cmake functions for dealing with a CMake buildsystem. - -In the common case, `vcpkg_cmake_configure()` (with appropriate arguments) -followed by `vcpkg_cmake_install()` will be enough to build and install a port. -`vcpkg_cmake_build()` is provided for more complex cases. diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/copyright b/external_imported/vcpkg/ports/vcpkg-cmake/copyright deleted file mode 100644 index 2e4eac826..000000000 --- a/external_imported/vcpkg/ports/vcpkg-cmake/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/portfile.cmake index afc1ffbb4..0b7dd5020 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET) +if(VCPKG_CROSSCOMPILING) # make FATAL_ERROR in CI when issue #16773 fixed message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.") endif() @@ -7,10 +7,8 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake" - "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" - "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake index 2eb9f3723..f2a973d4e 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg-port-config.cmake @@ -1,4 +1,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json index dbfc761c4..f6f66b21a 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-07", + "version-date": "2022-08-18", + "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index 5520f0de3..efdb194fa 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -1,42 +1,4 @@ -#[===[.md: -# vcpkg_cmake_build - -Build a cmake project. - -```cmake -vcpkg_cmake_build( - [TARGET ] - [LOGFILE_BASE ] - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_build` builds an already-configured cmake project. -You can use the alias [`vcpkg_cmake_install()`] function -if your CMake build system supports the `install` TARGET, -and this is something we recommend doing whenever possible. -Otherwise, you can use `TARGET` to set the target to build. -This function defaults to not passing a target to cmake. - -[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md - -`LOGFILE_BASE` is used to set the base of the logfile names; -by default, this is `build`, and thus the logfiles end up being something like -`build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, -this is set to `install`, so you'll get log names like `install-x86-windows-dbg.log`. - -For build systems that are buggy when run in parallel, -using `DISABLE_PARALLEL` will run the build with only one job. - -Finally, `ADD_BIN_TO_PATH` adds the appropriate (either release or debug) -`bin/` directories to the path during the build, -such that executables run during the build will be able to access those DLLs. -#]===] -if(Z_VCPKG_CMAKE_BUILD_GUARD) - return() -endif() -set(Z_VCPKG_CMAKE_BUILD_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) function(vcpkg_cmake_build) cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "TARGET;LOGFILE_BASE" "") @@ -47,77 +9,82 @@ function(vcpkg_cmake_build) if(NOT DEFINED arg_LOGFILE_BASE) set(arg_LOGFILE_BASE "build") endif() - - set(build_args "") - set(target_args "") - set(parallel_args "") - set(no_parallel_args "") - - if(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Ninja") - set(build_args "-v") # verbose output - set(parallel_args "-j${VCPKG_CONCURRENCY}") - set(no_parallel_args "-j1") - elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "^Visual Studio") - set(build_args + vcpkg_list(SET build_param) + vcpkg_list(SET parallel_param) + vcpkg_list(SET no_parallel_param) + + if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") + vcpkg_list(SET build_param "-v") # verbose output + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "-j1") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") + vcpkg_list(SET build_param "/p:VCPkgLocalAppDataDisabled=true" "/p:UseIntelMKL=No" ) - set(parallel_args "/m") - elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "NMake Makefiles") + vcpkg_list(SET parallel_param "/m") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - set(build_args "VERBOSE=1") - set(parallel_args "-j${VCPKG_CONCURRENCY}") - set(no_parallel_args "") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - list(APPEND parallel_args -jobs "${VCPKG_CONCURRENCY}") - list(APPEND no_parallel_args -jobs 1) + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) else() message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() - if(DEFINED arg_TARGET) - set(target_args "--target" "${arg_TARGET}") + vcpkg_list(SET target_param) + if(arg_TARGET) + vcpkg_list(SET target_param "--target" "${arg_TARGET}") endif() - foreach(buildtype IN ITEMS debug release) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL buildtype) - if(buildtype STREQUAL "debug") - set(short_buildtype "dbg") - set(cmake_config "Debug") + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") + if("${build_type}" STREQUAL "debug") + set(short_build_type "dbg") + set(config "Debug") else() - set(short_buildtype "rel") - set(cmake_config "Release") + set(short_build_type "rel") + set(config "Release") endif() - message(STATUS "Building ${TARGET_TRIPLET}-${short_buildtype}") + message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") if(arg_ADD_BIN_TO_PATH) - set(env_path_backup "$ENV{PATH}") - if(buildtype STREQUAL "debug") + vcpkg_backup_env_variables(VARS PATH) + if("${build_type}" STREQUAL "debug") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") else() vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") endif() endif() - if (arg_DISABLE_PARALLEL) + if(arg_DISABLE_PARALLEL) vcpkg_execute_build_process( - COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${no_parallel_args} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_buildtype}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" ) else() vcpkg_execute_build_process( - COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${parallel_args} - NO_PARALLEL_COMMAND "${CMAKE_COMMAND}" --build . --config "${cmake_config}" ${target_args} -- ${build_args} ${no_parallel_args} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_buildtype}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${parallel_param} + NO_PARALLEL_COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-${short_build_type}" ) endif() if(arg_ADD_BIN_TO_PATH) - set(ENV{PATH} "${env_path_backup}") + vcpkg_restore_env_variables(VARS PATH) endif() endif() endforeach() diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index ed312a05d..8cb2b78ec 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -1,97 +1,4 @@ -#[===[.md: -# vcpkg_cmake_configure - -Configure a CMake buildsystem. - -```cmake -vcpkg_cmake_configure( - SOURCE_PATH - [LOGFILE_BASE ] - [DISABLE_PARALLEL_CONFIGURE] - [NO_CHARSET_FLAG] - [WINDOWS_USE_MSBUILD] - [GENERATOR ] - [OPTIONS - ...] - [OPTIONS_RELEASE - ...] - [OPTIONS_DEBUG - ...] - [MAYBE_UNUSED_VARIABLES - ...] -) -``` - -`vcpkg_cmake_configure` configures a CMake build system for use with -`vcpkg_cmake_buildsystem_build` and `vcpkg_cmake_buildsystem_install`. -`source-path` is where the source is located; by convention, -this is usually `${SOURCE_PATH}`, which is set by one of the `vcpkg_from_*` functions. -This function configures the build system for both Debug and Release builds by default, -assuming that `VCPKG_BUILD_TYPE` is not set; if it is, then it will only configure for -that build type. - -Use the `OPTIONS` argument to set the configure settings for both release and debug, -and use `OPTIONS_RELEASE` and `OPTIONS_DEBUG` to set the configure settings for -release only and debug only respectively. - -By default, when possible, `vcpkg_cmake_configure` uses [ninja-build] -as its build system. If the `WINDOWS_USE_MSBUILD` argument is passed, then -`vcpkg_cmake_configure` will use a Visual Studio generator on Windows; -on every other platform, `vcpkg_cmake_configure` just uses Ninja. - -[ninja-build]: https://ninja-build.org/ - -Additionally, one may pass the specific generator a port should use with `GENERATOR`. -This is useful if some project-specific buildsystem -has been wrapped in a CMake build system that doesn't perform an actual build. -If used for this purpose, it should be set to `"NMake Makefiles"`. -`vcpkg_cmake_buildsystem_build` and `install` do not support this being set to anything -except for NMake. - -For libraries which cannot be configured in parallel, -pass the `DISABLE_PARALLEL_CONFIGURE` flag. This is needed, for example, -if the library's build system writes back into the source directory during configure. -This also disables the `CMAKE_DISABLE_SOURCE_CHANGES` option. - -By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` -which set the default character set to utf-8 for MSVC. -If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. - -This function makes certain that all options passed in are used by the -underlying CMake build system. If there are options that might be unused, -perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. For example: -```cmake -vcpkg_cmake_configure( - ... - OPTIONS - -DBUILD_EXAMPLE=OFF - ... - MAYBE_UNUSED_VARIABLES - BUILD_EXAMPLE -) -``` - -`LOGFILE_BASE` is used to set the base of the logfile names; -by default, this is `config`, and thus the logfiles end up being something like -`config-x86-windows-dbg.log`. You can set it to anything you like; -if you set it to `config-the-first`, -you'll get something like `config-the-first-x86-windows.dbg.log`. - -## Notes -This command supplies many common arguments to CMake. To see the full list, examine the source. - -## Examples - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) -#]===] -if(Z_VCPKG_CMAKE_CONFIGURE_GUARD) - return() -endif() -set(Z_VCPKG_CMAKE_CONFIGURE_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) macro(z_vcpkg_cmake_configure_both_set_or_unset var1 var2) if(DEFINED ${var1} AND NOT DEFINED ${var2}) @@ -109,12 +16,16 @@ function(vcpkg_cmake_configure) ) if(NOT arg_Z_CMAKE_GET_VARS_USAGE AND DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) - message(WARNING "vcpkg_cmake_configure already called; this function should only be called once.") + message(WARNING "${CMAKE_CURRENT_FUNCTION} already called; this function should only be called once.") + endif() + if(arg_PREFER_NINJA) + message(WARNING "PREFER_NINJA has been deprecated in ${CMAKE_CURRENT_FUNCTION}. Please remove it from the portfile!") endif() if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_cmake_buildsystem_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() + if(NOT DEFINED arg_SOURCE_PATH) message(FATAL_ERROR "SOURCE_PATH must be set") endif() @@ -130,12 +41,14 @@ function(vcpkg_cmake_configure) set(configuring_message "Configuring ${TARGET_TRIPLET}") foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) - if(option MATCHES "^-D([^:=]*)[:=]") - list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + if("${option}" MATCHES "^-D([^:=]*)[:=]") + vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") endif() endforeach() - list(REMOVE_DUPLICATES manually_specified_variables) - list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) + foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) + vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") + endforeach() debug_message("manually specified variables: ${manually_specified_variables}") endif() @@ -147,25 +60,36 @@ function(vcpkg_cmake_configure) endif() endif() - set(ninja_can_be_used ON) # Ninja as generator - set(ninja_host ON) # Ninja as parallel configurator - - if(host_architecture STREQUAL "x86") + set(ninja_host ON) # Ninja availability + if(host_architecture STREQUAL "x86" OR DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) # Prebuilt ninja binaries are only provided for x64 hosts - set(ninja_can_be_used OFF) - set(ninja_host OFF) - elseif(VCPKG_TARGET_IS_UWP) - # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility - set(ninja_can_be_used OFF) + find_program(NINJA NAMES ninja ninja-build) + if(NOT NINJA) + set(ninja_host OFF) + set(arg_DISABLE_PARALLEL_CONFIGURE ON) + set(arg_WINDOWS_USE_MSBUILD ON) + endif() endif() - set(generator "Ninja") - if(DEFINED arg_GENERATOR) - set(generator "${arg_GENERATOR}") - elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) - set(generator "") - set(arch "") + set(generator "") + set(architecture_options "") + if(arg_WINDOWS_USE_MSBUILD AND VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) + vcpkg_list(APPEND architecture_options "-A${arch}") + if(DEFINED VCPKG_PLATFORM_TOOLSET) + vcpkg_list(APPEND arg_OPTIONS "-T${VCPKG_PLATFORM_TOOLSET}") + endif() + if(NOT generator) + message(FATAL_ERROR "Unable to determine appropriate Visual Studio generator for triplet ${TARGET_TRIPLET}: + ENV{VisualStudioVersion} : $ENV{VisualStudioVersion} + VCPKG_TARGET_ARCHITECTURE: ${VCPKG_TARGET_ARCHITECTURE}") + endif() + elseif(DEFINED arg_GENERATOR) + set(generator "${arg_GENERATOR}") + elseif(ninja_host) + set(generator "Ninja") + elseif(NOT VCPKG_HOST_IS_WINDOWS) + set(generator "Unix Makefiles") endif() if(NOT generator) @@ -176,12 +100,13 @@ function(vcpkg_cmake_configure) "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") endif() - # If we use Ninja, make sure it's on PATH - if(generator STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + if(generator STREQUAL "Ninja") vcpkg_find_acquire_program(NINJA) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + # If we use Ninja, it must be on PATH for CMake's ExternalProject, + # cf. https://gitlab.kitware.com/cmake/cmake/-/issues/23355. get_filename_component(ninja_path "${NINJA}" DIRECTORY) vcpkg_add_to_path("${ninja_path}") - list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -195,7 +120,7 @@ function(vcpkg_cmake_configure) endif() if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) @@ -204,13 +129,13 @@ function(vcpkg_cmake_configure) endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") + vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=OFF") else() message(FATAL_ERROR "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " @@ -230,9 +155,8 @@ function(vcpkg_cmake_configure) z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() - list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) - list(APPEND arg_OPTIONS + vcpkg_list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" @@ -263,127 +187,95 @@ function(vcpkg_cmake_configure) "-DVCPKG_MANIFEST_INSTALL=OFF" ) - if(DEFINED arch) - list(APPEND arg_OPTIONS "-A${arch}") - endif() - # Sets configuration variables for macOS builds foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(JOIN VCPKG_${config_var} "\;" config_var_value) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") endif() endforeach() # Allow overrides / additional configuration variables from triplets if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) - list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS}) endif() if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) - list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}) endif() if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) - list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}) endif() - if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) - list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") + vcpkg_list(SET rel_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + ${architecture_options} + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + vcpkg_list(SET dbg_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" + -G "${generator}" + ${architecture_options} + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + + if(NOT arg_DISABLE_PARALLEL_CONFIGURE) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - if(NOT DEFINED ninja_path) - # if ninja_path was defined above, we've already done this - get_filename_component(ninja_path "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${ninja_path}") - endif() - #parallelize the configure step - set(parallel_configure_contents - "rule CreateProcess\n command = $process\n\n" + set(ninja_configure_contents + "rule CreateProcess\n command = \$process\n\n" ) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(line "build ../CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_release}\" ") - string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") - - if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") - list(JOIN arg_OPTIONS "\" \"" options) - string(APPEND line "\"${options}\" ") - endif() - if(DEFINED arg_OPTIONS_RELEASE AND NOT arg_OPTIONS_RELEASE STREQUAL "") - list(JOIN arg_OPTIONS_RELEASE "\" \"" options_rel) - string(APPEND line "\"${options_rel}\" ") - endif() - string(APPEND line "-G \"${generator}\" ") - string(APPEND line "\"-DCMAKE_BUILD_TYPE=Release\" ") - string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}\"") - string(APPEND parallel_configure_contents "${line}\n\n") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(line "build ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt: CreateProcess\n ") - string(APPEND line "process = \"${CMAKE_COMMAND}\" -E chdir \"${build_dir_debug}\" ") - string(APPEND line "\"${CMAKE_COMMAND}\" -S \"${arg_SOURCE_PATH}\" ") - - if(DEFINED arg_OPTIONS AND NOT arg_OPTIONS STREQUAL "") - list(JOIN arg_OPTIONS "\" \"" options) - string(APPEND line "\"${options}\" ") - endif() - if(DEFINED arg_OPTIONS_DEBUG AND NOT arg_OPTIONS_DEBUG STREQUAL "") - list(JOIN arg_OPTIONS_DEBUG "\" \"" options_dbg) - string(APPEND line "\"${options_dbg}\" ") - endif() - string(APPEND line "-G \"${generator}\" ") - string(APPEND line "\"-DCMAKE_BUILD_TYPE=Debug\" ") - string(APPEND line "\"-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug\"") - string(APPEND parallel_configure_contents "${line}\n\n") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") endif() file(MAKE_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure") - file(WRITE "${build_dir_release}/vcpkg-parallel-configure/build.ninja" "${parallel_configure_contents}") + file(WRITE + "${build_dir_release}/vcpkg-parallel-configure/build.ninja" + "${ninja_configure_contents}") message(STATUS "${configuring_message}") vcpkg_execute_required_process( - COMMAND ninja -v + COMMAND "${NINJA}" -v WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" LOGNAME "${arg_LOGFILE_BASE}" + SAVE_LOG_FILES ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt ../CMakeCache.txt ) - list(APPEND config_logs + + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") message(STATUS "${configuring_message}-dbg") vcpkg_execute_required_process( - COMMAND - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - ${arg_OPTIONS} - ${arg_OPTIONS_DEBUG} - -G "${generator}" - "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + COMMAND ${dbg_command} WORKING_DIRECTORY "${build_dir_debug}" LOGNAME "${arg_LOGFILE_BASE}-dbg" + SAVE_LOG_FILES CMakeCache.txt ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") message(STATUS "${configuring_message}-rel") vcpkg_execute_required_process( - COMMAND - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" - ${arg_OPTIONS} - ${arg_OPTIONS_RELEASE} - -G "${generator}" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + COMMAND ${rel_command} WORKING_DIRECTORY "${build_dir_release}" LOGNAME "${arg_LOGFILE_BASE}-rel" + SAVE_LOG_FILES CMakeCache.txt ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log") endif() @@ -405,7 +297,7 @@ function(vcpkg_cmake_configure) foreach(unused_variable IN LISTS unused_variables) if(unused_variable IN_LIST manually_specified_variables) debug_message("manually specified unused variable: ${unused_variable}") - list(APPEND all_unused_variables "${unused_variable}") + vcpkg_list(APPEND all_unused_variables "${unused_variable}") else() debug_message("unused variable (not manually specified): ${unused_variable}") endif() @@ -413,8 +305,8 @@ function(vcpkg_cmake_configure) endforeach() if(DEFINED all_unused_variables) - list(REMOVE_DUPLICATES all_unused_variables) - list(JOIN all_unused_variables "\n " all_unused_variables) + vcpkg_list(REMOVE_DUPLICATES all_unused_variables) + vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) message(WARNING "The following variables are not used in CMakeLists.txt: ${all_unused_variables} Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. diff --git a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake index 6eddcfb91..2bd8b4ea7 100644 --- a/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake +++ b/external_imported/vcpkg/ports/vcpkg-cmake/vcpkg_cmake_install.cmake @@ -1,29 +1,4 @@ -#[===[.md: -# vcpkg_cmake_install - -Build and install a cmake project. - -```cmake -vcpkg_cmake_install( - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_install` transparently forwards to [`vcpkg_cmake_build()`], -with additional parameters to set the `TARGET` to `install`, -and to set the `LOGFILE_ROOT` to `install` as well. - -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md - -## Examples: - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -#]===] -if(Z_VCPKG_CMAKE_INSTALL_GUARD) - return() -endif() -set(Z_VCPKG_CMAKE_INSTALL_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) function(vcpkg_cmake_install) cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" "" "") diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake index 7df06a5bc..7935b09b4 100644 --- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/portfile.cmake @@ -2,6 +2,9 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/copyright" "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake" + "${CMAKE_CURRENT_LIST_DIR}/python310._pth" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth b/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth new file mode 100644 index 000000000..f53ed18de --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/python310._pth @@ -0,0 +1,7 @@ +python310.zip +Lib +Lib/site-packages +. + +# Uncomment to run site.main() automatically +#import site diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json index 36e86bb1b..f2e187d0d 100644 --- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2022-02-12", + "version-date": "2022-06-30", + "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "supports": "native" } diff --git a/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake index c13019651..8b0a01646 100644 --- a/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake +++ b/external_imported/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -1,70 +1,116 @@ -#[===[.md: -# x_vcpkg_get_python_packages - -Experimental -Retrieve needed python packages - -## Usage -```cmake -x_vcpkg_get_python_packages( - PYTHON_EXECUTABLE - PACKAGES ... -) -``` -## Parameters - -### PYTHON_EXECUTABLE -Full path to the python executable - -### PACKAGES -List of python packages to acquire - -#]===] include_guard(GLOBAL) function(x_vcpkg_get_python_packages) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_EXECUTABLE" "PACKAGES") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_VERSION;PYTHON_EXECUTABLE;REQUIREMENTS_FILE;OUT_PYTHON_VAR" "PACKAGES") + + if(DEFINED arg_PYTHON_VERSION AND NOT DEFINED arg_PYTHON_EXECUTABLE) + vcpkg_find_acquire_program(PYTHON${arg_PYTHON_VERSION}) + set(arg_PYTHON_EXECUTABLE "${PYTHON${arg_PYTHON_VERSION}}") + endif() + + if(NOT DEFINED arg_PYTHON_EXECUTABLE AND NOT DEFINED arg_PYTHON_VERSION) + message(FATAL_ERROR "PYTHON_EXECUTABLE or PYTHON_VERSION must be specified.") + elseif(NOT DEFINED arg_PYTHON_VERSION) + if(arg_PYTHON_EXECUTABLE MATCHES "(python3|python-3)") + set(arg_PYTHON_VERSION 3) + else() + set(arg_PYTHON_VERSION 2) + endif() + endif() - if(NOT DEFINED arg_PYTHON_EXECUTABLE) - message(FATAL_ERROR "PYTHON_EXECUTABLE must be specified.") + if(NOT DEFINED arg_OUT_PYTHON_VAR) + set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}") endif() - if(NOT DEFINED arg_PACKAGES) - message(FATAL_ERROR "PACKAGES must be specified.") + + if(NOT DEFINED arg_PACKAGES AND NOT DEFINED arg_REQUIREMENTS_FILE) + message(FATAL_ERROR "PACKAGES or REQUIREMENTS_FILE must be specified.") endif() if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY) - - if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + set(ENV{PYTHONNOUSERSITE} "1") + if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + #if(NOT EXISTS "${python_dir}/python310._pth" AND PYTHON_EXECUTABLE MATCHES "python3") + # file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}") + #endif() if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - ) - vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + if(arg_PYTHON_VERSION STREQUAL 3) + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 + SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") + elseif(arg_PYTHON_VERSION STREQUAL 2) + vcpkg_download_distfile(PYFILE + URLS "https://bootstrap.pypa.io/pip/2.7/get-pip.py" + FILENAME "get-pip.py" + SHA512 8c74bdaff57a2dcf2aa69c4c218b7d5f3bf4a470dbda2d7c8d1b53862c84e2a83cd04c3cd20cf80dc0e4076b113a734413e31d6a9853f41e894398e7f88f848e + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE}" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") + endif() endif() - foreach(_package IN LISTS arg_PACKAGES) - vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") - endforeach() + vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install virtualenv --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-virtualenv-${TARGET_TRIPLET}") else() - foreach(_package IN LISTS arg_PACKAGES) - vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") - endforeach() + vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" virtualenv --no-warn-script-location #${_package} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "easy-install-virtualenv-${TARGET_TRIPLET}") endif() - else() # outside vcpkg - foreach(package IN LISTS arg_PACKAGES) - vcpkg_execute_in_download_mode(COMMAND ${arg_PYTHON_EXECUTABLE} -c "import ${package}" RESULT_VARIABLE HAS_ERROR) - if(HAS_ERROR) - message(FATAL_ERROR "Python package '${package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${arg_PACKAGES}") - endif() - endforeach() endif() + set(venv_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv") + file(REMOVE_RECURSE "${venv_path}") # Remove old venv + file(MAKE_DIRECTORY "${venv_path}") + if(CMAKE_HOST_WIN32) + file(MAKE_DIRECTORY "${python_dir}/DLLs") + set(python_sub_path /Scripts) + set(python_venv virtualenv) + if(arg_PYTHON_VERSION STREQUAL 3) + file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts") + endif() + set(python_venv_options "--app-data" "${venv_path}/data") + else() + set(python_sub_path /bin) + if(arg_PYTHON_VERSION STREQUAL 3) + set(python_venv venv) + elseif(arg_PYTHON_VERSION STREQUAL 2) + set(python_venv virtualenv) + endif() + set(python_venv_options --symlinks) + endif() + + set(ENV{PYTHONNOUSERSITE} "1") + message(STATUS "Setting up python virtual environmnent...") + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "venv-setup-${TARGET_TRIPLET}") + vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}") + set(${arg_OUT_PYTHON_VAR} "${venv_path}${python_sub_path}/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") + set(ENV{VIRTUAL_ENV} "${venv_path}") + unset(ENV{PYTHONHOME}) + unset(ENV{PYTHONPATH}) + if(DEFINED arg_REQUIREMENTS_FILE) + message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}") + endif() + if(DEFINED arg_PACKAGES) + message(STATUS "Installing python packages: ${arg_PACKAGES}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-packages-${TARGET_TRIPLET}") + endif() + message(STATUS "Setting up python virtual environmnent...finished.") + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE) + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE) endfunction() diff --git a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake index 3542ba928..229050aea 100644 --- a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake +++ b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake @@ -1,4 +1,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_configure.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_install.cmake") - -file(REAL_PATH "${CMAKE_CURRENT_LIST_DIR}/../../tools/vcpkg-gn/gn${CMAKE_EXECUTABLE_SUFFIX}" VCPKG_GN) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") diff --git a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json index 26d89e680..6dd718376 100644 --- a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg.json @@ -1,8 +1,10 @@ { "name": "vcpkg-gn", "version-date": "2021-11-16", - "port-version": 1, + "port-version": 2, "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", "supports": "native & !x86", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake index 87aaba85d..39de456e4 100644 --- a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake +++ b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake @@ -1,36 +1,5 @@ -#[===[.md: -# vcpkg_gn_configure - -Generate Ninja (GN) targets - -## Usage: -```cmake -vcpkg_gn_configure( - SOURCE_PATH - [OPTIONS ] - [OPTIONS_DEBUG ] - [OPTIONS_RELEASE ] -) -``` - -## Parameters: -### SOURCE_PATH (required) -The path to the GN project. - -### OPTIONS -Options to be passed to both the debug and release targets. -Note: Must be provided as a space-separated string. - -### OPTIONS_DEBUG (space-separated string) -Options to be passed to the debug target. - -### OPTIONS_RELEASE (space-separated string) -Options to be passed to the release target. -#]===] -if(Z_VCPKG_GN_CONFIGURE_GUARD) - return() -endif() -set(Z_VCPKG_GN_CONFIGURE_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") function(z_vcpkg_gn_configure_generate) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;CONFIG;ARGS" "") diff --git a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake index 517046b54..8b9c3b2b7 100644 --- a/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake +++ b/external_imported/vcpkg/ports/vcpkg-gn/vcpkg_gn_install.cmake @@ -1,33 +1,5 @@ -#[===[.md: -# vcpkg_gn_install - -Installs a GN project. - -In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. - -## Usage: -```cmake -vcpkg_gn_install( - SOURCE_PATH - [TARGETS ...] -) -``` - -## Parameters: -### SOURCE_PATH -The path to the source directory - -### TARGETS -Only install the specified targets. - -Note: includes must be handled separately - -[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md -#]===] -if(Z_VCPKG_GN_INSTALL_GUARD) - return() -endif() -set(Z_VCPKG_GN_INSTALL_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) +include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_real_path.cmake") function(z_vcpkg_gn_install_get_target_type out_var) cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET" "") diff --git a/external_imported/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake b/external_imported/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake new file mode 100644 index 000000000..855bf3e47 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-gn/z_vcpkg_gn_real_path.cmake @@ -0,0 +1,4 @@ +include_guard(GLOBAL) + +file(REAL_PATH "${CMAKE_CURRENT_LIST_DIR}/../../tools/vcpkg-gn/gn${CMAKE_EXECUTABLE_SUFFIX}" VCPKG_GN) +set(VCPKG_GN "${VCPKG_GN}" CACHE INTERNAL "") diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/README.md b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/README.md deleted file mode 100644 index ac99412c2..000000000 --- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# vcpkg-pkgconfig-get-modules - -**Experimental: will change or be removed at any time** - -`vcpkg-pkgconfig-get-modules` provides `x_vcpkg_pkgconfig_get_modules()`, a function which simplifies calling -`pkg-config` in portfiles in order to gather dependencies for exotic buildsystems. diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json index 06a3a549e..f38c13d4d 100644 --- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,6 +1,9 @@ { "name": "vcpkg-pkgconfig-get-modules", "version-date": "2022-02-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", + "license": "MIT", "dependencies": [ { "name": "pkgconf", diff --git a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake index 5a4dec12b..0ed124cff 100644 --- a/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake +++ b/external_imported/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake @@ -1,49 +1,4 @@ -#[===[.md: -# x_vcpkg_pkgconfig_get_modules - -Experimental -Retrieve required module information from pkgconfig modules - -## Usage -```cmake -x_vcpkg_pkgconfig_get_modules( - PREFIX - MODULES ... - [CFLAGS] - [LIBS] - [LIBRARIES] - [LIBRARIES_DIRS] - [INCLUDE_DIRS] -) -``` -## Parameters - -### PREFIX -Used variable prefix to use - -### MODULES -List of pkgconfig modules to retrieve information for. - -### LIBS -Returns `"${PKGCONFIG}" --libs` in _LIBS_(DEBUG|RELEASE) - -### LIBRARIES -Returns `"${PKGCONFIG}" --libs-only-l` in _LIBRARIES_(DEBUG|RELEASE) - -### LIBRARIES_DIRS -Returns `"${PKGCONFIG}" --libs-only-L` in _LIBRARIES_DIRS_(DEBUG|RELEASE) - -### INCLUDE_DIRS -Returns `"${PKGCONFIG}" --cflags-only-I` in _INCLUDE_DIRS_(DEBUG|RELEASE) - -## Examples - -* [qt5-base](https://github.com/microsoft/vcpkg/blob/master/ports/qt5-base/portfile.cmake) -#]===] -if(Z_VCPKG_PKGCONFIG_GET_MODULES_GUARD) - return() -endif() -set(Z_VCPKG_PKGCONFIG_GET_MODULES_GUARD ON CACHE INTERNAL "guard variable") +include_guard(GLOBAL) function(x_vcpkg_pkgconfig_get_modules) cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS" "PREFIX" "MODULES") diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/copyright b/external_imported/vcpkg/ports/vcpkg-qmake/copyright deleted file mode 100644 index 2e4eac826..000000000 --- a/external_imported/vcpkg/ports/vcpkg-qmake/copyright +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-qmake/portfile.cmake index 78afac087..d2ff5db15 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-qmake/portfile.cmake @@ -1,7 +1,7 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake index 763a7521f..325cba3b9 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake +++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg-port-config.cmake @@ -1,4 +1,4 @@ include_guard(GLOBAL) -include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_qmake_configure.cmake") diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json index af140d3c2..727763343 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg.json @@ -1,6 +1,8 @@ { "name": "vcpkg-qmake", - "version-date": "2022-02-14", + "version-date": "2022-05-10", + "port-version": 1, + "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "supports": "native", "dependencies": [ @@ -9,6 +11,9 @@ "name": "qtbase", "default-features": false }, - "vcpkg-cmake" + { + "name": "vcpkg-cmake-get-vars", + "host": true + } ] } diff --git a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake index 86222e099..89edab5d8 100644 --- a/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake +++ b/external_imported/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake @@ -1,37 +1,5 @@ -#[===[.md: -# vcpkg_qmake_configure - -Configure a qmake-based project. - -###User setable triplet variables: -VCPKG_OSX_DEPLOYMENT_TARGET: Determines QMAKE_MACOSX_DEPLOYMENT_TARGET -VCPKG_QMAKE_COMMAND: Path to qmake. (default: "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}") -VCPKG_QT_CONF_(RELEASE|DEBUG): Path to qt.config being used for RELEASE/DEBUG. (default: "${CURRENT_INSTALLED_DIR}/tools/Qt6/qt_(release|debug).conf") -VCPKG_QMAKE_OPTIONS(_RELEASE|_DEBUG)?: Extra options to pass to QMake - -```cmake -vcpkg_qmake_configure( - SOURCE_PATH - [QMAKE_OPTIONS arg1 [arg2 ...]] - [QMAKE_OPTIONS_RELEASE arg1 [arg2 ...]] - [QMAKE_OPTIONS_DEBUG arg1 [arg2 ...]] - [OPTIONS arg1 [arg2 ...]] - [OPTIONS_RELEASE arg1 [arg2 ...]] - [OPTIONS_DEBUG arg1 [arg2 ...]] -) -``` - -### SOURCE_PATH -The path to the *.pro qmake project file. - -### QMAKE_OPTIONS, QMAKE_OPTIONS\_RELEASE, QMAKE_OPTIONS\_DEBUG -options directly passed to qmake with the form QMAKE_X=something or CONFIG=something - -### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG -The options passed after -- to qmake. - -#]===] include_guard(GLOBAL) + function(vcpkg_qmake_configure) cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "QMAKE_OPTIONS;QMAKE_OPTIONS_RELEASE;QMAKE_OPTIONS_DEBUG;OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG") diff --git a/external_imported/vcpkg/ports/vcpkg-tool-gn/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-gn/portfile.cmake new file mode 100644 index 000000000..a8c42daa4 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-gn/portfile.cmake @@ -0,0 +1,62 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program GN) +set(search_names gn gn.exe) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/gn") + +set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH) + 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) + 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() + +set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") +set(download_filename "gn-${gn_platform}.zip") +vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" +) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn") +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/gn" +) + +z_vcpkg_find_acquire_program_find_internal("${program}" + PATHS ${paths_to_search} + NAMES ${search_names} +) + +message(STATUS "Using gn: ${GN}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/gn/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/external_imported/vcpkg/ports/vcpkg-tool-gn/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-gn/vcpkg.json new file mode 100644 index 000000000..2239a3aa5 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-gn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vcpkg-tool-gn", + "version-date": "2022-04-16", + "description": "GN build system", + "homepage": "https://gn.googlesource.com/gn/", + "license": null, + "supports": "native" +} diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/fix_linker_detection.patch b/external_imported/vcpkg/ports/vcpkg-tool-meson/fix_linker_detection.patch deleted file mode 100644 index 89e6dfa21..000000000 --- a/external_imported/vcpkg/ports/vcpkg-tool-meson/fix_linker_detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tools/meson/mesonbuild/compilers/detect.py b/tools/meson/mesonbuild/compilers/detect.py -index 1eacecfa8..74668da1a 100644 ---- a/tools/meson/mesonbuild/compilers/detect.py -+++ b/tools/meson/mesonbuild/compilers/detect.py -@@ -292,7 +292,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker - linkers = default_linkers - popen_exceptions = {} - for linker in linkers: -- if not {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'}.isdisjoint(linker): -+ if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker): - arg = '/?' - elif not {'ar2000', 'ar2000.exe'}.isdisjoint(linker): - arg = '?' -diff --git a/tools/meson/mesonbuild/linkers/detect.py b/tools/meson/mesonbuild/linkers/detect.py -index 0bfd7083b..323801d9a 100644 ---- a/tools/meson/mesonbuild/linkers/detect.py -+++ b/tools/meson/mesonbuild/linkers/detect.py -@@ -72,6 +72,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty - override = [] # type: T.List[str] - value = env.lookup_binary_entry(for_machine, comp_class.language + '_ld') - if value is not None: -+ compiler = value - override = comp_class.use_linker_args(value[0]) - check_args += override - diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake index c4a941146..680083a45 100644 --- a/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake +++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/portfile.cmake @@ -5,17 +5,17 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(program MESON) -set(program_version 0.60.2) +set(program_version 0.63.0) set(program_name meson) set(search_names meson meson.py) set(interpreter PYTHON3) set(apt_package_name "meson") set(brew_package_name "meson") -set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b) +set(ref bb91cea0d66d8d036063dedec1f194d663399cdf) set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") set(download_filename "meson-${ref}.tar.gz") -set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0) +set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -46,10 +46,11 @@ if(NOT "${program}") file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") z_vcpkg_apply_patches( SOURCE_PATH "${CURRENT_PACKAGES_DIR}" - PATCHES meson-intl.patch - fix_linker_detection.patch + PATCHES + meson-intl.patch ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) endif() z_vcpkg_find_acquire_program_find_internal("${program}" diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake new file mode 100644 index 000000000..887c4adbe --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(SCRIPT_MESON "${CMAKE_CURRENT_LIST_DIR}/../../tools/meson/meson.py") diff --git a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json index 82a1d87ae..70c9690af 100644 --- a/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json +++ b/external_imported/vcpkg/ports/vcpkg-tool-meson/vcpkg.json @@ -1,8 +1,8 @@ { "name": "vcpkg-tool-meson", - "version": "0.60.2", - "port-version": 2, + "version": "0.63", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", + "license": "Apache-2.0", "supports": "native" } diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake b/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake new file mode 100644 index 000000000..eb4ef16df --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/portfile.cmake @@ -0,0 +1,30 @@ +set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled) + +vcpkg_download_distfile( + LONG_PATH_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/2056.diff" # stable? + FILENAME 2056.diff + SHA512 90f17c2cbb5e0c5b41de748f75a3fc3e0c9da8837a0507c8570a49affe15ae7258661dc1f1bc201574847d93ea8b7fe4cbecfffd868395d50ca821033c5f295d +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ninja-build/ninja + REF 170c387a7461d476523ae29c115a58f16e4d3430 + SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521 + HEAD_REF master + PATCHES + "${LONG_PATH_PATCH}" # Long path support windows + use-internal-re2c.patch +) +set(VCPKG_BUILD_TYPE release) #we only need release here! +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_tools( + TOOL_NAMES ninja + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/ninja" + AUTO_CLEAN +) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/use-internal-re2c.patch b/external_imported/vcpkg/ports/vcpkg-tool-ninja/use-internal-re2c.patch new file mode 100644 index 000000000..0b8326321 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/use-internal-re2c.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42094d2..d4eda66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,7 +43,7 @@ endif() + + # --- optional re2c + find_program(RE2C re2c) +-if(RE2C) ++if(0) + # the depfile parser and ninja lexers are generated using re2c. + function(re2c IN OUT) + add_custom_command(DEPENDS ${IN} OUTPUT ${OUT} diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake new file mode 100644 index 000000000..8bf42e9f6 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg-port-config.cmake @@ -0,0 +1 @@ +set(NINJA "${CMAKE_CURRENT_LIST_DIR}/../../tools/ninja/ninja@VCPKG_TARGET_EXECUTABLE_SUFFIX@") diff --git a/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json new file mode 100644 index 000000000..e1eac6120 --- /dev/null +++ b/external_imported/vcpkg/ports/vcpkg-tool-ninja/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "vcpkg-tool-ninja", + "version-date": "2022-03-31", + "port-version": 1, + "description": "Ninja is a small build system with a focus on speed.", + "homepage": "https://ninja-build.org/", + "license": "Apache-2.0", + "supports": "native", + "dependencies": [ + "vcpkg-cmake", + "vcpkg-cmake-config" + ] +} diff --git a/external_imported/vcpkg/ports/vectorclass/portfile.cmake b/external_imported/vcpkg/ports/vectorclass/portfile.cmake index ae5823889..dd4311d5f 100644 --- a/external_imported/vcpkg/ports/vectorclass/portfile.cmake +++ b/external_imported/vcpkg/ports/vectorclass/portfile.cmake @@ -1,22 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vectorclass/version2 - REF v2.00.01 - SHA512 2e1f714cf0e23cf7986f0e78b4c1eeab4da6434ac92449b81990931e19ae189df6fbbef50f11e9532a41dc6eaff0a4fea840349a3747621ff537bbd7519f2c3d + REF v2.02.00 + SHA512 758cf12309ba9d5b1cc22db197d024880f62778de939af80f575dad9a3a2c3f256bc3228ee3dbd41a9da6e88835318f362b8255ff32bc8cadfe12bd2be4c36b5 HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/external_imported/vcpkg/ports/vectorclass/vcpkg.json b/external_imported/vcpkg/ports/vectorclass/vcpkg.json index 40b26d754..1be19e61a 100644 --- a/external_imported/vcpkg/ports/vectorclass/vcpkg.json +++ b/external_imported/vcpkg/ports/vectorclass/vcpkg.json @@ -1,8 +1,18 @@ { "name": "vectorclass", - "version-string": "2.00.01", - "port-version": 2, + "version-string": "2.02.00", "description": "C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors", "homepage": "https://github.com/vectorclass/version2", - "supports": "!(arm | arm64)" + "license": "Apache-2.0", + "supports": "!(arm | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/vkfft/portfile.cmake b/external_imported/vcpkg/ports/vkfft/portfile.cmake new file mode 100644 index 000000000..23c2a86d7 --- /dev/null +++ b/external_imported/vcpkg/ports/vkfft/portfile.cmake @@ -0,0 +1,12 @@ +# header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DTolm/VkFFT + REF fc981ecc022ae7932d4d906bed3cf9def592ddf5 #v1.2.17 + SHA512 c2ffae4885fe75778743f4165475026a43ab2ad2df2e02774a2750ad77ad8ceb3c6ff22a5cec56af3913af46eeb48bc09d2e119a54d893daa13af1fd768d9a9f + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/vkFFT/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/VkFFT") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/vkfft/vcpkg.json b/external_imported/vcpkg/ports/vkfft/vcpkg.json new file mode 100644 index 000000000..8e656038c --- /dev/null +++ b/external_imported/vcpkg/ports/vkfft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vkfft", + "version": "1.2.17", + "description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library", + "homepage": "https://github.com/DTolm/VkFFT", + "license": "MIT" +} diff --git a/external_imported/vcpkg/ports/vlpp/fix-arm.patch b/external_imported/vcpkg/ports/vlpp/fix-arm.patch new file mode 100644 index 000000000..862e94f08 --- /dev/null +++ b/external_imported/vcpkg/ports/vlpp/fix-arm.patch @@ -0,0 +1,34 @@ +--- a/Import/Vlpp.h ++++ b/Import/Vlpp.h +@@ -50,13 +50,12 @@ + #define abstract + #endif +- ++#include + #if defined VCZH_MSVC + #include + #elif defined VCZH_GCC +-#include + #include + #include + #include + #define abstract + #define __thiscall + #define __forceinline inline +@@ -160,14 +159,14 @@ + #define UI64TOA_S _ui64toa_s + #define UI64TOW_S _ui64tow_s + #if defined VCZH_MSVC + #define INCRC(x) (_InterlockedIncrement((volatile long*)(x))) + #define DECRC(x) (_InterlockedDecrement((volatile long*)(x))) + #elif defined VCZH_GCC +-#define INCRC(x) (__sync_add_and_fetch(x, 1)) +-#define DECRC(x) (__sync_sub_and_fetch(x, 1)) ++#define INCRC(x) (__atomic_add_fetch(x, 1, __ATOMIC_SEQ_CST)) ++#define DECRC(x) (__atomic_sub_fetch(x, 1, __ATOMIC_SEQ_CST)) + #endif + #endif + + /*********************************************************************** + Basic Types + ***********************************************************************/ diff --git a/external_imported/vcpkg/ports/vlpp/portfile.cmake b/external_imported/vcpkg/ports/vlpp/portfile.cmake index b7f91d9ee..ee1591d87 100644 --- a/external_imported/vcpkg/ports/vlpp/portfile.cmake +++ b/external_imported/vcpkg/ports/vlpp/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 5dfe25c4f4997da2d7a23bdc80c2438e72d9813a # 0.11.0.0 SHA512 5d585e561246385b074c625a3644b79defa22328dab0ab14112c846cb917f384abb617a5f400971ca29e4ee5ac391b88b17ee65d594caf9ebf279806db669a4a HEAD_REF master + PATCHES fix-arm.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/external_imported/vcpkg/ports/vlpp/vcpkg.json b/external_imported/vcpkg/ports/vlpp/vcpkg.json index 3bc64f290..01662b300 100644 --- a/external_imported/vcpkg/ports/vlpp/vcpkg.json +++ b/external_imported/vcpkg/ports/vlpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "vlpp", - "version-string": "0.11.0.0", - "port-version": 2, + "version": "0.11.0.0", + "port-version": 3, "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc", "homepage": "https://github.com/vczh-libraries/Release", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/volk/portfile.cmake b/external_imported/vcpkg/ports/volk/portfile.cmake index fe58d7998..76fa4af58 100644 --- a/external_imported/vcpkg/ports/volk/portfile.cmake +++ b/external_imported/vcpkg/ports/volk/portfile.cmake @@ -20,6 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Put the file containing the license where vcpkg expects it -file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/volk/") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/volk/README.md" "${CURRENT_PACKAGES_DIR}/share/volk/copyright") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/volk/vcpkg.json b/external_imported/vcpkg/ports/volk/vcpkg.json index 32734f128..51387523f 100644 --- a/external_imported/vcpkg/ports/volk/vcpkg.json +++ b/external_imported/vcpkg/ports/volk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "volk", "version": "1.3.204", + "port-version": 1, "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", diff --git a/external_imported/vcpkg/ports/vtk-m/vcpkg.json b/external_imported/vcpkg/ports/vtk-m/vcpkg.json index e3b25e270..08ad663c1 100644 --- a/external_imported/vcpkg/ports/vtk-m/vcpkg.json +++ b/external_imported/vcpkg/ports/vtk-m/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vtk-m", "version-semver": "1.6.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/", - "supports": "x64 & !uwp", + "supports": "!x86 & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/vtk/fix-find-libharu.patch b/external_imported/vcpkg/ports/vtk/fix-find-libharu.patch new file mode 100644 index 000000000..4f707c757 --- /dev/null +++ b/external_imported/vcpkg/ports/vtk/fix-find-libharu.patch @@ -0,0 +1,36 @@ +diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake +index c87bb9c..0c0133e 100644 +--- a/CMake/vtkInstallCMakePackage.cmake ++++ b/CMake/vtkInstallCMakePackage.cmake +@@ -62,7 +62,6 @@ set(vtk_cmake_module_files + FindGLEW.cmake + FindJOGL.cmake + FindJsonCpp.cmake +- FindLibHaru.cmake + FindLibPROJ.cmake + FindLibXml2.cmake + FindLZ4.cmake +diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt +index bac8dce..c0b98cd 100644 +--- a/ThirdParty/libharu/CMakeLists.txt ++++ b/ThirdParty/libharu/CMakeLists.txt +@@ -4,16 +4,15 @@ vtk_module_third_party( + VERSION "2.4.0" + STANDARD_INCLUDE_DIRS + EXTERNAL +- PACKAGE LibHaru ++ PACKAGE unofficial-libharu CONFIG_MODE + # Unreleased. Requires these PRs: + # https://github.com/libharu/libharu/pull/157 + # https://github.com/libharu/libharu/pull/187 +- VERSION 2.4.0 +- TARGETS LibHaru::LibHaru ++ TARGETS unofficial::libharu::haru + STANDARD_INCLUDE_DIRS) + + include(vtkDetectLibraryType) +-vtk_detect_library_shared(vtklibharu LibHaru::LibHaru) ++vtk_detect_library_shared(vtklibharu unofficial::libharu::haru) + + set(HPDF_DLL 0) + if (WIN32 AND vtklibharu_is_shared) diff --git a/external_imported/vcpkg/ports/vtk/portfile.cmake b/external_imported/vcpkg/ports/vtk/portfile.cmake index 64dd5901a..7be2566dd 100644 --- a/external_imported/vcpkg/ports/vtk/portfile.cmake +++ b/external_imported/vcpkg/ports/vtk/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_from_github( fix-gdal.patch missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 + fix-find-libharu.patch ) # ============================================================================= @@ -143,6 +144,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "mpi" VTK_USE_MPI "all" VTK_BUILD_ALL_MODULES ) + # ============================================================================= # Configure & Install diff --git a/external_imported/vcpkg/ports/vtk/vcpkg.json b/external_imported/vcpkg/ports/vtk/vcpkg.json index fb5a115dc..244fd0688 100644 --- a/external_imported/vcpkg/ports/vtk/vcpkg.json +++ b/external_imported/vcpkg/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 10, + "port-version": 11, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -16,12 +16,7 @@ "default-features": false }, "jsoncpp", - { - "name": "libharu", - "features": [ - "notiffsymbols" - ] - }, + "libharu", "libjpeg-turbo", "liblzma", "libogg", diff --git a/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake b/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake index 45b6eddf9..64f31c6d0 100644 --- a/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake +++ b/external_imported/vcpkg/ports/vulkan-headers/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF 52a76fd0a693708eb8c25bd0ab7a1008091f64d4 #v1.2.203 - SHA512 e3a337f0f1d0d003db522385b40ed187416e2246e64718b7d980ecdd92ac400a9e96b06dbb52c6f09cf7725772b5772727efb61c0e2f3a67989fe693fa569d38 - HEAD_REF master + REF 2b55157592bf4c639b76cc16d64acaef565cc4b5 + SHA512 f1ea894ebc16d05d03addacba1e4dbd67fb5963d0fc4c084725bca5fb4e944eb7c46ef54febca8dd1530d36e9c8633001ba37ba3c24023a8d0391d030ca66ebe + HEAD_REF v1.3.224 ) # This must be vulkan as other vulkan packages expect it there. diff --git a/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json b/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json index 72f263045..b9b32fa77 100644 --- a/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json +++ b/external_imported/vcpkg/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.2.203", + "version": "1.3.224", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers" } diff --git a/external_imported/vcpkg/ports/wavpack/OpenSSL.patch b/external_imported/vcpkg/ports/wavpack/OpenSSL.patch deleted file mode 100644 index 6d8e956ad..000000000 --- a/external_imported/vcpkg/ports/wavpack/OpenSSL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ target_include_directories(wavpack - target_link_libraries(wavpack - PRIVATE - $<$:m> -- $<$:${OPENSSL_CRYPTO_LIBRARY}> -+ $<$:OpenSSL::Crypto> - ) - target_compile_definitions(wavpack - PRIVATE diff --git a/external_imported/vcpkg/ports/wavpack/fix-symbol-exports.patch b/external_imported/vcpkg/ports/wavpack/fix-symbol-exports.patch deleted file mode 100644 index 999a05417..000000000 --- a/external_imported/vcpkg/ports/wavpack/fix-symbol-exports.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -328,7 +328,7 @@ foreach(EXPORT_SYMBOL ${WAVPACK_EXPORT_SYMBOLS}) - list(APPEND FILE_CONTENTS "_${EXPORT_SYMBOL}\n") - endforeach() - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") - else() - set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym\;\n\n};\n\nVERS_2 {\n global: sym;\n} VERS_1\;") - file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") -@@ -340,7 +340,7 @@ list(APPEND FILE_CONTENTS "${EXPORT_SYMBOL}\;\n") - endforeach() - list(APPEND FILE_CONTENTS "local: *\; }\;") - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") - endif() - endif() - diff --git a/external_imported/vcpkg/ports/wavpack/portfile.cmake b/external_imported/vcpkg/ports/wavpack/portfile.cmake index 2c0dba8ad..0b0f85a40 100644 --- a/external_imported/vcpkg/ports/wavpack/portfile.cmake +++ b/external_imported/vcpkg/ports/wavpack/portfile.cmake @@ -1,17 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack - REF 5.4.0 - SHA512 4DD6C484032FDFB1BC0E9A95881677FADE39A5E07CB98713A6B29DF0E9A570D6D27856FCAF412A714A5D7708C9CC2ADACE03A06970B06C4C5B2987E7EB2E643D + REF 89ef99e84333534d9d43093a5264a398b5f1e14a #5.5.0 + SHA512 6d8a46461ea1a9fab129d705dda6167332e98da27b24323cbfba1827339222956e288ca3947b9a1f513d7eb6f957548cfcef717aa5ba5c3d3e43d29f98de3879 HEAD_REF master - PATCHES - OpenSSL.patch - fix-symbol-exports.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWAVPACK_INSTALL_DOCS=OFF -DWAVPACK_BUILD_PROGRAMS=OFF @@ -21,12 +17,12 @@ vcpkg_configure_cmake( -DWAVPACK_BUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WavPack) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WavPack) endif() vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/wavpack/vcpkg.json b/external_imported/vcpkg/ports/wavpack/vcpkg.json index 7918e036d..ad40d851e 100644 --- a/external_imported/vcpkg/ports/wavpack/vcpkg.json +++ b/external_imported/vcpkg/ports/wavpack/vcpkg.json @@ -1,8 +1,18 @@ { "name": "wavpack", - "version": "5.4.0", - "port-version": 1, + "version": "5.5.0", "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", - "supports": "!(arm | arm64)" + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/wayland-protocols/portfile.cmake b/external_imported/vcpkg/ports/wayland-protocols/portfile.cmake new file mode 100644 index 000000000..402c59856 --- /dev/null +++ b/external_imported/vcpkg/ports/wayland-protocols/portfile.cmake @@ -0,0 +1,36 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland-protocols + REF cd153943618bcf157896a6d0f1154d0ad62078a7 #1.23 + SHA512 aae49d168e467d554ada638887511fa696a9fae900c93067d97f9e3d405068dc87883933f09ca2a3ef8a04631fdcffb629c178ec6e4c247f0c2ff6c1aaaaa952 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/wayland/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") + file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") + file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") +endif() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/wayland-protocols/vcpkg.json b/external_imported/vcpkg/ports/wayland-protocols/vcpkg.json new file mode 100644 index 000000000..b85b39d12 --- /dev/null +++ b/external_imported/vcpkg/ports/wayland-protocols/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "wayland-protocols", + "version": "1.23", + "description": "wayland-protocols contains Wayland protocols that add functionality not available in the Wayland core protocol.", + "homepage": "https://wayland.freedesktop.org", + "license": "MIT", + "dependencies": [ + "wayland" + ] +} diff --git a/external_imported/vcpkg/ports/wayland/portfile.cmake b/external_imported/vcpkg/ports/wayland/portfile.cmake new file mode 100644 index 000000000..effb14119 --- /dev/null +++ b/external_imported/vcpkg/ports/wayland/portfile.cmake @@ -0,0 +1,65 @@ +if(NOT X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland + REF e60398b1755bfcdf09f040d3769131fe0d9762fc #1.19.0 + SHA512 f2f7dd9ff71e99cf3621ab45160f59b679de763e3fdef6fcef7e14947ad43ed7a86845a213c75bb7117fdda11a51035566225a12d3eb33e8c3fe2e4456eb801d + HEAD_REF master + PATCHES tests.patch +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Ddtd_validation=false + -Ddocumentation=false + -Dtests=false +) +vcpkg_install_meson() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/" AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-private${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-util${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/" AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-private${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-util${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal" "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/wayland-scanner.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/wayland-scanner.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() +endif() diff --git a/external_imported/vcpkg/ports/wayland/tests.patch b/external_imported/vcpkg/ports/wayland/tests.patch new file mode 100644 index 000000000..b58d55e2d --- /dev/null +++ b/external_imported/vcpkg/ports/wayland/tests.patch @@ -0,0 +1,30 @@ +diff --git a/meson.build b/meson.build +index 11c35fa67..26d69ade5 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,7 +91,9 @@ subdir('src') + if get_option('libraries') + subdir('cursor') + subdir('egl') +- subdir('tests') ++ if get_option('tests') ++ subdir('tests') ++ endif + if get_option('documentation') + subdir('doc') + endif +diff --git a/meson_options.txt b/meson_options.txt +index de588d137..dc6ea1d8a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -10,6 +10,10 @@ option('documentation', + description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', + type: 'boolean', + value: 'true') ++option('tests', ++ description: 'Build the tests', ++ type: 'boolean', ++ value: 'true') + option('dtd_validation', + description: 'Validate the protocol DTD (requires libxml2)', + type: 'boolean', diff --git a/external_imported/vcpkg/ports/wayland/vcpkg.json b/external_imported/vcpkg/ports/wayland/vcpkg.json new file mode 100644 index 000000000..2cb6f90ca --- /dev/null +++ b/external_imported/vcpkg/ports/wayland/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "wayland", + "version": "1.19.0", + "description": "Core Wayland window system code and protocol", + "homepage": "https://wayland.freedesktop.org", + "license": "MIT", + "supports": "!(windows | osx)", + "dependencies": [ + "expat", + "libffi", + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/webview2/portfile.cmake b/external_imported/vcpkg/ports/webview2/portfile.cmake new file mode 100644 index 000000000..d2b215616 --- /dev/null +++ b/external_imported/vcpkg/ports/webview2/portfile.cmake @@ -0,0 +1,55 @@ +if(VCPKG_TARGET_IS_UWP) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(VERSION 1.0.1210.39) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" + FILENAME "microsoft.web.webview2.${VERSION}.zip" + SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${VERSION}" + NO_REMOVE_ONE_LEVEL +) + +file(COPY + "${SOURCE_PATH}/build/native/include/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2LoaderStatic.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(COPY + "${SOURCE_PATH}/build/native/include-winrt/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY + "${SOURCE_PATH}/lib/Microsoft.Web.WebView2.Core.winmd" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll" + "${SOURCE_PATH}/runtimes/win-${VCPKG_TARGET_ARCHITECTURE}/native_uap/Microsoft.Web.WebView2.Core.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() +if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-webview2-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webview2") + +# The import libraries for webview fail with "Could not find proper second linker member" +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/external_imported/vcpkg/ports/webview2/unofficial-webview2-config.cmake b/external_imported/vcpkg/ports/webview2/unofficial-webview2-config.cmake new file mode 100644 index 000000000..60851bc23 --- /dev/null +++ b/external_imported/vcpkg/ports/webview2/unofficial-webview2-config.cmake @@ -0,0 +1,21 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +if(NOT TARGET unofficial::webview2::webview2) + if(EXISTS "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + add_library(unofficial::webview2::webview2 STATIC IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + else() + add_library(unofficial::webview2::webview2 SHARED IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/WebView2Loader.dll" + IMPORTED_IMPLIB "${_IMPORT_PREFIX}/lib/WebView2Loader.dll.lib") + endif() +endif() + +unset(_IMPORT_PREFIX) diff --git a/external_imported/vcpkg/ports/webview2/vcpkg.json b/external_imported/vcpkg/ports/webview2/vcpkg.json new file mode 100644 index 000000000..8a0327873 --- /dev/null +++ b/external_imported/vcpkg/ports/webview2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "webview2", + "version": "1.0.1210.39", + "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", + "license": "BSD-3-Clause", + "supports": "windows & (x86 | x64 | arm64)", + "dependencies": [ + "wil" + ] +} diff --git a/external_imported/vcpkg/ports/winreg/portfile.cmake b/external_imported/vcpkg/ports/winreg/portfile.cmake index 085f76d80..472417185 100644 --- a/external_imported/vcpkg/ports/winreg/portfile.cmake +++ b/external_imported/vcpkg/ports/winreg/portfile.cmake @@ -1,8 +1,10 @@ +# WinReg - Header-only library + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 4ac74bfec290ec4376100372f59dbc2554e54692 #v5.1.0 - SHA512 3d25725c9fc781ffdfa1bbd3ed143a8381d40a1613d4786861e13b180098a5ce92ff193cf25d7490be0096c2eafcace45e6a2f94fbfaa28964d12b80b55d0637 + REF ba6b74972038778d0bf5ffa6de705ec6e2768735 #v6.1.0 + SHA512 1b7ac1ef4322c2e1c80be840d4117424263c4ad02050926f1ebdd3fbb4978a02d12f485ccb0aff46ca4acc4188f48f7522ac4d6d663517d7bad71147224accc7 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/winreg/vcpkg.json b/external_imported/vcpkg/ports/winreg/vcpkg.json index cfe7aeac9..82c63c07f 100644 --- a/external_imported/vcpkg/ports/winreg/vcpkg.json +++ b/external_imported/vcpkg/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "5.1.0", + "version": "6.1.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/external_imported/vcpkg/ports/winsock2/portfile.cmake b/external_imported/vcpkg/ports/winsock2/portfile.cmake index b684c2f43..2bd5c72ba 100644 --- a/external_imported/vcpkg/ports/winsock2/portfile.cmake +++ b/external_imported/vcpkg/ports/winsock2/portfile.cmake @@ -1,3 +1,8 @@ +if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") diff --git a/external_imported/vcpkg/ports/winsock2/vcpkg.json b/external_imported/vcpkg/ports/winsock2/vcpkg.json index 02e569826..d6919d4b0 100644 --- a/external_imported/vcpkg/ports/winsock2/vcpkg.json +++ b/external_imported/vcpkg/ports/winsock2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winsock2", "version": "0.0", - "port-version": 4, + "port-version": 5, "description": "Windows Sockets.", + "license": null, "supports": "windows" } diff --git a/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake b/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake new file mode 100644 index 000000000..515a81462 --- /dev/null +++ b/external_imported/vcpkg/ports/wolfmqtt/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfmqtt + REF v1.14.1 + SHA512 ea7657e1c5045996c24bf479fc0c2db7d7d3f588e998d4d236f9d5d43564f80a1fa8ec0710bf87d7b785ffb29d96d539e5b7e7bea5574f0c3843dc00062dbb11 + HEAD_REF master + PATCHES + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFMQTT_EXAMPLES=no + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_MQTT' + ) + + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfmqtt) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json b/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json new file mode 100644 index 000000000..f6f393ac3 --- /dev/null +++ b/external_imported/vcpkg/ports/wolfmqtt/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolfmqtt", + "version": "1.14.1", + "description": "MQTT library used with wolfSSL library for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/external_imported/vcpkg/ports/wolfssl/portfile.cmake b/external_imported/vcpkg/ports/wolfssl/portfile.cmake new file mode 100644 index 000000000..139ef260b --- /dev/null +++ b/external_imported/vcpkg/ports/wolfssl/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolfssl + REF v5.5.0-stable + SHA512 1f9ffd8e83b26f97c3685315790f3f2b451a23e9dad9e2f09142a3e1e136012293ca2d04f46c267f8275ac9e60894c46c7875353765df6d4fdd93ba666228459 + HEAD_REF master + PATCHES + wolfssl_pr5529.diff + ) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFSSL_BUILD_OUT_OF_TREE=yes + -DWOLFSSL_EXAMPLES=no + -DWOLFSSL_CRYPT_TESTS=no + -DWOLFSSL_OPENSSLEXTRA=yes + -DWOLFSSL_TPM=yes + -DWOLFSSL_TLSX=yes + -DWOLFSSL_OCSP=yes + -DWOLFSSL_OCSPSTAPLING=yes + -DWOLFSSL_OCSPSTAPLING_V2=yes + -DWOLFSSL_CRL=yes + -DWOLFSSL_DES3=yes + -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB\ -DWOLFSSL_CUSTOM_OID\ -DHAVE_OID_ENCODING\ -DWOLFSSL_CERT_GEN\ -DWOLFSSL_ASN_TEMPLATE\ -DWOLFSSL_KEY_GEN\ -DHAVE_PKCS7\ -DHAVE_AES_KEYWRAP\ -DWOLFSSL_AES_DIRECT\ -DHAVE_X963_KDF' + OPTIONS_DEBUG + -DWOLFSSL_DEBUG=yes) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolfssl) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/external_imported/vcpkg/ports/wolfssl/vcpkg.json b/external_imported/vcpkg/ports/wolfssl/vcpkg.json new file mode 100644 index 000000000..2331c8aff --- /dev/null +++ b/external_imported/vcpkg/ports/wolfssl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wolfssl", + "version": "5.5.0", + "description": "TLS and Cryptographic library for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/wolfssl/wolfssl_pr5529.diff b/external_imported/vcpkg/ports/wolfssl/wolfssl_pr5529.diff new file mode 100644 index 000000000..719df37ff --- /dev/null +++ b/external_imported/vcpkg/ports/wolfssl/wolfssl_pr5529.diff @@ -0,0 +1,68 @@ +From f7482d96e640ebedaf0dc79e22901012f466b161 Mon Sep 17 00:00:00 2001 +From: Anthony Hu +Date: Wed, 31 Aug 2022 09:05:00 -0400 +Subject: [PATCH] Windows cl.exe does not support -Wextra other flags + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3937a6fab..c6f0ae5b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -169,7 +169,12 @@ find_package(Threads) + # Example for map file and custom linker script + #set(CMAKE_EXE_LINKER_FLAGS " -Xlinker -Map=output.map -T\"${CMAKE_CURRENT_SOURCE_DIR}/linker.ld\"") + ++if(WIN32) ++# Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags. ++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") ++else() + set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Werror ${CMAKE_C_FLAGS}") ++endif() + + #################################################### + # Build Options +-- +2.37.0 + +From f0812fa21fb702ca823292d31e0cf28aacdf4d2c Mon Sep 17 00:00:00 2001 +From: David Garske +Date: Wed, 31 Aug 2022 11:41:43 -0700 +Subject: [PATCH] Added vcpkg instructions to the INSTALL file. + +--- + INSTALL | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 49421ba6a..79d40e3a5 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -233,3 +233,22 @@ + environments. All OIDs and codepoints are temporary and expected to + change in the future. You should have no expectation of backwards + compatibility. ++ ++16. Building with vcpkg ++ ++# Building wolfssl - Using vcpkg ++ ++ You can download and install wolfssl using the [vcpkg](https://github.com/Microsoft/vcpkg): ++ ++ git clone https://github.com/Microsoft/vcpkg.git ++ cd vcpkg ++ ./bootstrap-vcpkg.sh ++ OR for Windows ++ bootstrap-vcpkg.bat ++ ++ ./vcpkg integrate install ++ ./vcpkg install wolfssl ++ ++The wolfssl port in vcpkg is kept up to date by wolfSSL. ++ ++We also have vcpkg ports for wolftpm, wolfmqtt and curl. +-- +2.37.0 + diff --git a/external_imported/vcpkg/ports/wolftpm/portfile.cmake b/external_imported/vcpkg/ports/wolftpm/portfile.cmake new file mode 100644 index 000000000..a5cb13995 --- /dev/null +++ b/external_imported/vcpkg/ports/wolftpm/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wolfssl/wolftpm + REF v2.6.0 + SHA512 1339806859d6fb0e6aef37e6f87be2e49462eccb01d5ca51fdf98bc3b3a1af75f78abe9c8e302b6f9251196e033e639198e980d2500b839403fe6cb10a07743c + HEAD_REF master + PATCHES + ) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DWOLFTPM_EXAMPLES=no + -DWOLFTPM_BUILD_OUT_OF_TREE=yes + OPTIONS_DEBUG + -DCMAKE_C_FLAGS='-DDEBUG_WOLFTPM' + ) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wolftpm) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/wolftpm/vcpkg.json b/external_imported/vcpkg/ports/wolftpm/vcpkg.json new file mode 100644 index 000000000..40b11cefd --- /dev/null +++ b/external_imported/vcpkg/ports/wolftpm/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wolftpm", + "version": "2.6.0", + "description": "TPM library used with wolfSSL library for many platforms", + "homepage": "https://wolfssl.com", + "license": "GPL-2.0-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wolfssl" + ] +} diff --git a/external_imported/vcpkg/ports/workflow/portfile.cmake b/external_imported/vcpkg/ports/workflow/portfile.cmake index 5075bbde4..300b21cc3 100644 --- a/external_imported/vcpkg/ports/workflow/portfile.cmake +++ b/external_imported/vcpkg/ports/workflow/portfile.cmake @@ -17,15 +17,16 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") 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) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/workflow/vcpkg.json b/external_imported/vcpkg/ports/workflow/vcpkg.json index bbea85663..66c55a536 100644 --- a/external_imported/vcpkg/ports/workflow/vcpkg.json +++ b/external_imported/vcpkg/ports/workflow/vcpkg.json @@ -1,8 +1,10 @@ { "name": "workflow", "version": "0.9.7", + "port-version": 1, "description": "About C++ Parallel Computing and Asynchronous Networking Engine", "homepage": "https://github.com/sogou/workflow", + "license": "Apache-2.0", "dependencies": [ "openssl", { diff --git a/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch b/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch new file mode 100644 index 000000000..e5c0ca8f1 --- /dev/null +++ b/external_imported/vcpkg/ports/wpilib/fix-dependency-libuv.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3930be2..f57a46b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,7 @@ else() + endif() + + if (USE_VCPKG_LIBUV) +-set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") ++set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)") + endif() + + if (USE_VCPKG_EIGEN) +diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt +index 559c8ed..0fe60e9 100644 +--- a/wpiutil/CMakeLists.txt ++++ b/wpiutil/CMakeLists.txt +@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV) + endif() + endif() + else() +- find_package(unofficial-libuv CONFIG REQUIRED) +- target_link_libraries(wpiutil unofficial::libuv::libuv) ++ find_package(libuv CONFIG REQUIRED) ++ if (TARGET uv) ++ target_link_libraries(wpiutil uv) ++ else() ++ target_link_libraries(wpiutil uv_a) ++ endif() + endif() + + if (MSVC) diff --git a/external_imported/vcpkg/ports/wpilib/portfile.cmake b/external_imported/vcpkg/ports/wpilib/portfile.cmake index f4b48dc30..d680107fe 100644 --- a/external_imported/vcpkg/ports/wpilib/portfile.cmake +++ b/external_imported/vcpkg/ports/wpilib/portfile.cmake @@ -3,6 +3,7 @@ vcpkg_from_github( REPO wpilibsuite/allwpilib REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6 SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439 + PATCHES fix-dependency-libuv.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -11,10 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS allwpilib WITHOUT_ALLWPILIB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITHOUT_JAVA=ON ${FEATURE_OPTIONS} @@ -22,39 +21,39 @@ vcpkg_configure_cmake( -DUSE_VCPKG_EIGEN=ON -DFLAT_INSTALL_WPILIB=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") if ("allwpilib" IN_LIST FEATURES) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen) + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen") endif() if ("cameraserver" IN_LIST FEATURES) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") endif() if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib") endif() -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib") +file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib") -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a") +file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a") vcpkg_copy_pdbs() -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/external_imported/vcpkg/ports/wpilib/vcpkg.json b/external_imported/vcpkg/ports/wpilib/vcpkg.json index b0e07c291..c928da524 100644 --- a/external_imported/vcpkg/ports/wpilib/vcpkg.json +++ b/external_imported/vcpkg/ports/wpilib/vcpkg.json @@ -1,13 +1,22 @@ { "name": "wpilib", - "version-string": "2020.3.2", - "port-version": 2, + "version-date": "2020-03-02", + "port-version": 3, "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", "homepage": "https://github.com/wpilibsuite/allwpilib", + "license": null, "supports": "!osx", "dependencies": [ "eigen3", - "libuv" + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "allwpilib": { diff --git a/external_imported/vcpkg/ports/wren/portfile.cmake b/external_imported/vcpkg/ports/wren/portfile.cmake index dbd71b8df..d20b518b4 100644 --- a/external_imported/vcpkg/ports/wren/portfile.cmake +++ b/external_imported/vcpkg/ports/wren/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wren-lang/wren - REF d1a0d0682ac072fa20f2dcca356dac06565e93a1 - SHA512 d6b7555da10ea209d04308467563ec401f699a22ca8524e4ae65fd050b0403c5e70430047dbb6a883b8021ab50525c17bb63d76543e7c59dfe4b521cfde6c413 + REF 4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb #0.4.0 + SHA512 b3d79e9cb647e52db06d5cddfc8c93d05ae0e8d87f0f879ac2b812fcc7f55e018d21d3b04d62eaeb12e6d931b5e43fbe357b187e7f446e86e39be015c51c2eee 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 -DCOMPILE_AS_CPP=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # 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) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/wren/vcpkg.json b/external_imported/vcpkg/ports/wren/vcpkg.json index 09f2b8aed..4cb9889ef 100644 --- a/external_imported/vcpkg/ports/wren/vcpkg.json +++ b/external_imported/vcpkg/ports/wren/vcpkg.json @@ -1,7 +1,13 @@ { "name": "wren", - "version-string": "2019-07-01", - "port-version": 1, + "version": "0.4.0", "description": "Wren is a small, fast, class-based concurrent scripting language.", - "homepage": "https://github.com/wren-lang/wren" + "homepage": "https://github.com/wren-lang/wren", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/wt/portfile.cmake b/external_imported/vcpkg/ports/wt/portfile.cmake index 9b8dd5624..a04cee499 100644 --- a/external_imported/vcpkg/ports/wt/portfile.cmake +++ b/external_imported/vcpkg/ports/wt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF bc76cbea5bb845c4d0fb642968eb1b278ddbb047 # 4.6.1 - SHA512 416baaaf89cdbe2e9cf234df44dc0b90493c995b52ca9840cb5a5acf2904fe7d81da178ac4e0bf06dcd44fbac74fa75fe570901dd8fd4987a1bec4aeb54baad6 + REF d0e9f2e8096a1acb4558130a851812dd424d8f3e # 4.7.1 + SHA512 ddda642e464a0c93017161404911cd8261e105971162171cd6aa0e4334e22b5f284a753e8b81a4f43c9269b14389abd28c61e2cdfe706b414808e82fc4bc1680 HEAD_REF master PATCHES 0002-link-glew.patch diff --git a/external_imported/vcpkg/ports/wt/vcpkg.json b/external_imported/vcpkg/ports/wt/vcpkg.json index 727e7cd83..443486fe2 100644 --- a/external_imported/vcpkg/ports/wt/vcpkg.json +++ b/external_imported/vcpkg/ports/wt/vcpkg.json @@ -1,8 +1,9 @@ { "name": "wt", - "version": "4.6.1", + "version": "4.7.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", + "license": "GPL-2.0-only", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/external_imported/vcpkg/ports/wtl/atlribbon.h-wtl66.patch b/external_imported/vcpkg/ports/wtl/atlribbon.h-wtl66.patch new file mode 100644 index 000000000..d4ebac487 --- /dev/null +++ b/external_imported/vcpkg/ports/wtl/atlribbon.h-wtl66.patch @@ -0,0 +1,17 @@ +--- a/Include/atlribbon.h 2022-06-06 03:12:54.312690900 +0200 ++++ b/Include/atlribbon.h 2022-06-06 03:13:24.337068900 +0200 +@@ -27,10 +27,10 @@ + #error atlribbon.h requires atlapp.h to be included first + #endif + +-#include // for RecentDocumentList classes +-#include // for Frame and UpdateUI classes +-#include // required for atlctrlw.h +-#include // for CCommandBarCtrl ++#include "atlmisc.h" // for RecentDocumentList classes ++#include "atlframe.h" // for Frame and UpdateUI classes ++#include "atlctrls.h" // required for atlctrlw.h ++#include "atlctrlw.h" // for CCommandBarCtrl + + #ifndef __ATLSTR_H__ + #pragma warning(push) diff --git a/external_imported/vcpkg/ports/wtl/portfile.cmake b/external_imported/vcpkg/ports/wtl/portfile.cmake index 4c6845f1b..d80bb7d7e 100644 --- a/external_imported/vcpkg/ports/wtl/portfile.cmake +++ b/external_imported/vcpkg/ports/wtl/portfile.cmake @@ -4,14 +4,17 @@ vcpkg_from_sourceforge( REF WTL%2010.0.10320%20Release FILENAME "WTL10_10320_Release.zip" NO_REMOVE_ONE_LEVEL - SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 - PATCHES - appwizard_setup.js-vs2022.patch - atlmisc.h-bug329.patch + SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 + PATCHES + # WTL 10 post-release updates; see + # https://sourceforge.net/projects/wtl/files/WTL%2010/WTL10%20Post-Release%20Updates.txt/download + appwizard_setup.js-vs2022.patch + atlmisc.h-bug329.patch + atlribbon.h-wtl66.patch ) -file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h") -file(COPY ${SOURCE_PATH}/Samples DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/AppWizard DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") +file(COPY "${SOURCE_PATH}/Samples" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/AppWizard" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL ${SOURCE_PATH}/MS-PL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/MS-PL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/wtl/vcpkg.json b/external_imported/vcpkg/ports/wtl/vcpkg.json index 64dcf3157..605dde9b2 100644 --- a/external_imported/vcpkg/ports/wtl/vcpkg.json +++ b/external_imported/vcpkg/ports/wtl/vcpkg.json @@ -1,7 +1,8 @@ { "name": "wtl", - "version-string": "10.0.10320", - "port-version": 2, + "version": "10.0.10320", + "port-version": 4, "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", - "homepage": "https://sourceforge.net/projects/wtl/" + "homepage": "https://sourceforge.net/projects/wtl/", + "license": "MS-PL" } diff --git a/external_imported/vcpkg/ports/wxchartdir/portfile.cmake b/external_imported/vcpkg/ports/wxchartdir/portfile.cmake index 2947d7922..8ad0c5500 100644 --- a/external_imported/vcpkg/ports/wxchartdir/portfile.cmake +++ b/external_imported/vcpkg/ports/wxchartdir/portfile.cmake @@ -3,31 +3,30 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO utelle/wxchartdir - REF v1.0.0 - SHA512 018e588a4bcff594e0049c64597d55b680e58ae239822fcc20d415a1efd8a6b3c0c7c6c836969f01a378209307b9720b938e3826a31e18c843d52897b44b4818 - HEAD_REF master + REF v2.0.0 + SHA512 dd255af1031465c635df7ea7eee2dd15f0dcce30f91cae1eff6527b8b78ea872fa22fa05da5363f57817dc8844c0bc171a2c68f54c38f2519c7bfe0256605622 + HEAD_REF main ) -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() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/wxchartdir) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/wxchartdir) -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}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/wxchartdir/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING.txt" "${CURRENT_PACKAGES_DIR}/share/wxchartdir/copyright" COPYONLY) -file(COPY ${SOURCE_PATH}/CHARTDIRECTOR-LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/CHARTDIRECTOR-README.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/GPL-3.0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LGPL-3.0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/LICENSE.spdx DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) -file(COPY ${SOURCE_PATH}/WxWindows-exception-3.1.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxchartdir) +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/CHARTDIRECTOR-README.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/GPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LGPL-3.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/LICENSE.spdx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") +file(COPY "${SOURCE_PATH}/WxWindows-exception-3.1.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wxchartdir") diff --git a/external_imported/vcpkg/ports/wxchartdir/vcpkg.json b/external_imported/vcpkg/ports/wxchartdir/vcpkg.json index 29f8cb251..008135748 100644 --- a/external_imported/vcpkg/ports/wxchartdir/vcpkg.json +++ b/external_imported/vcpkg/ports/wxchartdir/vcpkg.json @@ -1,11 +1,19 @@ { "name": "wxchartdir", - "version": "1.0.0", - "port-version": 1, + "version": "2.0.0", "description": "wxChartDir provides components for the integration and use of the commercial C++ library ChartDirector, a universal chart component developed by Advanced Software Engineering Ltd, in wxWidgets based applications.", "homepage": "https://github.com/utelle/wxchartdir", + "license": "GPL-3.0-only AND LGPL-3.0 AND wxWindows", "dependencies": [ "chartdir", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "wxwidgets" ] } diff --git a/external_imported/vcpkg/ports/wxcharts/portfile.cmake b/external_imported/vcpkg/ports/wxcharts/portfile.cmake new file mode 100644 index 000000000..7d6534b1a --- /dev/null +++ b/external_imported/vcpkg/ports/wxcharts/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wxIshiko/wxCharts + REF 070e1d6084623185c7337226fa562b1e3a772e3d + SHA512 4c52e4ad6d3c4ba496aad7e654ee75ddd9009aadc44be37fc64f3e3ac56001a7e9728f7fdd0c78f8261bff0bf8a6748f8a7649cb160ca37c2d686530c161c2f6 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/external_imported/vcpkg/ports/wxcharts/vcpkg.json b/external_imported/vcpkg/ports/wxcharts/vcpkg.json new file mode 100644 index 000000000..90226b7e4 --- /dev/null +++ b/external_imported/vcpkg/ports/wxcharts/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "wxcharts", + "version-date": "2022-07-05", + "description": "Chart controls for the wxWidgets cross-platform GUI library", + "homepage": "https://www.wxishiko.com/wxCharts", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "wxwidgets" + ] +} diff --git a/external_imported/vcpkg/ports/wxwidgets/disable-platform-lib-dir.patch b/external_imported/vcpkg/ports/wxwidgets/disable-platform-lib-dir.patch deleted file mode 100644 index 930477c01..000000000 --- a/external_imported/vcpkg/ports/wxwidgets/disable-platform-lib-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index d013e92..c03135d 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -149,7 +149,7 @@ else() - set(wxCOMPILER_PREFIX) - endif() - --if(MSVC) -+if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) - if(wxBUILD_SHARED) - set(lib_suffix "dll") - else() diff --git a/external_imported/vcpkg/ports/wxwidgets/example/CMakeLists.txt b/external_imported/vcpkg/ports/wxwidgets/example/CMakeLists.txt new file mode 100644 index 000000000..229b7107a --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/example/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.7) + +project(wxwidgets-example) + +add_executable(main WIN32 popup.cpp) + +find_package(wxWidgets REQUIRED) +target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") +target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) +target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) + +add_executable(main2 WIN32 popup.cpp) + +find_package(wxWidgets CONFIG REQUIRED) +target_link_libraries(main2 PRIVATE wx::core wx::base) + +option(USE_WXRC "Use the wxrc resource compiler" ON) +if(USE_WXRC) + execute_process( + COMMAND "${wxWidgets_wxrc_EXECUTABLE}" --help + RESULTS_VARIABLE error_result + ) + if(error_result) + message(FATAL_ERROR "Failed to run wxWidgets_wxrc_EXECUTABLE (${wxWidgets_wxrc_EXECUTABLE})") + endif() +endif() + +set(PRINT_VARS "" CACHE STRING "Variables to print at the end of configuration") +foreach(var IN LISTS PRINT_VARS) + message(STATUS "${var}:=${${var}}") +endforeach() diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-build.patch b/external_imported/vcpkg/ports/wxwidgets/fix-build.patch deleted file mode 100644 index e47bc97e6..000000000 --- a/external_imported/vcpkg/ports/wxwidgets/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 06116384c7..f82ff941bb 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -383,7 +383,7 @@ endmacro() - # Enable cotire for target, use optional second argument for prec. header - macro(wx_target_enable_precomp target_name) - target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) -- if(NOT ${ARGV1} STREQUAL "") -+ if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") - set_target_properties(${target_name} PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) - endif() diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-libs-export.patch b/external_imported/vcpkg/ports/wxwidgets/fix-libs-export.patch new file mode 100644 index 000000000..63bb9d353 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/fix-libs-export.patch @@ -0,0 +1,21 @@ +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index b359560..7504458 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib) + else() + # For the value like $<$:LIB_PATH> + # Or $<$>:LIB_PATH> +- string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) +- if (NOT dep_name) ++ if(dep MATCHES "^(.+>):(.+)>$") ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_MATCH_1 STREQUAL [[$<$>]]) ++ continue() ++ elseif(CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_MATCH_1 STREQUAL [[$<$]]) ++ continue() ++ endif() ++ set(dep_name "${CMAKE_MATCH_2}") ++ else() + set(dep_name ${dep}) + endif() + endif() diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch b/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch deleted file mode 100644 index 059bb42b7..000000000 --- a/external_imported/vcpkg/ports/wxwidgets/fix-linux-configure.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake -index bb69643..09b52a6 100644 ---- a/build/cmake/modules/cotire.cmake -+++ b/build/cmake/modules/cotire.cmake -@@ -2316,6 +2316,10 @@ function (cotire_generate_target_script _language _configurations _target _targe - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}) - cotire_get_target_compiler_flags( - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}) -+ string(REPLACE -+ "" "" -+ COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig} "${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}}" -+ ) - cotire_get_source_files_compile_definitions( - "${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources}) - endforeach() -diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 91d11ac..2791466 100644 ---- a/build/cmake/config.cmake -+++ b/build/cmake/config.cmake -@@ -41,9 +41,27 @@ macro(wx_get_dependencies var lib) - endif() - set(dep_name "-l${dep_name}") - else() -- get_filename_component(dep_name ${dep} NAME) -+ # For the value like $<$:LIB_PATH> -+ # Or $<$>:LIB_PATH> -+ string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) -+ if (NOT dep_name) -+ set(dep_name ${dep}) -+ endif() -+ endif() -+ if(dep_name STREQUAL "libc.so") -+ # don't include this library -+ elseif(dep_name MATCHES "^-(.*)$") # -l, -framework, -weak_framework -+ wx_string_append(${var} "${dep_name} ") -+ elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") -+ wx_string_append(${var} "-l${CMAKE_MATCH_1} ") -+ elseif(dep_name) -+ get_filename_component(abs_path ${dep_name} PATH) -+ if (abs_path) # value contains path -+ wx_string_append(${var} "${dep_name} ") -+ else() -+ wx_string_append(${var} "-l${dep_name} ") -+ endif() - endif() -- wx_string_append(${var} "${dep_name} ") - endforeach() - string(STRIP ${${var}} ${var}) - endif() diff --git a/external_imported/vcpkg/ports/wxwidgets/fix-pcre2.patch b/external_imported/vcpkg/ports/wxwidgets/fix-pcre2.patch new file mode 100644 index 000000000..20063f441 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/fix-pcre2.patch @@ -0,0 +1,23 @@ +diff --git a/build/cmake/modules/FindPCRE2.cmake b/build/cmake/modules/FindPCRE2.cmake +index a27693a..455675a 100644 +--- a/build/cmake/modules/FindPCRE2.cmake ++++ b/build/cmake/modules/FindPCRE2.cmake +@@ -24,7 +24,10 @@ set(PCRE2_CODE_UNIT_WIDTH_USED "${PCRE2_CODE_UNIT_WIDTH}" CACHE INTERNAL "") + + find_package(PkgConfig QUIET) + pkg_check_modules(PC_PCRE2 QUIET libpcre2-${PCRE2_CODE_UNIT_WIDTH}) ++set(PCRE2_LIBRARIES ${PC_PCRE2_LINK_LIBRARIES}) ++set(PCRE2_INCLUDE_DIRS ${PC_PCRE2_INCLUDE_DIRS}) + ++if (0) + find_path(PCRE2_INCLUDE_DIRS + NAMES pcre2.h + HINTS ${PC_PCRE2_INCLUDEDIR} +@@ -36,6 +39,7 @@ find_library(PCRE2_LIBRARIES + HINTS ${PC_PCRE2_LIBDIR} + ${PC_PCRE2_LIBRARY_DIRS} + ) ++endif() + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 REQUIRED_VARS PCRE2_LIBRARIES PCRE2_INCLUDE_DIRS VERSION_VAR PC_PCRE2_VERSION) diff --git a/external_imported/vcpkg/ports/wxwidgets/gtk3-link-libraries.patch b/external_imported/vcpkg/ports/wxwidgets/gtk3-link-libraries.patch new file mode 100644 index 000000000..fe2736b2d --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/gtk3-link-libraries.patch @@ -0,0 +1,12 @@ +diff --git a/build/cmake/modules/FindGTK3.cmake b/build/cmake/modules/FindGTK3.cmake +index d2939a1..daf33fe 100644 +--- a/build/cmake/modules/FindGTK3.cmake ++++ b/build/cmake/modules/FindGTK3.cmake +@@ -47,6 +47,7 @@ include(CheckSymbolExists) + set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS}) + check_symbol_exists(GDK_WINDOWING_WAYLAND "gdk/gdk.h" wxHAVE_GDK_WAYLAND) + check_symbol_exists(GDK_WINDOWING_X11 "gdk/gdk.h" wxHAVE_GDK_X11) ++set(GTK3_LIBRARIES "${GTK3_LINK_LIBRARIES}" CACHE INTERNAL "") + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK) + diff --git a/external_imported/vcpkg/ports/wxwidgets/install-layout.patch b/external_imported/vcpkg/ports/wxwidgets/install-layout.patch new file mode 100644 index 000000000..e9edfa167 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/install-layout.patch @@ -0,0 +1,52 @@ +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 7182364..4f90430 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -428,7 +428,7 @@ macro(wx_add_library name) + set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short}) + + # Setup install +- set(runtime_dir "lib") ++ set(runtime_dir "bin") + if(WIN32 AND NOT WIN32_MSVC_NAMING) + # configure puts the .dll in the bin directory + set(runtime_dir "bin") +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index ef28c99..928bc0b 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -146,7 +146,7 @@ if(WIN32) + endif() + endif() + +-if(WIN32_MSVC_NAMING) ++if(0) + if(wxBUILD_SHARED) + set(lib_suffix "_dll") + else() +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index 384c683..a662a48 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -41,7 +41,7 @@ else() + + install(DIRECTORY DESTINATION "bin") + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ + )" +diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt +index dbed8cc..f1da8e3 100644 +--- a/build/cmake/utils/CMakeLists.txt ++++ b/build/cmake/utils/CMakeLists.txt +@@ -39,7 +39,7 @@ if(wxUSE_XRC) + + # Don't use wx_install() here to preserve escaping. + install(CODE "execute_process( \ +- COMMAND ${CMAKE_COMMAND} -E create_symlink \ ++ COMMAND ${CMAKE_COMMAND} -E copy \ + \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ + )" diff --git a/external_imported/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch b/external_imported/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch new file mode 100644 index 000000000..3a1577768 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/nanosvg-ext-depend.patch @@ -0,0 +1,42 @@ +diff --git a/build/cmake/lib/nanosvg.cmake b/build/cmake/lib/nanosvg.cmake +index 401bf48..b9e4b57 100644 +--- a/build/cmake/lib/nanosvg.cmake ++++ b/build/cmake/lib/nanosvg.cmake +@@ -16,9 +16,9 @@ elseif(wxUSE_NANOSVG) + set(NANOSVG_INCLUDE_DIRS ) + set(wxUSE_NANOSVG_EXTERNAL_ENABLE_IMPL TRUE) + +- find_package(NanoSVG REQUIRED) ++ find_package(unofficial-nanosvg CONFIG REQUIRED) + +- foreach(TARGETNAME NanoSVG::nanosvg NanoSVG::nanosvgrast unofficial::nanosvg) ++ foreach(TARGETNAME unofficial::nanosvg::nanosvg) + if(NOT TARGET ${TARGETNAME}) + continue() + endif() +diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake +index 2b120e5..26651f9 100644 +--- a/build/cmake/options.cmake ++++ b/build/cmake/options.cmake +@@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_ + wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)") + wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)") + wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)") +-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG" DEFAULT builtin) ++wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG") + + wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF) + set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression") +diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in +index 6ef5a6e..248a701 100644 +--- a/build/cmake/wxWidgetsConfig.cmake.in ++++ b/build/cmake/wxWidgetsConfig.cmake.in +@@ -1,5 +1,8 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(unofficial-nanosvg CONFIG) ++ + # determine target from compiler, platform and library type + if(WIN32 AND NOT CYGWIN AND NOT MSYS) + if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) diff --git a/external_imported/vcpkg/ports/wxwidgets/portfile.cmake b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake index 441943a4a..6dd536089 100644 --- a/external_imported/vcpkg/ports/wxwidgets/portfile.cmake +++ b/external_imported/vcpkg/ports/wxwidgets/portfile.cmake @@ -1,35 +1,77 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 #v3.1.5 - SHA512 33817f766b36d24e5e6f4eb7666f2e4c1ec305063cb26190001e0fc82ce73decc18697e8005da990a1c99dc1ccdac9b45bb2bbe5ba73e6e2aa860c768583314c + REF 97e99707c5d2271a70cb686720b48dbf34ced496 # v3.2.1 + SHA512 b47d3f4560f0ba24e95ce4fba0a807cc47807df57d54b70e22a34a5a15fc1e35ccedf1938203046c8950db9115ed09cb66fa1ca30b2e5f1b4c0d529a812497c4 HEAD_REF master PATCHES - disable-platform-lib-dir.patch - fix-build.patch - fix-linux-configure.patch # Remove this patch in the next update + install-layout.patch + relocatable-wx-config.patch + nanosvg-ext-depend.patch + fix-libs-export.patch + fix-pcre2.patch + gtk3-link-libraries.patch ) -set(OPTIONS) -if(VCPKG_TARGET_IS_OSX) - set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) +if(VCPKG_TARGET_IS_LINUX) + message(WARNING [[ +Port wxwidgets currently requires the following packages from the system package manager: + pkg-config + GTK 3 + libsecret + libgcrypt + libsystemd +These development packages can be installed on Ubuntu systems via + sudo apt-get install pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev +]]) + foreach(conflicting_port IN ITEMS freetype glib) + if(EXISTS "${CURRENT_INSTALLED_DIR}/share/${conflicting_port}/copyright") + message(FATAL_ERROR "Port ${conflicting_port} must not be installed when building ${PORT}:${TARGET_TRIPLET}.") + endif() + endforeach() endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(OPTIONS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sound wxUSE_SOUND + fonts wxUSE_PRIVATE_FONTS + webview wxUSE_WEBVIEW_EDGE +) + +set(OPTIONS_RELEASE "") +if(NOT "debug-support" IN_LIST FEATURES) + list(APPEND OPTIONS_RELEASE "-DwxBUILD_DEBUG_LEVEL=0") +endif() + +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND OPTIONS -DwxUSE_OPENGL=OFF -DwxUSE_STACKWALKER=OFF ) endif() -# wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. -# vcpkg's port pkgconf would prevent this lookup. -if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG}) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=OFF) +else() + list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=ON) +endif() + +if(DEFINED ENV{PKG_CONFIG}) + set(PKGCONFIG "$ENV{PKG_CONFIG}") +elseif(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING) + # wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. + # vcpkg's port pkgconf would prevent this lookup. find_program(system_pkg_config NAMES pkg-config) if(system_pkg_config) - set(ENV{PKG_CONFIG} "${system_pkg_config}") + set(PKGCONFIG "${system_pkg_config}") + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND OPTIONS -DPKG_CONFIG_ARGN=--static) endif() endif() +vcpkg_find_acquire_program(PKGCONFIG) # This may be set to ON by users in a custom triplet. # The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible @@ -45,44 +87,46 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DwxUSE_REGEX=builtin + ${FEATURE_OPTIONS} + -DwxUSE_REGEX=sys -DwxUSE_ZLIB=sys -DwxUSE_EXPAT=sys -DwxUSE_LIBJPEG=sys -DwxUSE_LIBPNG=sys -DwxUSE_LIBTIFF=sys - -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + -DwxUSE_NANOSVG=sys + -DwxUSE_SECRETSTORE=FALSE -DwxUSE_STL=${WXWIDGETS_USE_STL} -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} ${OPTIONS} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + # The minimum cmake version requirement for Cotire is 2.8.12. + # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc. + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON + OPTIONS_RELEASE + ${OPTIONS_RELEASE} ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/wxWidgets) -if (VCPKG_TARGET_IS_WINDOWS) - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") - if(DLLS) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - foreach(DLL IN LISTS DLLS) - get_filename_component(N "${DLL}" NAME) - file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/bin/${N}") - endforeach() - endif() - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") - if(DLLS) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - foreach(DLL IN LISTS DLLS) - get_filename_component(N "${DLL}" NAME) - file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/debug/bin/${N}") - endforeach() - endif() -endif() +# The CMake export is not ready for use: It lacks a config file. +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake +) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools(TOOL_NAMES wxrc AUTO_CLEAN) -else() - vcpkg_copy_tools(TOOL_NAMES wxrc wx-config wxrc-3.1 AUTO_CLEAN) +set(tools wxrc) +if(NOT VCPKG_TARGET_IS_WINDOWS OR NOT VCPKG_HOST_IS_WINDOWS) + list(APPEND tools wxrc-3.2) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") + if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") + endif() endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) # do the copy pdbs now after the dlls got moved to the expected /bin folder above vcpkg_copy_pdbs() @@ -128,7 +172,41 @@ if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY) endif() -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}" [[${prefix}]]) +endforeach() +file(GLOB configs LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/wx/config/*" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/wx-config") +foreach(config IN LISTS configs) + vcpkg_replace_string("${config}" "${CURRENT_INSTALLED_DIR}/debug" [[${prefix}]]) +endforeach() + +# For CMake multi-config in connection with wrapper +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib/mswud/wx" + ) +endif() + +if(NOT "debug-support" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx-3.2/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") + endif() +endif() + +if("example" IN_LIST FEATURES) + file(INSTALL + "${CMAKE_CURRENT_LIST_DIR}/example/CMakeLists.txt" + "${SOURCE_PATH}/samples/popup/popup.cpp" + "${SOURCE_PATH}/samples/sample.xpm" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/example/popup.cpp" "../sample.xpm" "sample.xpm") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch b/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch new file mode 100644 index 000000000..8a5e7c4d5 --- /dev/null +++ b/external_imported/vcpkg/ports/wxwidgets/relocatable-wx-config.patch @@ -0,0 +1,49 @@ +diff --git a/wx-config.in b/wx-config.in +index 441f88c..b326867 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -91,7 +91,7 @@ EOF + + + # Contentious tools determined by configure. +-EGREP="@EGREP@" ++EGREP="grep -E" # no absolute path from host + + + # For the people who know what they want, or think they do: +@@ -402,8 +402,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + + + # Determine the base directories we require. +-prefix=${input_option_prefix-${this_prefix:-@prefix@}} +-exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} ++vcpkg_prefix=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P) ++case "$vcpkg_prefix" in ++ */lib/wx/config) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*} ++ ;; ++ */tools/wxwidgets/debug) ++ vcpkg_prefix=${vcpkg_prefix%/*/*/*}/debug ++ ;; ++ */tools/wxwidgets) ++ vcpkg_prefix=${vcpkg_prefix%/*/*} ++ ;; ++esac ++if [ -n "@MINGW@" -a -n "@CMAKE_HOST_WIN32@" ]; then ++ vcpkg_prefix=$(cygpath -m "$vcpkg_prefix") ++fi ++prefix=${input_option_prefix-${this_prefix:-$vcpkg_prefix}} ++exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-$prefix}}} + wxconfdir="@libdir@/wx/config" + + installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` +@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix} + exec_prefix=${this_exec_prefix-$exec_prefix} + + includedir="@includedir@" ++if [ "@CMAKE_BUILD_TYPE@" = "Debug" ] ; then ++ includedir="${includedir%/debug/include}/include" ++fi + libdir="@libdir@" + bindir="@bindir@" + diff --git a/external_imported/vcpkg/ports/wxwidgets/usage b/external_imported/vcpkg/ports/wxwidgets/usage index e873e4ae3..209456e8a 100644 --- a/external_imported/vcpkg/ports/wxwidgets/usage +++ b/external_imported/vcpkg/ports/wxwidgets/usage @@ -1,5 +1,4 @@ -The package wxwidgets provides CMake integration: +The package wxwidgets provides CMake targets: - find_package(wxWidgets REQUIRED) - target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) + find_package(wxWidgets CONFIG REQUIRED) + target_link_libraries(main PRIVATE wx::core wx::base) diff --git a/external_imported/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/external_imported/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index 55557b360..5737945d0 100644 --- a/external_imported/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/external_imported/vcpkg/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -1,25 +1,77 @@ -set(wxWidgets_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE INTERNAL "" FORCE) -set(WX_ROOT_DIR "${wxWidgets_ROOT_DIR}") -set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "" FORCE) -set(WX_LIB_DIR "${wxWidgets_LIB_DIR}") -find_library(WX_based NAMES wxbase31ud PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) -file(GLOB WX_DEBUG_LIBS "${wxWidgets_ROOT_DIR}/debug/lib/wx*d_*.lib") -foreach(WX_DEBUG_LIB ${WX_DEBUG_LIBS}) - string(REGEX REPLACE ".*wx([^/]*)d_([^/\\.]*)\\.[^/\\.]*\$" "WX_\\2d" varname "${WX_DEBUG_LIB}") - set(${varname} "${WX_DEBUG_LIB}" CACHE INTERNAL "" FORCE) -endforeach() -_find_package(${ARGS}) -find_package(ZLIB QUIET) -find_package(libpng CONFIG QUIET) -find_package(TIFF QUIET) -find_package(expat CONFIG QUIET) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) -if(wxWidgets_LIBRARIES AND NOT wxWidgets_LIBRARIES MATCHES "TIFF::TIFF;png;expat::expat;ZLIB::ZLIB") - list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;expat::expat;ZLIB::ZLIB") +get_filename_component(_vcpkg_wx_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) +set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") +unset(_vcpkg_wx_root) - if (TARGET png) - list(APPEND wxWidgets_LIBRARIES "png") - elseif(TARGET png_static) - list(APPEND wxWidgets_LIBRARIES "png_static") +if(WIN32 AND CMAKE_HOST_WIN32) + # Find all libs with "32" infix which is unknown to FindwxWidgets.cmake + function(z_vcpkg_wxwidgets_find_base_library BASENAME) + find_library(WX_${BASENAME}d wx${BASENAME}32ud NAMES wx${BASENAME}d PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(WX_${BASENAME} wx${BASENAME}32u NAMES wx${BASENAME} PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH REQUIRED) + endfunction() + function(z_vcpkg_wxwidgets_find_suffix_library BASENAME) + foreach(lib IN LISTS ARGN) + find_library(WX_${lib}d NAMES wx${BASENAME}32ud_${lib} PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(WX_${lib} NAMES wx${BASENAME}32u_${lib} PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH) + endforeach() + endfunction() + z_vcpkg_wxwidgets_find_base_library(base) + z_vcpkg_wxwidgets_find_suffix_library(base net odbc xml) + z_vcpkg_wxwidgets_find_suffix_library(msw core adv aui html media xrc dbgrid gl qa richtext stc ribbon propgrid webview) + if(WX_stc AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + z_vcpkg_wxwidgets_find_base_library(scintilla) + endif() + # Force FindwxWidgets.cmake win32 mode for all windows targets built on windows + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 0) + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") +else() + # FindwxWidgets.cmake unix mode, single-config + if(MINGW) + # Force FindwxWidgets.cmake unix mode for mingw cross builds + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 1) + endif() + set(_vcpkg_wxconfig "") + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) + # Debug + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") endif() + if(NOT _vcpkg_wxconfig) + # Release or fallback + set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") + file(GLOB _vcpkg_wxconfig LIST_DIRECTORIES false "${wxWidgets_LIB_DIR}/wx/config/*") + endif() + set(wxWidgets_CONFIG_EXECUTABLE "${_vcpkg_wxconfig}" CACHE INTERNAL "") + unset(_vcpkg_wxconfig) endif() +set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") + +_find_package(${ARGS}) + +if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) + set(CMAKE_CROSSCOMPILING "${_vcpkg_wxwidgets_backup_crosscompiling}") + unset(_vcpkg_wxwidgets_backup_crosscompiling) +endif() + +if(WIN32 AND CMAKE_HOST_WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES) + find_package(EXPAT QUIET) + find_package(JPEG QUIET) + find_package(PNG QUIET) + find_package(TIFF QUIET) + find_package(ZLIB QUIET) + list(APPEND wxWidgets_LIBRARIES + ${EXPAT_LIBRARIES} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ${TIFF_LIBRARIES} + ${ZLIB_LIBRARIES} + ) +endif() + +cmake_policy(POP) diff --git a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json index 9a4cdf2a8..d724fb322 100644 --- a/external_imported/vcpkg/ports/wxwidgets/vcpkg.json +++ b/external_imported/vcpkg/ports/wxwidgets/vcpkg.json @@ -1,18 +1,25 @@ { "name": "wxwidgets", - "version-semver": "3.1.5", - "port-version": 8, + "version": "3.2.1", "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." ], "homepage": "https://github.com/wxWidgets/wxWidgets", - "license": "wxWindows", + "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1", "supports": "!uwp", "dependencies": [ + { + "name": "curl", + "default-features": false, + "platform": "!windows & !osx" + }, "expat", + "libjpeg-turbo", "libpng", + "nanosvg", + "pcre2", "tiff", { "name": "vcpkg-cmake", @@ -23,5 +30,46 @@ "host": true }, "zlib" - ] + ], + "default-features": [ + "debug-support", + "sound" + ], + "features": { + "debug-support": { + "description": "Enable wxWidgets debugging support hooks even for release builds (wxDEBUG_LEVEL 1)" + }, + "example": { + "description": "Example source code and CMake project" + }, + "fonts": { + "description": "Enable to use the font functionality of wxWidgets", + "dependencies": [ + { + "name": "fontconfig", + "platform": "!windows & !osx" + }, + { + "name": "pango", + "platform": "!windows & !osx" + } + ] + }, + "sound": { + "description": "Build wxSound support", + "dependencies": [ + { + "name": "sdl2", + "default-features": false, + "platform": "!windows & !osx" + } + ] + }, + "webview": { + "description": "The Edge backend uses Microsoft's Edge WebView2", + "dependencies": [ + "webview2" + ] + } + } } diff --git a/external_imported/vcpkg/ports/x264/allow-clang-cl.patch b/external_imported/vcpkg/ports/x264/allow-clang-cl.patch new file mode 100644 index 000000000..fd363b64e --- /dev/null +++ b/external_imported/vcpkg/ports/x264/allow-clang-cl.patch @@ -0,0 +1,16 @@ +diff --git a/configure b/configure +index 6f95e2314..e677e36f4 100644 +--- a/configure ++++ b/configure +@@ -606,9 +606,9 @@ if [[ $host_os = mingw* || $host_os = msys* || $host_os = cygwin* ]]; then + if cc_check '' -Qdiag-error:10006,10157 ; then + CHECK_CFLAGS="$CHECK_CFLAGS -Qdiag-error:10006,10157" + fi +- elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* ]]; then ++ elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* || "$cc_base" = clang-cl || "$cc_base" = clang-cl[\ .]* ]]; then + # Standard Microsoft Visual Studio + compiler=CL + compiler_style=MS ++ CFLAGS="$CPPFLAGS $CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" +- CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" + cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer" diff --git a/external_imported/vcpkg/ports/x264/configure-as.patch b/external_imported/vcpkg/ports/x264/configure-as.patch new file mode 100644 index 000000000..725d7f98a --- /dev/null +++ b/external_imported/vcpkg/ports/x264/configure-as.patch @@ -0,0 +1,10 @@ +diff --git a/configure b/configure +index c987491..f29c3c1 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,5 @@ + #!/bin/bash ++test "${AS:-:}" = ":" && unset AS + + if test x"$1" = x"-h" -o x"$1" = x"--help" ; then + cat <> config.mak +- echo 'install: install-cli' >> config.mak ++ echo 'install:' >> config.mak ++ echo ' $(MAKE) install-cli' >> config.mak + fi + + if [ "$shared" = "yes" ]; then diff --git a/external_imported/vcpkg/ports/x264/portfile.cmake b/external_imported/vcpkg/ports/x264/portfile.cmake index 33e6979ac..6b726b40b 100644 --- a/external_imported/vcpkg/ports/x264/portfile.cmake +++ b/external_imported/vcpkg/ports/x264/portfile.cmake @@ -1,31 +1,84 @@ -set(X264_VERSION 164) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 - REF 5db6aa6cab1b146e07b60cc1736a01f21da01154 - SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd + REF baee400fa9ced6f5481a728138fed6e867b0ff7f # 0.164.3095 in pc file, to be updated below + SHA512 3c7147457cbe0fea20cf3ed8cf7bbdca9ac15060cf86f81b9b5b54b018f922964e91b3c38962c81fedef92bc5b14489e04d0966d03d2b7a85b4dabab6ad816a2 HEAD_REF stable PATCHES - "uwp-cflags.patch" + uwp-cflags.patch + parallel-install.patch + allow-clang-cl.patch + configure-as.patch # Ignore ':' from `vcpkg_configure_make` ) -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path(${NASM_EXE_PATH}) +vcpkg_replace_string("${SOURCE_PATH}/configure" [[/bin/bash]] [[/usr/bin/env bash]]) + +# Note on x264 versioning: +# The pc file exports "0.164." where is the number of commits. +# This must be fixed here because vcpkg uses a GH tarball instead of cloning the source. +# (The binary releases on https://artifacts.videolan.org/x264/ are named x264-r-.) +vcpkg_replace_string("${SOURCE_PATH}/version.sh" [[ver="x"]] [[ver="3095"]]) + +# Ensure that 'ENV{PATH}' leads to tool 'name' exactly at 'filepath'. +function(ensure_tool_in_path name filepath) + unset(program_found CACHE) + find_program(program_found "${name}" PATHS ENV PATH NO_DEFAULT_PATH NO_CACHE) + if(NOT filepath STREQUAL program_found) + cmake_path(GET filepath PARENT_PATH parent_path) + vcpkg_add_to_path(PREPEND "${parent_path}") + endif() +endfunction() + +# Ensure that parent-scope variable 'var' doesn't contain a space, +# updating 'ENV{PATH}' and 'var' if needed. +function(transform_path_no_space var) + set(path "${${var}}") + if(path MATCHES " ") + cmake_path(GET path FILENAME program_name) + set("${var}" "${program_name}" PARENT_SCOPE) + ensure_tool_in_path("${program_name}" "${path}") + endif() +endfunction() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_WINDOWS) - z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) - z_vcpkg_determine_autotools_target_cpu(HOST_ARCH) - list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32) - list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32) - set(ENV{AS} "${NASM}") +transform_path_no_space(VCPKG_DETECTED_CMAKE_C_COMPILER) +set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + +vcpkg_list(SET OPTIONS) +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$") + vcpkg_list(APPEND OPTIONS "--cross-prefix=${CMAKE_MATCH_1}") +endif() + +vcpkg_list(SET EXTRA_ARGS) +set(nasm_archs x86 x64) +set(gaspp_archs arm arm64) +if(NOT "asm" IN_LIST FEATURES) + vcpkg_list(APPEND OPTIONS --disable-asm) +elseif(NOT "$ENV{AS}" STREQUAL "") + # Accept setting from triplet +elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST nasm_archs) + vcpkg_find_acquire_program(NASM) + transform_path_no_space(NASM) + list(APPEND EXTRA_ARGS CONFIGURE_ENVIRONMENT_VARIABLES AS) + set(AS "${NASM}") # for CONFIGURE_ENVIRONMENT_VARIABLES + set(ENV{AS} "${NASM}") # for non-WIN32 +elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST gaspp_archs AND VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) + vcpkg_find_acquire_program(GASPREPROCESSOR) + list(FILTER GASPREPROCESSOR INCLUDE REGEX gas-preprocessor) + file(INSTALL "${GASPREPROCESSOR}" DESTINATION "${SOURCE_PATH}/tools" RENAME "gas-preprocessor.pl") +endif() + +vcpkg_list(SET OPTIONS_RELEASE) +if("tool" IN_LIST FEATURES) + vcpkg_list(APPEND OPTIONS_RELEASE --enable-cli) +else() + vcpkg_list(APPEND OPTIONS_RELEASE --disable-cli) endif() if(VCPKG_TARGET_IS_UWP) - list(APPEND OPTIONS --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00) - list(APPEND OPTIONS --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib) - list(APPEND OPTIONS --disable-asm) + list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00) endif() if(VCPKG_TARGET_IS_LINUX) @@ -33,57 +86,52 @@ if(VCPKG_TARGET_IS_LINUX) endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" NO_ADDITIONAL_PATHS + DETERMINE_BUILD_TRIPLET + ${EXTRA_ARGS} OPTIONS ${OPTIONS} - --enable-strip --disable-lavf --disable-swscale --disable-avs --disable-ffms --disable-gpac --disable-lsmash + --disable-bashcompletion + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + --enable-strip + OPTIONS_DEBUG --enable-debug - + --disable-cli ) vcpkg_install_make() -if(NOT VCPKG_TARGET_IS_UWP) +if("tool" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_TARGET_IS_WINDOWS) - set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") - endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) - + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib" "${CURRENT_PACKAGES_DIR}/lib/libx264.lib") if (NOT VCPKG_BUILD_TYPE) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib") endif() elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # force U_STATIC_IMPLEMENTATION macro - file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) - string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/x264.h "${HEADER_CONTENTS}") - + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/x264.h" "defined(U_STATIC_IMPLEMENTATION)" "1") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() @@ -91,4 +139,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/x264/vcpkg.json b/external_imported/vcpkg/ports/x264/vcpkg.json index 436cf0b5e..54ba0439d 100644 --- a/external_imported/vcpkg/ports/x264/vcpkg.json +++ b/external_imported/vcpkg/ports/x264/vcpkg.json @@ -1,14 +1,39 @@ { "name": "x264", - "version-string": "164-5db6aa6cab1b146", - "port-version": 4, + "version": "0.164.3095", + "port-version": 1, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", - "homepage": "https://github.com/mirror/x264", - "supports": "!(arm & windows)", + "homepage": "https://www.videolan.org/developers/x264.html", + "license": "GPL-2.0-or-later", "dependencies": [ { - "name": "pthread", - "platform": "linux & osx" + "name": "vcpkg-cmake-get-vars", + "host": true } - ] + ], + "default-features": [ + "default-features" + ], + "features": { + "asm": { + "description": "Enable platform-specific assembly optimizations", + "supports": "x86 | x64 | (arm & !windows) | arm64" + }, + "default-features": { + "description": "Default set of features", + "dependencies": [ + { + "name": "x264", + "features": [ + "asm" + ], + "platform": "x86 | x64 | (arm & !windows) | arm64" + } + ] + }, + "tool": { + "description": "Build the command line tool", + "supports": "!uwp" + } + } } diff --git a/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch b/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch new file mode 100644 index 000000000..f5c3d4366 --- /dev/null +++ b/external_imported/vcpkg/ports/x265/fix-pkgconfig-version.patch @@ -0,0 +1,13 @@ +diff --git a/source/cmake/version.cmake b/source/cmake/version.cmake +index b1e995f..d7df148 100644 +--- a/source/cmake/version.cmake ++++ b/source/cmake/version.cmake +@@ -7,7 +7,7 @@ find_package(Git QUIET) # present in 2.8.8 + + # defaults, in case everything below fails + set(X265_VERSION "unknown") +-set(X265_LATEST_TAG "0.0") ++set(X265_LATEST_TAG "0.0" CACHE STRING "x265 version") + set(X265_TAG_DISTANCE "0") + + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.hg_archival.txt) diff --git a/external_imported/vcpkg/ports/x265/portfile.cmake b/external_imported/vcpkg/ports/x265/portfile.cmake index 8dd9dd1e3..4aace861c 100644 --- a/external_imported/vcpkg/ports/x265/portfile.cmake +++ b/external_imported/vcpkg/ports/x265/portfile.cmake @@ -6,91 +6,56 @@ vcpkg_from_github( HEAD_REF master PATCHES disable-install-pdb.patch + fix-pkgconfig-version.patch ) -set(ENABLE_ASSEMBLY OFF) -if (VCPKG_TARGET_IS_WINDOWS) +set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(NASM) - get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) - set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") - set(ENABLE_ASSEMBLY ON) -endif () + set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=ON" "-DNASM_EXECUTABLE=${NASM}") +endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/source - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/source" OPTIONS - -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY} + ${ASSEMBLY_OPTIONS} -DENABLE_SHARED=${ENABLE_SHARED} + -DENABLE_LIBNUMA=OFF + -DX265_LATEST_TAG=3.4 OPTIONS_DEBUG -DENABLE_CLI=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_LIBNUMA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -# remove duplicated include files -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_tools(TOOL_NAMES x265 AUTO_CLEAN) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -endif() - -if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_MINGW)) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") - endif() - endif() -endif() - -# maybe create vcpkg_regex_replace_string? - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc _contents) - string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc "${_contents}") -endif() - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc _contents) - string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc "${_contents}") -endif() - if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libx265.a) - endif() + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libx265.a") endif() -if(UNIX) - foreach(FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") - if(EXISTS "${FILE}") - file(READ "${FILE}" _contents) - string(REPLACE " -lstdc++" "" _contents "${_contents}") - string(REPLACE " -lc++" "" _contents "${_contents}") - string(REPLACE " -lgcc_s" "" _contents "${_contents}") - string(REPLACE " -lgcc" "" _contents "${_contents}") - string(REPLACE " -lrt" "" _contents "${_contents}") - file(WRITE "${FILE}" "${_contents}") - endif() - endforeach() - vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) -else() - vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() +vcpkg_list(SET pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_list(APPEND pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") endif() +foreach(FILE IN LISTS pc_files) + file(READ "${FILE}" _contents) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}") + else() + string(REPLACE " -lgcc_s" "" _contents "${_contents}") + string(REPLACE " -lgcc" "" _contents "${_contents}") + endif() + file(WRITE "${FILE}" "${_contents}") +endforeach() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/x265/vcpkg.json b/external_imported/vcpkg/ports/x265/vcpkg.json index cc19a6f2b..c859dc260 100644 --- a/external_imported/vcpkg/ports/x265/vcpkg.json +++ b/external_imported/vcpkg/ports/x265/vcpkg.json @@ -1,8 +1,15 @@ { "name": "x265", - "version-string": "3.4", - "port-version": 5, + "version": "3.4", + "port-version": 7, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://github.com/videolan/x265", - "supports": "!(uwp | arm)" + "license": "GPL-2.0-or-later", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake b/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake index f6d7535d4..f0680eaf3 100644 --- a/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake +++ b/external_imported/vcpkg/ports/xaudio2redist/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(XAUDIO2REDIST_VERSION 1.2.9) + vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.8" - FILENAME "xaudio2redist.1.2.8.zip" - SHA512 509b2783457b86ed1878fd4e14a01fa7288591925a2bb3cad4d68afd597fbff1f1349b619dad628b5d685169825a775120e1611559e9097837cff0fb6d39acf0 + URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/${XAUDIO2REDIST_VERSION}" + FILENAME "xaudio2redist.${XAUDIO2REDIST_VERSION}.zip" + SHA512 c3b37640fb871523a63cd227653d8d972dd95d6e12ccf2f28c434f51bb77011c821a0cd5ae2a9fa311f005a0083798a3218a98c0a9db5db094a5ef54bb960675 ) -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/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json b/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json index 3c610f1f9..817d14e84 100644 --- a/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json +++ b/external_imported/vcpkg/ports/xaudio2redist/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xaudio2redist", - "version": "1.2.8", - "port-version": 2, + "version": "1.2.9", "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", + "documentation": "https://aka.ms/XAudio2Redist", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/external_imported/vcpkg/ports/xbyak/portfile.cmake b/external_imported/vcpkg/ports/xbyak/portfile.cmake index 67ac14359..fd08f1af9 100644 --- a/external_imported/vcpkg/ports/xbyak/portfile.cmake +++ b/external_imported/vcpkg/ports/xbyak/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v6.00 - SHA512 8bea95ddb44be39312083173cd4401039bd402c4732d97f9ff63174f6db29793f80dc1f1589d64bd96b4b13af819133897cd9843523662d13d57158c3837a778 + REF v6.60 + SHA512 83dba532c7aaa618d61f2d345caeb0ca0b1c3e4946b758095410f269ba954d1870325ed05aa7a1f8aab0b5a2961ecd878980ab835f3db3078a969d2d951aa7e9 HEAD_REF master ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/xbyak") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" diff --git a/external_imported/vcpkg/ports/xbyak/vcpkg.json b/external_imported/vcpkg/ports/xbyak/vcpkg.json index cc668903b..8244ab284 100644 --- a/external_imported/vcpkg/ports/xbyak/vcpkg.json +++ b/external_imported/vcpkg/ports/xbyak/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xbyak", - "version-string": "6.00", - "port-version": 1, + "version": "6.60", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", + "license": "BSD-3-Clause", "supports": "!(arm | uwp)", "dependencies": [ { diff --git a/external_imported/vcpkg/ports/xcb-proto/portfile.cmake b/external_imported/vcpkg/ports/xcb-proto/portfile.cmake new file mode 100644 index 000000000..8927d2a8d --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-proto/portfile.cmake @@ -0,0 +1,49 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +find_program(XMLLINT_PATH NAMES xmllint PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxml2") +if(NOT XMLLINT_PATH) + message(FATAL_ERROR "${PORT} requires xmllint which was not found!") +endif() + +string(REGEX REPLACE "/[^/]+$" "" XMLLINT_DIR "${XMLLINT_PATH}") +file(TO_NATIVE_PATH "${XMLLINT_DIR}" XMLLINT_DIR_NATIVE) +message(STATUS "Using xmlling at: ${XMLLINT_PATH}") +vcpkg_add_to_path("${XMLLINT_DIR_NATIVE}") + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") +set(ENV{PYTHON} "${PYTHON3}") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xcbproto + REF 70ca65fa35c3760661b090bc4b2601daa7a099b8 #v1.14.1 + patches + SHA512 9e08e1d2ab1fe7a8d3985568918a858ddfb31b8016ccac8ea2447631e7cede3bcc7b1ed86491d497ab871674c9b55d94fab25ee13ff6de9a44590b91d9166fda + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ac_cv_path_PYTHON='${PYTHON3}' + am_cv_python_pyexecdir=\\\${prefix}/tools/python3/site-packages + am_cv_python_pythondir=\\\${prefix}/tools/python3/site-packages + ) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/xcb-proto/vcpkg.json b/external_imported/vcpkg/ports/xcb-proto/vcpkg.json new file mode 100644 index 000000000..0f285d781 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-proto/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xcb-proto", + "version": "1.14.1", + "description": "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "bzip2", + { + "name": "libxml2", + "host": true, + "features": [ + "tools" + ] + }, + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/xcb-render-util/portfile.cmake b/external_imported/vcpkg/ports/xcb-render-util/portfile.cmake new file mode 100644 index 000000000..2bad74375 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-render-util/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-render-util + REF 0317caf63de532fd7a0493ed6afa871a67253747 #v 0.3.9 + SHA512 9a16c3eb3575586fce85a548cb5fd8b23aa8e42363b2c6d4e074e45f5c04089301ef2ff3012cf9cc94490359d4e28ff062feaecb97a880c9240bf7dbe5d03612 + HEAD_REF master # branch name + PATCHES pthread.patch # required since this port directly depends on pthread functions. So it has to directly link it! +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/xcb-render-util/pthread.patch b/external_imported/vcpkg/ports/xcb-render-util/pthread.patch new file mode 100644 index 000000000..f045879bd --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-render-util/pthread.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 803abe77b..7d694e401 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,7 @@ AM_MAINTAINER_MODE + XCB_UTIL_COMMON([1.4], [1.6]) + + PKG_CHECK_MODULES(XCB_RENDER, xcb-render) ++PKG_CHECK_MODULES(PTHREAD_STUBS, pthread-stubs) + + AC_CONFIG_FILES([Makefile + renderutil/Makefile +diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am +index 3a5179884..d403aa34a 100644 +--- a/renderutil/Makefile.am ++++ b/renderutil/Makefile.am +@@ -4,9 +4,9 @@ lib_LTLIBRARIES = libxcb-render-util.la + xcbinclude_HEADERS = xcb_renderutil.h + + AM_CFLAGS = $(BASE_CFLAGS) +-AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS) ++AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS) ${PTHREAD_STUBS_CFLAGS} + libxcb_render_util_la_SOURCES = cache.c util.c glyph.c +-libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS) ++libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS) ${PTHREAD_STUBS_LIBS} + libxcb_render_util_la_LDFLAGS = -no-undefined + + pkgconfig_DATA = xcb-renderutil.pc diff --git a/external_imported/vcpkg/ports/xcb-render-util/vcpkg.json b/external_imported/vcpkg/ports/xcb-render-util/vcpkg.json new file mode 100644 index 000000000..8c3d47bac --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-render-util/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xcb-render-util", + "version": "0.3.9", + "description": "XCB convenience functions for the Render extension.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb" + ] +} diff --git a/external_imported/vcpkg/ports/xcb-util-m4/portfile.cmake b/external_imported/vcpkg/ports/xcb-util-m4/portfile.cmake new file mode 100644 index 000000000..f38f1027e --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-util-m4/portfile.cmake @@ -0,0 +1,15 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/xcb-util-m4 + REF f662e3a93ebdec3d1c9374382dcc070093a42fed #v1.19.2 + SHA512 29840da449a434f169437fd2cef78273e0cba00a7f76d48790c838dc8f40fe55cb0932d96b649e1bd066c6c5e257dd2d9d71c663ce100aa5ca25a2ccec1b7e77 + HEAD_REF master +) + +file(GLOB_RECURSE M4_FILES "${SOURCE_PATH}/*.m4") +file(INSTALL ${M4_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/xcb-util-m4/copyright") diff --git a/external_imported/vcpkg/ports/xcb-util-m4/vcpkg.json b/external_imported/vcpkg/ports/xcb-util-m4/vcpkg.json new file mode 100644 index 000000000..e2d7d051e --- /dev/null +++ b/external_imported/vcpkg/ports/xcb-util-m4/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "xcb-util-m4", + "version-date": "2022-01-24", + "description": "GNU autoconf macros shared across XCB projects", + "homepage": "https://gitlab.freedesktop.org/xorg/util/xcb-util-m4", + "license": null +} diff --git a/external_imported/vcpkg/ports/xcb/configure.patch b/external_imported/vcpkg/ports/xcb/configure.patch new file mode 100644 index 000000000..94c33225b --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/configure.patch @@ -0,0 +1,47 @@ +diff --git a/configure.ac b/configure.ac +index 8a05bf1aa..1f57cc688 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,6 +22,7 @@ AC_USE_SYSTEM_EXTENSIONS + # Initialize libtool + LT_PREREQ([2.2]) + LT_INIT([win32-dll]) ++AC_LIBTOOL_WIN32_DLL + + # Require xorg-macros minimum of 1.18 - Initial version + m4_ifndef([XORG_MACROS_VERSION], +@@ -88,11 +88,11 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) + AC_SUBST(XCBPROTO_XCBPYTHONDIR) + + AC_HEADER_STDC +-AC_SEARCH_LIBS(getaddrinfo, socket) +-AC_SEARCH_LIBS(connect, socket) ++AC_SEARCH_LIBS(getaddrinfo, [socket Ws2_32]) ++AC_SEARCH_LIBS(connect, [socket Ws2_32]) + + # Find support for sending a message from a socket +-AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"]) ++AC_SEARCH_LIBS(sendmsg, [socket Ws2_32], [have_sendmsg="yes"], [have_sendmsg="no"]) + + # XPG4v2/UNIX95 added msg_control - check to see if we need to define + # _XOPEN_SOURCE to get it (such as on Solaris) +@@ -140,6 +141,10 @@ mingw*) + have_win32="yes" + lt_enable_auto_import="-Wl,--enable-auto-import" + ;; ++msys*) ++ have_win32="yes" ++ lt_enable_auto_import="-Wl,--enable-auto-import" ++ ;; + linux*) + AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets]) + ;; +@@ -208,7 +213,7 @@ esac + + dnl Link with winsock for socket functions on MinGW + case $host_os in +- *mingw*) ++ *mingw*| *msys* ) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) diff --git a/external_imported/vcpkg/ports/xcb/getpid_include.patch b/external_imported/vcpkg/ports/xcb/getpid_include.patch new file mode 100644 index 000000000..755cd3e3f --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/getpid_include.patch @@ -0,0 +1,14 @@ +diff --git a/src/xcb_auth.c b/src/xcb_auth.c +index 8ebe9a437..9a1e459fc 100644 +--- a/src/xcb_auth.c ++++ b/src/xcb_auth.c +@@ -46,6 +46,9 @@ + #include + #endif + #include "xcb_windefs.h" ++#ifdef _MSC_VER ++#include ++#endif + #else + #include + #include diff --git a/external_imported/vcpkg/ports/xcb/makefile.patch b/external_imported/vcpkg/ports/xcb/makefile.patch new file mode 100644 index 000000000..9171fcf03 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/makefile.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 17b64a80e..f45d9d0fe 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -260,7 +260,7 @@ if XCB_SERVERSIDE_SUPPORT + C_CLIENT_PY_EXTRA_ARGS += --server-side + endif + +-$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml) ++$(EXTSOURCES): c_client.py /$(@:.c=.xml) + $(AM_V_GEN)$(PYTHON) $(srcdir)/c_client.py -c "$(PACKAGE_STRING)" -l "$(XORG_MAN_PAGE)" \ + -s "$(LIB_MAN_SUFFIX)" -p $(XCBPROTO_XCBPYTHONDIR) \ + $(C_CLIENT_PY_EXTRA_ARGS) \ diff --git a/external_imported/vcpkg/ports/xcb/portfile.cmake b/external_imported/vcpkg/ports/xcb/portfile.cmake new file mode 100644 index 000000000..a8fcbd513 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/portfile.cmake @@ -0,0 +1,107 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb + REF ddafdba11f6919e6fcf977c09c78b06f94de47aa #v1.14 + some patches + SHA512 d8382b04f2b00671cded9e22d6066164511ee4c08e2cf5de4ec28d09e41228e30d3ba7d0e6b5141abf4e4bc777aa662fe9d1d04f3e1e26e0b323549e845c8072 + HEAD_REF master + PATCHES makefile.patch # without the patch target xproto.c is missing target XCBPROTO_XCBINCLUDEDIR + configure.patch + use_xwindows_includes.patch # use the X11 include wrappers for windows headers + getpid_include.patch # add include for getpid on windows +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) +endif() + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") + +if(NOT XLSTPROC) + find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin") +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") + +if(DEFINED ENV{PYTHONPATH}) + set(ENV{PYTHONPATH} "${CURRENT_INSTALLED_DIR}/tools/python3/site-packages/${VCPKG_HOST_PATH_SEPARATOR}$ENV{PYTHONPATH}") +else() + set(ENV{PYTHONPATH} "${CURRENT_INSTALLED_DIR}/tools/python3/site-packages/") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: xau xdmcp ") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: xau xdmcp ") +endif() + +vcpkg_fixup_pkgconfig() + +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/${PORT}" RENAME copyright) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND NOT VCPKG_TARGET_IS_MINGW) + set(extensions + bigreq + composite + damage + dpms + dri2 + dri3 + ge + glx + present + randr + record + render + res + screensaver + shape + shm + sync + xc_misc + xevie + xf86dri + xfixes + xinerama + xinput + xkb + xprint + xtest + xv + xvmc) + foreach(ext IN LISTS extensions) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/xcb/${ext}.h" + "extern xcb_extension_t" + "__declspec(dllimport) extern xcb_extension_t") + endforeach() +endif() +endif() diff --git a/external_imported/vcpkg/ports/xcb/use_xwindows_includes.patch b/external_imported/vcpkg/ports/xcb/use_xwindows_includes.patch new file mode 100644 index 000000000..23177fc77 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/use_xwindows_includes.patch @@ -0,0 +1,21 @@ +diff --git a/src/xcb_windefs.h b/src/xcb_windefs.h +index df6026da3..7591c61e7 100644 +--- a/src/xcb_windefs.h ++++ b/src/xcb_windefs.h +@@ -31,10 +31,13 @@ + #define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */ + #endif + +-#include ++#include ++#include ++#include ++typedef unsigned char BYTE; +-#include +-#include + ++#define STDERR_FILENO _fileno( stderr ) ++ + struct iovec { + void *iov_base; /* Pointer to data. */ + int iov_len; /* Length of data. */ diff --git a/external_imported/vcpkg/ports/xcb/vcpkg.json b/external_imported/vcpkg/ports/xcb/vcpkg.json new file mode 100644 index 000000000..cc87d4357 --- /dev/null +++ b/external_imported/vcpkg/ports/xcb/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "xcb", + "version": "1.14", + "description": "C interface to the X Window System protocol, which replaces the traditional Xlib interface.", + "homepage": "https://xcb.freedesktop.org/", + "license": "X11-distribute-modifications-variant", + "dependencies": [ + "bzip2", + "libxau", + "libxdmcp", + { + "name": "libxslt", + "host": true + }, + "pthread", + "pthread-stubs", + "xcb-proto", + "xcb-util-m4", + "xorg-macros", + "xproto" + ] +} diff --git a/external_imported/vcpkg/ports/xlnt/fix-missing-include.patch b/external_imported/vcpkg/ports/xlnt/fix-missing-include.patch new file mode 100644 index 000000000..ac2396d1c --- /dev/null +++ b/external_imported/vcpkg/ports/xlnt/fix-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/source/detail/number_format/number_formatter.cpp b/source/detail/number_format/number_formatter.cpp +index b116fd0..653da0e 100644 +--- a/source/detail/number_format/number_formatter.cpp ++++ b/source/detail/number_format/number_formatter.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/external_imported/vcpkg/ports/xlnt/portfile.cmake b/external_imported/vcpkg/ports/xlnt/portfile.cmake index 3ad72194a..1839b1d67 100644 --- a/external_imported/vcpkg/ports/xlnt/portfile.cmake +++ b/external_imported/vcpkg/ports/xlnt/portfile.cmake @@ -11,8 +11,9 @@ vcpkg_from_github( SHA512 414d691b372934326dc0da134eb7752c27c3223b6e92b433494d0758ca657f43b66894ad54ac97a8410387a2531a573c81572daa6a0434fa023e8e29ca74331c HEAD_REF master PATCHES - "fix-not-found-include.patch" + fix-not-found-include.patch ${win_patch} + fix-missing-include.patch ) file(REMOVE "${SOURCE_PATH}/third-party/libstudxml/version") @@ -22,20 +23,19 @@ else() set(STATIC ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xlnt) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/xlnt/vcpkg.json b/external_imported/vcpkg/ports/xlnt/vcpkg.json index eb2275878..e5e25bf2f 100644 --- a/external_imported/vcpkg/ports/xlnt/vcpkg.json +++ b/external_imported/vcpkg/ports/xlnt/vcpkg.json @@ -1,7 +1,18 @@ { "name": "xlnt", "version": "1.5.0", - "port-version": 3, + "port-version": 4, "description": "Cross-platform user-friendly xlsx library for C++14", - "homepage": "https://github.com/tfussell/xlnt" + "homepage": "https://github.com/tfussell/xlnt", + "license": "MIT OR BSD-3-Clause OR BSD-2-Clause OR LGPL-3.0-only OR BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/xlsxio/export-targets.patch b/external_imported/vcpkg/ports/xlsxio/export-targets.patch new file mode 100644 index 000000000..112473771 --- /dev/null +++ b/external_imported/vcpkg/ports/xlsxio/export-targets.patch @@ -0,0 +1,138 @@ +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/external_imported/vcpkg/ports/xlsxio/portfile.cmake b/external_imported/vcpkg/ports/xlsxio/portfile.cmake index 74b004755..7d7915e9c 100644 --- a/external_imported/vcpkg/ports/xlsxio/portfile.cmake +++ b/external_imported/vcpkg/ports/xlsxio/portfile.cmake @@ -4,10 +4,12 @@ vcpkg_from_github( REF e3acace39e5fb153f5ce3500a4952c2bf93175bd SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea HEAD_REF master - PATCHES fix-dependencies.patch + PATCHES + fix-dependencies.patch + export-targets.patch # https://github.com/brechtsanders/xlsxio/pull/105 ) -file(REMOVE ${SOURCE_PATH}/CMake/FindMinizip.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/FindMinizip.cmake") vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -15,17 +17,11 @@ vcpkg_check_features( libzip WITH_LIBZIP ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC ON) - set(BUILD_SHARED OFF) -else() - set(BUILD_SHARED ON) - set(BUILD_STATIC OFF) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +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} -DBUILD_SHARED=${BUILD_SHARED} @@ -37,10 +33,12 @@ vcpkg_configure_cmake( -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) 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) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/xlsxio/vcpkg.json b/external_imported/vcpkg/ports/xlsxio/vcpkg.json index bc61d92e4..376964779 100644 --- a/external_imported/vcpkg/ports/xlsxio/vcpkg.json +++ b/external_imported/vcpkg/ports/xlsxio/vcpkg.json @@ -1,8 +1,10 @@ { "name": "xlsxio", "version-date": "2021-03-24", + "port-version": 1, "description": "Cross-platform C library for reading values from and writing values to .xlsx files", "homepage": "https://github.com/brechtsanders/xlsxio", + "license": "MIT", "dependencies": [ "expat", { @@ -10,6 +12,14 @@ "features": [ "bzip2" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/external_imported/vcpkg/ports/xmlsec/portfile.cmake b/external_imported/vcpkg/ports/xmlsec/portfile.cmake index 06100e4c1..e105d409c 100644 --- a/external_imported/vcpkg/ports/xmlsec/portfile.cmake +++ b/external_imported/vcpkg/ports/xmlsec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec - REF e628e70040cb0d81a561462472806aeaac1d1bc7 #xmlsec-1_2_33 - SHA512 2d4485941d354160f7fabd84394c61eef9dcea8be572d78bf7da7370880747f86ff76127fa000f8b0de06f462abef17d653270dee680fa35d96cc8200fb4d1a6 + REF d823da17c80b38ccc3c4262d7b2042b07e69e266 # xmlsec-1_2_34 + SHA512 10ca5cb948723fcf1531efaab547c0665bc323cd52906decd314e0c78fff46ac7bc51eba5177838fc7f081f74f5e4a202d765c17dd0da6e378798676773a68ce HEAD_REF master PATCHES pkgconfig_fixes.patch diff --git a/external_imported/vcpkg/ports/xmlsec/vcpkg.json b/external_imported/vcpkg/ports/xmlsec/vcpkg.json index 446cfcf1a..c09ebc45e 100644 --- a/external_imported/vcpkg/ports/xmlsec/vcpkg.json +++ b/external_imported/vcpkg/ports/xmlsec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xmlsec", - "version": "1.2.33", + "version": "1.2.34", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/xorg-macros/portfile.cmake b/external_imported/vcpkg/ports/xorg-macros/portfile.cmake new file mode 100644 index 000000000..75bdc7e35 --- /dev/null +++ b/external_imported/vcpkg/ports/xorg-macros/portfile.cmake @@ -0,0 +1,67 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES skip_rawcpp.patch) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/macros + REF b8766308d2f78bc572abe5198007cf7aeec9b761 #v1.19.3 + SHA512 dc7383b1579dc6ef0473161764096c8161f23a4c4ba2182e7abd7f73f443eb0520e02f1dfaaba2f8ebb43e0ed93c1e6e5e7cf517561476b858d2471a8ecaf907 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_make() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +endif() + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/util-macros/" "${CURRENT_PACKAGES_DIR}/share/xorg/util-macros") + +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/xorg-macros.pc" _contents) +string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") +string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/include" "includedir=\${prefix}/include" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/xorg-macros.pc") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc") + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") + string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xorg/debug}" _contents "${_contents}") + string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") + if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/xorg/debug/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/external_imported/vcpkg/ports/xorg-macros/skip_rawcpp.patch b/external_imported/vcpkg/ports/xorg-macros/skip_rawcpp.patch new file mode 100644 index 000000000..3e5ce9a7e --- /dev/null +++ b/external_imported/vcpkg/ports/xorg-macros/skip_rawcpp.patch @@ -0,0 +1,43 @@ +diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in +index f0a16da3a..e1c0ff1ed 100644 +--- a/xorg-macros.m4.in ++++ b/xorg-macros.m4.in +@@ -63,38 +63,6 @@ AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], + # Check for flag to avoid builtin definitions - assumes unix is predefined, + # which is not the best choice for supporting other OS'es, but covers most + # of the ones we need for now. +-AC_MSG_CHECKING([if $RAWCPP requires -undef]) +-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- AC_MSG_RESULT([no]) +-else +- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS=-undef +- AC_MSG_RESULT([yes]) +- # under Cygwin unix is still defined even with -undef +- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS="-undef -ansi" +- AC_MSG_RESULT([yes, with -ansi]) +- else +- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) +- fi +-fi +-rm -f conftest.$ac_ext +- +-AC_MSG_CHECKING([if $RAWCPP requires -traditional]) +-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- AC_MSG_RESULT([no]) +-else +- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- TRADITIONALCPPFLAGS="-traditional" +- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) +- fi +-fi +-rm -f conftest.$ac_ext + AC_SUBST(RAWCPPFLAGS) + AC_SUBST(TRADITIONALCPPFLAGS) + ]) # XORG_PROG_RAWCPP diff --git a/external_imported/vcpkg/ports/xorg-macros/vcpkg.json b/external_imported/vcpkg/ports/xorg-macros/vcpkg.json new file mode 100644 index 000000000..4da776684 --- /dev/null +++ b/external_imported/vcpkg/ports/xorg-macros/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "xorg-macros", + "version": "1.19.3", + "description": "X.org macros utilities.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "supports": "!uwp" +} diff --git a/external_imported/vcpkg/ports/xproto/portfile.cmake b/external_imported/vcpkg/ports/xproto/portfile.cmake new file mode 100644 index 000000000..87380da9a --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/portfile.cmake @@ -0,0 +1,51 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES + vcxserver-xw32defs.patch + windows-long64.patch + windows-io.patch + windows_mean_and_lean.patch + windows-none.patch + windows-include-guards.patch + ) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xorgproto + REF 57acac1d4c7967f4661fb1c9f86f48f34a46c48d # 2021.5 + SHA512 5d2b6096e7f6ec6a3414f4370da583f6660fbd287474e8b4cd3e51ccc35514181352d3b0b9cd4b8d6e30de7b54f4ce01a9fbf17be75cf8de18aa28e9f774b8c4 + HEAD_REF master + PATCHES + upstream-1.patch + ${PATCHES} +) + +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-Dlegacy=true") +vcpkg_install_meson() + +# To make CMake consumption easier. +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() + +vcpkg_fixup_pkgconfig(SKIP_CHECK) # pc files requiring Xau Xt xt SM ICE X11 xcb Xdmcp are installed before they can be used. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(GLOB_RECURSE _files "${SOURCE_PATH}/COPYING*") +file(INSTALL ${_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST ${_files}) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "") +endif() diff --git a/external_imported/vcpkg/ports/xproto/upstream-1.patch b/external_imported/vcpkg/ports/xproto/upstream-1.patch new file mode 100644 index 000000000..55f283f63 --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/upstream-1.patch @@ -0,0 +1,12 @@ +diff --git a/include/X11/XF86keysym.h b/include/X11/XF86keysym.h +index c242e42f5fee2e28da11df2d33b005e9bb4b5441..59ba54d1a13fabdded6920ce946c1e20594f49ff 100644 +--- a/include/X11/XF86keysym.h ++++ b/include/X11/XF86keysym.h +@@ -394,6 +394,7 @@ + #define XF86XK_VoiceCommand _EVDEVK(0x246) /* v3.16 KEY_VOICECOMMAND */ + #define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */ + /* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */ ++#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */ + #define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */ + #define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */ + #define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */ diff --git a/external_imported/vcpkg/ports/xproto/vcpkg.json b/external_imported/vcpkg/ports/xproto/vcpkg.json new file mode 100644 index 000000000..43a4509c3 --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xproto", + "version": "2021.5", + "description": "X Window System unified protocol definitions", + "homepage": "https://gitlab.freedesktop.org/xorg/proto/xorgproto", + "license": null, + "dependencies": [ + "libxslt", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/xproto/vcxserver-xw32defs.patch b/external_imported/vcpkg/ports/xproto/vcxserver-xw32defs.patch new file mode 100644 index 000000000..03b84a4cf --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/vcxserver-xw32defs.patch @@ -0,0 +1,22 @@ +diff --git a/include/X11/Xw32defs.h b/include/X11/Xw32defs.h +index 683b588..db1eabd 100644 +--- a/include/X11/Xw32defs.h ++++ b/include/X11/Xw32defs.h +@@ -27,7 +27,6 @@ typedef char *caddr_t; + # define execve _execve + # define execvp _execvp + # define execvpe _execvpe +-# define fdopen _fdopen + # define fileno _fileno + # define fstat _fstat + # define getcwd _getcwd +@@ -72,8 +71,8 @@ typedef char *caddr_t; + # define S_IEXEC _S_IEXEC + + # define F_OK 0 +-# define X_OK 1 + # define W_OK 2 + # define R_OK 4 ++# define X_OK R_OK + # endif /* __GNUC__ */ + #endif diff --git a/external_imported/vcpkg/ports/xproto/windows-include-guards.patch b/external_imported/vcpkg/ports/xproto/windows-include-guards.patch new file mode 100644 index 000000000..7e252aacd --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/windows-include-guards.patch @@ -0,0 +1,41 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 900257928..666ee6515 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -41,6 +41,11 @@ The Open Group. + * do as it's no help at all to X11 clients which also need to use the + * Win32 API) + */ ++#pragma once ++ ++#ifndef _X11_XWINDOWS_H_ ++#define _X11_XWINDOWS_H_ ++ + #undef _XFree86Server + #ifdef XFree86Server + # define _XFree86Server +@@ -130,3 +135,4 @@ typedef int Status; + # undef _XFree86Server + #endif + ++#endif +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 92e0d2a33..1e3e8671b 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -32,6 +32,10 @@ The Open Group. + * Conflicts come from the fact that including winsock.h actually pulls + * in the whole Windows API... + */ ++#pragma once ++ ++#ifndef _X11_XWINSOCK_H_ ++#define _X11_XWINSOCK_H_ + + #undef _XFree86Server + #ifdef XFree86Server +@@ -100,3 +104,4 @@ typedef int Status; + # undef _XFree86Server + #endif + ++#endif diff --git a/external_imported/vcpkg/ports/xproto/windows-io.patch b/external_imported/vcpkg/ports/xproto/windows-io.patch new file mode 100644 index 000000000..159d1217d --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/windows-io.patch @@ -0,0 +1,12 @@ +diff --git a/include/X11/Xos.h b/include/X11/Xos.h +index 28dfc673a..37d268f27 100644 +--- a/include/X11/Xos.h ++++ b/include/X11/Xos.h +@@ -80,6 +80,7 @@ in this Software without prior written authorization from The Open Group. + # include + # endif + # ifdef WIN32 ++# include // For open() + # include + # else + # include diff --git a/external_imported/vcpkg/ports/xproto/windows-long64.patch b/external_imported/vcpkg/ports/xproto/windows-long64.patch new file mode 100644 index 000000000..5d8b74396 --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/windows-long64.patch @@ -0,0 +1,48 @@ +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 624047d..e8d5653 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -47,6 +47,10 @@ The Open Group. + #define _NO_BOOL_TYPEDEF + #define BOOL WINBOOL + #define INT32 wINT32 ++#ifdef __x86_64__ ++#define INT64 wINT64 ++#define LONG64 wLONG64 ++#endif + #undef Status + #define Status wStatus + #define ATOM wATOM +@@ -58,6 +62,8 @@ The Open Group. + #undef BYTE + #undef BOOL + #undef INT32 ++#undef INT64 ++#undef LONG64 + #undef ATOM + #undef FreeResource + #undef CreateWindowA +diff --git a/include/X11/meson.build b/include/X11/meson.build +index 1c33c64..703ab19 100644 +--- a/include/X11/meson.build ++++ b/include/X11/meson.build +@@ -1,7 +1,8 @@ + fd_set_maybe_headers = [ 'sys/param.h', + 'sys/types.h', + 'sys/time.h', +- 'sys/select.h' ++ 'sys/select.h', ++ 'winsock2.h' + ] + fd_set_headers = '' + foreach h : fd_set_maybe_headers +@@ -15,6 +16,8 @@ if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers) + fds_bits = 'fds_bits' + elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers) + fds_bits = '__fds_bits' ++elif cc.has_member('fd_set', 'fd_count', prefix: fd_set_headers) ++ fds_bits = 'fd_count' + else + error('Your fd_set is too weird.') + endif +-- \ No newline at end of file diff --git a/external_imported/vcpkg/ports/xproto/windows-none.patch b/external_imported/vcpkg/ports/xproto/windows-none.patch new file mode 100644 index 000000000..87764c88b --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/windows-none.patch @@ -0,0 +1,85 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 70e1debd5..236ec96a7 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -69,6 +69,16 @@ The Open Group. + #endif + #undef Status + #define Status wStatus ++#ifdef None // FS.h defines None which is used in winnt.h ++#pragma push_macro("None") ++#define NoneDefined ++#undef None ++#endif ++#ifdef ControlMask // X.h defines ControlMask which is used in processthreadapi.h ++#pragma push_macro("ControlMask") ++#define ControlMaskDefined ++#undef ControlMask ++#endif + #define ATOM wATOM + #define BYTE wBYTE + #define FreeResource wFreeResource +@@ -76,6 +77,14 @@ The Open Group. + #undef NOMINMAX + #undef Status +-#define Status int ++typedef int Status; ++#ifdef NoneDefined ++#pragma pop_macro("None") ++#undef NoneDefined ++#endif ++#ifdef ControlMaskDefined ++#pragma pop_macro("ControlMask") ++#undef ControlMaskDefined ++#endif + #undef BYTE + #undef BOOL + #undef INT32 +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 624047d..e8d5653 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -47,23 +47,42 @@ The Open Group. + #define _NO_BOOL_TYPEDEF + #define BOOL WINBOOL + #define INT32 wINT32 + #ifdef __x86_64__ + #define INT64 wINT64 + #define LONG64 wLONG64 + #endif + #undef Status + #define Status wStatus ++#ifdef None ++#pragma push_macro("None") ++#define NoneDefined ++#undef None ++#endif ++#ifdef ControlMask ++#pragma push_macro("ControlMask") ++#define ControlMaskDefined ++#undef ControlMask ++#endif + #define ATOM wATOM + #define BYTE wBYTE + #define FreeResource wFreeResource + #include ++#include + #undef Status +-#define Status int ++typedef int Status; ++#ifdef NoneDefined ++#pragma pop_macro("None") ++#undef NoneDefined ++#endif ++#ifdef ControlMaskDefined ++#pragma pop_macro("ControlMask") ++#undef ControlMaskDefined ++#endif + #undef BYTE + #undef BOOL + #undef INT32 + #undef INT64 + #undef LONG64 + #undef ATOM + #undef FreeResource + #undef CreateWindowA diff --git a/external_imported/vcpkg/ports/xproto/windows_mean_and_lean.patch b/external_imported/vcpkg/ports/xproto/windows_mean_and_lean.patch new file mode 100644 index 000000000..f50e4c880 --- /dev/null +++ b/external_imported/vcpkg/ports/xproto/windows_mean_and_lean.patch @@ -0,0 +1,13 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 70e1debd5..236ec96a7 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -54,7 +54,7 @@ The Open Group. + * + */ + #define NOMINMAX +- ++#define WIN32_LEAN_AND_MEAN // Otherwise this will include winsock.h! + /* + * mingw-w64 headers define BOOL as a typedef, protecting against macros + * mingw.org headers define BOOL in terms of WINBOOL diff --git a/external_imported/vcpkg/ports/xsimd/portfile.cmake b/external_imported/vcpkg/ports/xsimd/portfile.cmake index 32e59e355..7d10527a9 100644 --- a/external_imported/vcpkg/ports/xsimd/portfile.cmake +++ b/external_imported/vcpkg/ports/xsimd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd - REF 8.0.3 - SHA512 4c93eea5c5ba7c72f718d7d404b9630850e0805d2698d472b964e4de765678801b369ce1da5e53372f28944f5f647a7ac162995f92535a820c6f4fc9defa7e5f + REF 8.1.0 + SHA512 539f7b565b45e8225c6476ca1becc8243a84ae7fb51b45a584231e7d36aee10a09d7d30fb87d89cb77813fb063a7b7617bcf01fdf996f59d99e8d474d2a044ee HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/xsimd/vcpkg.json b/external_imported/vcpkg/ports/xsimd/vcpkg.json index a110b1918..bfcc3f98b 100644 --- a/external_imported/vcpkg/ports/xsimd/vcpkg.json +++ b/external_imported/vcpkg/ports/xsimd/vcpkg.json @@ -1,8 +1,9 @@ { "name": "xsimd", - "version": "8.0.3", + "version": "8.1.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/external_imported/vcpkg/ports/xtensor-blas/portfile.cmake b/external_imported/vcpkg/ports/xtensor-blas/portfile.cmake index 4de89d275..c49b540d5 100644 --- a/external_imported/vcpkg/ports/xtensor-blas/portfile.cmake +++ b/external_imported/vcpkg/ports/xtensor-blas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor-blas - REF 2876b041a2759f10dfde13ab3a2fc09578ae4b40 # 0.17.2 - SHA512 64c78d093f24fc15715bc7dfa486cfb1342a6752ea497f43553d031fc8be30718d01157e5b6412c516e6ce2be9045a89963d912e60f4eb7431675331b8ed6f90 + REF 66ab0fa7cd53d0b914f89d4d451576a9240ea457 # 0.20.0 + SHA512 c95aa1388577ca74933c81e56322c9dae9c4d6b0493be60d5a3bfbaeaf769f6005542b5b0a24a6c6374007499113c2920870b01c4f5ea712ad78c2468964b6db HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/xtensor-blas/vcpkg.json b/external_imported/vcpkg/ports/xtensor-blas/vcpkg.json index 70c314727..0189ad0f5 100644 --- a/external_imported/vcpkg/ports/xtensor-blas/vcpkg.json +++ b/external_imported/vcpkg/ports/xtensor-blas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xtensor-blas", - "version-string": "0.17.2", - "port-version": 2, + "version": "0.20.0", "description": "BLAS extension to xtensor", "homepage": "https://github.com/xtensor-stack/xtensor-blas", "dependencies": [ diff --git a/external_imported/vcpkg/ports/xtrans/portfile.cmake b/external_imported/vcpkg/ports/xtrans/portfile.cmake new file mode 100644 index 000000000..e7e726e06 --- /dev/null +++ b/external_imported/vcpkg/ports/xtrans/portfile.cmake @@ -0,0 +1,64 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxtrans + REF 3b5df889f58a99980a35a7b4a18eb4e7d2abeac4 #v1.4 + SHA512 d1a1ecd8aa07d19a8b4936a37109cecd0c965b859a17ea838835230f9326c1a353feef388052df03173562cbf0f3e3764146c3669b1928698cd55ccc4f92992c + HEAD_REF master + PATCHES win32.patch + symbols.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG +) + +vcpkg_install_make() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +endif() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/") +# the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") +endif() + +vcpkg_fixup_pkgconfig() # must be called after files have been moved + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xtrans.pc" ) +file(READ "${_file}" _contents) +string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" ) +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +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/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "") +endif() diff --git a/external_imported/vcpkg/ports/xtrans/symbols.patch b/external_imported/vcpkg/ports/xtrans/symbols.patch new file mode 100644 index 000000000..2110d31b1 --- /dev/null +++ b/external_imported/vcpkg/ports/xtrans/symbols.patch @@ -0,0 +1,15 @@ +diff --git a/Xtransutil.c b/Xtransutil.c +index 413a02376..2f8af0efc 100644 +--- a/Xtransutil.c ++++ b/Xtransutil.c +@@ -64,6 +64,10 @@ from The Open Group. + #ifdef WIN32 + #include + #include ++#ifdef _MSC_VER ++# include ++# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif + #endif + + #ifdef X11_t diff --git a/external_imported/vcpkg/ports/xtrans/vcpkg.json b/external_imported/vcpkg/ports/xtrans/vcpkg.json new file mode 100644 index 000000000..151d527b8 --- /dev/null +++ b/external_imported/vcpkg/ports/xtrans/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xtrans", + "version": "1.4.0", + "description": "xtrans - X Network Transport layer shared code", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtrans", + "license": null, + "dependencies": [ + "xorg-macros" + ] +} diff --git a/external_imported/vcpkg/ports/xtrans/win32.patch b/external_imported/vcpkg/ports/xtrans/win32.patch new file mode 100644 index 000000000..dee4c79d7 --- /dev/null +++ b/external_imported/vcpkg/ports/xtrans/win32.patch @@ -0,0 +1,58 @@ +diff --git a/Xtrans.h b/Xtrans.h +index fbf385e01..e52e7cba2 100644 +--- a/Xtrans.h ++++ b/Xtrans.h +@@ -50,6 +50,10 @@ from The Open Group. + #ifndef _XTRANS_H_ + #define _XTRANS_H_ + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #include + #include + #include +diff --git a/Xtransint.h b/Xtransint.h +index 2156bd52f..735b54301 100644 +--- a/Xtransint.h ++++ b/Xtransint.h +@@ -72,7 +72,7 @@ from The Open Group. + # define XTRANSDEBUG 1 + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(_WIN32) + # define _WILLWINSOCK_ + #endif + +diff --git a/Xtranssock.c b/Xtranssock.c +index c29390eaa..f2ef365cc 100644 +--- a/Xtranssock.c ++++ b/Xtranssock.c +@@ -74,6 +74,10 @@ from the copyright holders. + #include + #endif + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #ifndef WIN32 + + #if defined(TCPCONN) || defined(UNIXCONN) +diff --git a/Xtransutil.c b/Xtransutil.c +index f15be243c..cc67315e6 100644 +--- a/Xtransutil.c ++++ b/Xtransutil.c +@@ -54,6 +54,10 @@ from The Open Group. + * the internal implementation. + */ + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #ifdef XTHREADS + #include + #endif diff --git a/external_imported/vcpkg/ports/yara/portfile.cmake b/external_imported/vcpkg/ports/yara/portfile.cmake index 5d179593a..207bca6d7 100644 --- a/external_imported/vcpkg/ports/yara/portfile.cmake +++ b/external_imported/vcpkg/ports/yara/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara - REF 136794355c51242b595af42309a234846d534e8b #v4.2.0 - SHA512 b0aabbf4d0ba585e3adab7dbdb708264c4d4140179e69c8bc57a2ea85cdd6d97f61e67e2ce06c8436450b4e0add7f475ff76d7ca549a9b1168ac057a6cbae776 + REF ba94b4f8ebb6d56786d14f6a0f7529b32d7c216f #v4.2.3 + SHA512 34bbe80c0f108691c7dd36fe56a2f866fc90424417a14df80781670f8150662a6160fecc4b697c6ff7eca3f98d78cdcb91f38e7f2a6542814b739869662d6608 HEAD_REF master ) diff --git a/external_imported/vcpkg/ports/yara/vcpkg.json b/external_imported/vcpkg/ports/yara/vcpkg.json index 0dee97a5d..8e9f32856 100644 --- a/external_imported/vcpkg/ports/yara/vcpkg.json +++ b/external_imported/vcpkg/ports/yara/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yara", - "version": "4.2.0", + "version": "4.2.3", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/ports/yasm/fix-arm-cross-build.patch b/external_imported/vcpkg/ports/yasm/fix-arm-cross-build.patch new file mode 100644 index 000000000..cfc8dfdde --- /dev/null +++ b/external_imported/vcpkg/ports/yasm/fix-arm-cross-build.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake +index ab1be00..918f51b 100644 +--- a/cmake/modules/YasmMacros.cmake ++++ b/cmake/modules/YasmMacros.cmake +@@ -58,7 +58,9 @@ macro (YASM_ADD_MODULE _module_NAME) + endmacro (YASM_ADD_MODULE) + + macro (YASM_GENPERF _in_NAME _out_NAME) ++ if (NOT _tmp_GENPERF_EXE) + get_target_property(_tmp_GENPERF_EXE genperf LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME} +@@ -68,7 +70,9 @@ macro (YASM_GENPERF _in_NAME _out_NAME) + endmacro (YASM_GENPERF) + + macro (YASM_RE2C _in_NAME _out_NAME) ++ if (NOT _tmp_RE2C_EXE) + get_target_property(_tmp_RE2C_EXE re2c LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME} +@@ -78,7 +82,9 @@ macro (YASM_RE2C _in_NAME _out_NAME) + endmacro (YASM_RE2C) + + macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME) ++ if (NOT _tmp_GENMACRO_EXE) + get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME} +diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt +index e10a9dd..e28ffbb 100644 +--- a/modules/preprocs/nasm/CMakeLists.txt ++++ b/modules/preprocs/nasm/CMakeLists.txt +@@ -1,5 +1,8 @@ ++if (NOT _tmp_GENVERSION_EXE) + add_executable(genversion preprocs/nasm/genversion.c) ++install(TARGETS genversion RUNTIME DESTINATION bin) + get_target_property(_tmp_GENVERSION_EXE genversion LOCATION) ++endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac + COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac +diff --git a/tools/genmacro/CMakeLists.txt b/tools/genmacro/CMakeLists.txt +index 27ba599..0168494 100644 +--- a/tools/genmacro/CMakeLists.txt ++++ b/tools/genmacro/CMakeLists.txt +@@ -1,3 +1,7 @@ ++if (NOT _tmp_GENMACRO_EXE) + add_executable(genmacro + genmacro.c + ) ++ ++install(TARGETS genmacro RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file +diff --git a/tools/genperf/CMakeLists.txt b/tools/genperf/CMakeLists.txt +index 6f50989..87d19bc 100644 +--- a/tools/genperf/CMakeLists.txt ++++ b/tools/genperf/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if (NOT _tmp_GENPERF_EXE) + add_executable(genperf + genperf.c + perfect.c +@@ -6,3 +7,6 @@ add_executable(genperf + ../../libyasm/xstrdup.c + ) + set_target_properties(genperf PROPERTIES COMPILE_FLAGS -DYASM_LIB_DECL=) ++ ++install(TARGETS genperf RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file +diff --git a/tools/re2c/CMakeLists.txt b/tools/re2c/CMakeLists.txt +index 7125d49..f2f1a40 100644 +--- a/tools/re2c/CMakeLists.txt ++++ b/tools/re2c/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if (NOT _tmp_RE2C_EXE) + add_executable(re2c + main.c + code.c +@@ -9,3 +10,6 @@ add_executable(re2c + substr.c + translate.c + ) ++ ++install(TARGETS re2c RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/yasm/portfile.cmake b/external_imported/vcpkg/ports/yasm/portfile.cmake index 37a891dc0..966a9f8f2 100644 --- a/external_imported/vcpkg/ports/yasm/portfile.cmake +++ b/external_imported/vcpkg/ports/yasm/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c HEAD_REF master - PATCHES add-feature-tools.patch + PATCHES + add-feature-tools.patch + fix-arm-cross-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,10 +18,22 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") +set(HOST_TOOLS_OPTIONS "") +if (VCPKG_CROSSCOMPILING) + list(APPEND HOST_TOOLS_OPTIONS + "-D_tmp_RE2C_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/re2c${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENPERF_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genperf${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENMACRO_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genmacro${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENVERSION_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genversion${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${HOST_TOOLS_OPTIONS} + "-DPYTHON_EXECUTABLE=${PYTHON3}" -DENABLE_NLS=OFF -DYASM_BUILD_TESTS=OFF ) @@ -29,7 +43,11 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() if (BUILD_TOOLS) - vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) + set(EXTRA_BUILD_TOOLS "") + if (NOT VCPKG_CROSSCOMPILING) + list(APPEND EXTRA_BUILD_TOOLS re2c genmacro genperf genversion) + endif() + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm ${EXTRA_BUILD_TOOLS} AUTO_CLEAN) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/external_imported/vcpkg/ports/yasm/vcpkg.json b/external_imported/vcpkg/ports/yasm/vcpkg.json index f78ff7745..b0bd94058 100644 --- a/external_imported/vcpkg/ports/yasm/vcpkg.json +++ b/external_imported/vcpkg/ports/yasm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "yasm", "version": "1.3.0", - "port-version": 3, + "port-version": 5, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", - "supports": "windows & !uwp & !arm", + "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -16,7 +17,11 @@ }, { "name": "yasm", - "host": true + "host": true, + "default-features": false, + "features": [ + "tools" + ] } ], "features": { diff --git a/external_imported/vcpkg/ports/yoga/Export-unofficial-yoga-config.patch b/external_imported/vcpkg/ports/yoga/Export-unofficial-yoga-config.patch new file mode 100644 index 000000000..dceea3361 --- /dev/null +++ b/external_imported/vcpkg/ports/yoga/Export-unofficial-yoga-config.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6f4a83..7cee74a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,26 @@ add_compile_options( + file(GLOB_RECURSE yogacore_SRC yoga/*.cpp) + add_library(yogacore STATIC ${yogacore_SRC}) + +-target_include_directories(yogacore PUBLIC .) ++target_include_directories(yogacore PUBLIC ++ $ ++ $ ++) + target_link_libraries(yogacore android log) + set_target_properties(yogacore PROPERTIES CXX_STANDARD 11) ++ ++install(TARGETS yogacore EXPORT unofficial-yoga-config ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ ++install(EXPORT unofficial-yoga-config ++ FILE unofficial-yoga-config.cmake ++ NAMESPACE unofficial::yoga:: ++ DESTINATION share/unofficial-yoga ++) ++ ++install(DIRECTORY ${CMAKE_SOURCE_DIR}/yoga ++ DESTINATION include ++ FILES_MATCHING ++ PATTERN *.h ++) +\ No newline at end of file diff --git a/external_imported/vcpkg/ports/yoga/portfile.cmake b/external_imported/vcpkg/ports/yoga/portfile.cmake index 6c7a2cf94..f5aa3d715 100644 --- a/external_imported/vcpkg/ports/yoga/portfile.cmake +++ b/external_imported/vcpkg/ports/yoga/portfile.cmake @@ -6,38 +6,19 @@ vcpkg_from_github( REF v1.19.0 SHA512 B1CB1F23CF9B5DD2491B6883CAF8FB47E264B736C94F6AA6655E9A6F641664B4BCEEB48F74C98B955F0EE02BA2E0AE8E01539A928ABB4B81FAE13ED3B57287CA HEAD_REF master - PATCHES add-project-declaration.patch + PATCHES + add-project-declaration.patch + Export-unofficial-yoga-config.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_build_cmake() -vcpkg_copy_pdbs() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/yoga DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-yoga) -set(YOGA_LIB_PREFFIX ) -if (NOT VCPKG_TARGET_IS_WINDOWS) - set(YOGA_LIB_PREFFIX lib) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(YOGA_BINARY_PATH ) - if (VCPKG_TARGET_IS_WINDOWS) - set(YOGA_BINARY_PATH Release/) - endif() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(YOGA_BINARY_PATH ) - if (VCPKG_TARGET_IS_WINDOWS) - set(YOGA_BINARY_PATH Debug/) - endif() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() - -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/external_imported/vcpkg/ports/yoga/vcpkg.json b/external_imported/vcpkg/ports/yoga/vcpkg.json index 570be3436..cf1c539fa 100644 --- a/external_imported/vcpkg/ports/yoga/vcpkg.json +++ b/external_imported/vcpkg/ports/yoga/vcpkg.json @@ -1,7 +1,19 @@ { "name": "yoga", "version": "1.19.0", + "port-version": 1, "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/yyjson/portfile.cmake b/external_imported/vcpkg/ports/yyjson/portfile.cmake index a4c8ffa07..6dbb7f4af 100644 --- a/external_imported/vcpkg/ports/yyjson/portfile.cmake +++ b/external_imported/vcpkg/ports/yyjson/portfile.cmake @@ -1,14 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 1f7dc19c7664dc1aed74045e3b6f316ccd271442 # 0.3.0 - SHA512 fa44dc86d2e7d4a1a178d01085d707b266c2bc32a5bf372a68b74d149b099d346f72dea5865fc1ba37a0c1525d3ac90a38df404d9008bca4577825a603524a91 + REF 0.5.1 + SHA512 dbae242ee023e872184b4f28e32e3044adfa0cf00e0f480e961a0c8979ff69b2d2f95a33504f10883eba16b68db0adce3a38c2f99dcb6f94eb73a107b89cca95 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + reader YYJSON_DISABLE_READER + writer YYJSON_DISABLE_WRITER + fast-fp-conv YYJSON_DISABLE_FAST_FP_CONV + non-standard YYJSON_DISABLE_NON_STANDARD +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DYYJSON_BUILD_TESTS=OFF -DYYJSON_BUILD_MISC=OFF ) @@ -21,4 +30,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) 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(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/yyjson/vcpkg.json b/external_imported/vcpkg/ports/yyjson/vcpkg.json index cd5cc93f1..7e8204936 100644 --- a/external_imported/vcpkg/ports/yyjson/vcpkg.json +++ b/external_imported/vcpkg/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version": "0.3.0", + "version": "0.5.1", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", @@ -13,5 +13,25 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "fast-fp-conv", + "non-standard", + "reader", + "writer" + ], + "features": { + "fast-fp-conv": { + "description": "Build with custom floating-point number conversion" + }, + "non-standard": { + "description": "Build with support for non-standard JSON" + }, + "reader": { + "description": "Build with JSON reader" + }, + "writer": { + "description": "Build with JSON writer" + } + } } diff --git a/external_imported/vcpkg/ports/z3/portfile.cmake b/external_imported/vcpkg/ports/z3/portfile.cmake index 2641de820..d9558d75a 100644 --- a/external_imported/vcpkg/ports/z3/portfile.cmake +++ b/external_imported/vcpkg/ports/z3/portfile.cmake @@ -1,29 +1,32 @@ -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.14 - SHA512 10170516CA472258D2F9DF28CD036E43023A76A25F1E1670290C62F3890D935BF82770970054A5FD3A0F02559409E7ED4B18FB08347C040FF2F9E0918E152AAB + REF z3-4.11.0 + SHA512 a3fd7e013948de6683b16aca03641bb845d02187152bebdee8c62c2a3f80a7710a1d3b9aef9c1490c2340571bb225f457928ac57a2ed28c0084ced34bcf3e905 HEAD_REF master - PATCHES fix-install-path.patch + PATCHES + fix-install-path.patch + remove-flag-overrides.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(BUILD_STATIC "-DZ3_BUILD_LIBZ3_SHARED=OFF") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${BUILD_STATIC} + -DZ3_BUILD_TEST_EXECUTABLES=OFF + -DZ3_ENABLE_EXAMPLE_TARGETS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/z3 TARGET_PATH share/Z3) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/z3) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch b/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch new file mode 100644 index 000000000..e7dbc81b0 --- /dev/null +++ b/external_imported/vcpkg/ports/z3/remove-flag-overrides.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 477410ba8..fcca03917 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + # Enforce some CMake policies + cmake_minimum_required(VERSION 3.4) + +-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") + project(Z3 VERSION 4.11.0.0 LANGUAGES CXX) + + ################################################################################ diff --git a/external_imported/vcpkg/ports/z3/vcpkg.json b/external_imported/vcpkg/ports/z3/vcpkg.json index ba3f5ed5e..fad42df39 100644 --- a/external_imported/vcpkg/ports/z3/vcpkg.json +++ b/external_imported/vcpkg/ports/z3/vcpkg.json @@ -1,8 +1,18 @@ { "name": "z3", - "version": "4.8.14", + "version": "4.11.0", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/z4kn4fein-semver/portfile.cmake b/external_imported/vcpkg/ports/z4kn4fein-semver/portfile.cmake new file mode 100644 index 000000000..bc1ea10cf --- /dev/null +++ b/external_imported/vcpkg/ports/z4kn4fein-semver/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO z4kn4fein/cpp-semver + REF v0.2.1 + SHA512 1eac4bfc87d8719c3172a32897ff50063959faee0df747cb9b45a1bc32dd4f2a2e4f6ac5700e99854f9c06e7e70f3bfbc4a1bedbb99730fef06c0e587f4614ff + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSEMVER_BUILD_TESTS=OFF +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/z4kn4fein-semver/vcpkg.json b/external_imported/vcpkg/ports/z4kn4fein-semver/vcpkg.json new file mode 100644 index 000000000..87120737b --- /dev/null +++ b/external_imported/vcpkg/ports/z4kn4fein-semver/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "z4kn4fein-semver", + "version": "0.2.1", + "description": "Semantic Versioning 2.0.0 library for modern C++", + "homepage": "https://github.com/z4kn4fein/cpp-semver", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/external_imported/vcpkg/ports/zeroc-ice/change_to_mt.ps1 b/external_imported/vcpkg/ports/zeroc-ice/change_to_mt.ps1 new file mode 100644 index 000000000..913060954 --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/change_to_mt.ps1 @@ -0,0 +1,53 @@ + +$projFilePath = $args[0] +$crtLinkage = $args[1] + +if($projFilePath) +{ + $xpath = "/rs:Project/rs:ItemGroup/rs:ProjectConfiguration" + $xmldoc = New-Object System.Xml.XmlDocument + $xmldoc.load($projFilePath) + $nsmgr = New-Object System.Xml.XmlNamespaceManager($xmldoc.NameTable); + $nsmgr.AddNamespace("rs", "http://schemas.microsoft.com/developer/msbuild/2003"); + $root = $xmldoc.DocumentElement + + foreach($conf in $root.ItemDefinitionGroup) + { + if($conf.Condition) + { + if(-Not ($conf.ClCompile.RuntimeLibrary)) + { + $rtl = $xmldoc.CreateElement("RuntimeLibrary", $conf.ClCompile.NamespaceURI) + $conf.ClCompile.AppendChild($rtl) + } + + if($conf.Condition.Contains("Debug")) + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebug" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDebugDLL" + } + } + else + { + if($crtLinkage -eq "static") + { + $conf.ClCompile.RuntimeLibrary = "Multithreaded" + } + else + { + $conf.ClCompile.RuntimeLibrary = "MultithreadedDLL" + } + } + } + } + $xmldoc.save($projFilePath) +} +else +{ + Write-Error "Error: No path defined!" +} diff --git a/external_imported/vcpkg/ports/zeroc-ice/mcppd_fix.patch b/external_imported/vcpkg/ports/zeroc-ice/mcppd_fix.patch new file mode 100644 index 000000000..3502af871 --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/mcppd_fix.patch @@ -0,0 +1,24 @@ +--- a/config/Make.project.rules 2022-01-17 10:28:23.000000000 ++++ b/config/Make.project.rules 2022-04-18 12:15:19.000000000 +@@ -1050,17 +1050,17 @@ + # + # $(call make-lib,$1=libname) + # + define make-lib + ifneq ($($1_home),) + # Check for 3rd party libraries either in home/lib or home/lib +-$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2) +-$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib)) +-$1_includedir ?= $$($1_home)/include ++$1_installdir = ++$1_libdir ?= ++$1_includedir ?= + endif +-$1_ldflags ?= -l$1 ++$1_ldflags ?= -l$$(if $$(and $$(filter mcpp,$1),$$(filter no,$$(OPTIMIZE))),$1d,$1) + endef + + # + # $(call repathfromdir,path) + # + # Returns reversed relative path for directory (e.g.: test/Ice/operations diff --git a/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch b/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch new file mode 100644 index 000000000..0e45588d0 --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/md5i_fix.patch @@ -0,0 +1,21 @@ +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/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake b/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake new file mode 100644 index 000000000..c1cf8c1d3 --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/portfile.cmake @@ -0,0 +1,306 @@ + +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 +) + +set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) +set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) + +get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) +set(UNIX_BUILD_DIR "${SOURCE_PATH}") +set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX}) +set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX}) + +# install_includes +function(install_includes ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +# install_slices +function(install_slices ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES + "Glacier2" + "Ice" + "IceBT" + "IceBox" + "IceBT" + "IceDiscovery" + "IceGrid" + "IceIAP" + "IceLocatorDiscovery" + "IcePatch2" + "IceSSL" + "IceStorm" +) + +set(ICE_OPTIONAL_COMPONENTS_MSBUILD "") +set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional! + +# IceSSL +if("icessl" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icessl++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceSSL") +endif() + +# Glacier2 +if("glacier2lib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\glacier2++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2") +endif() + +# Glacier2Router +if("glacier2router" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2cryptpermissionsverifier") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2CryptPermissionsVerifier") +endif() + +# IceBox +if("iceboxlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\iceboxlib++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceBox") +endif() + +# IceBox +if("iceboxtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icebox++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\iceboxadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebox") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "iceboxadmin") +endif() + +# IceGrid +if("icegridlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icegrid++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceGrid") +endif() + +# IceGrid tools +if("icegridtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") +endif() + +# IceStorm +if("icestormlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icestorm++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStorm") +endif() + +# IceStormAdmin +if("icestormtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormservice") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormdb") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStormService") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormdb") +endif() + +# IceBridge executable +if("icebridge" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icebridge") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebridge") +endif() + +# IceDiscovery +if("icediscovery" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icediscovery++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + # Clean up for the first round (important for install --editable) + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + + # Setting these as environment variables, as .d files aren't generated + # the first time passing them as arguments to make. + set(ENV{MCPP_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{EXPAT_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{BZ2_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{LMDB_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{CPPFLAGS} "-I${CURRENT_INSTALLED_DIR}/include") + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/debug/lib") + + set(ICE_BUILD_CONFIG "shared cpp11-shared") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ICE_BUILD_CONFIG "static cpp11-static") + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}/debug" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=no + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-dbg + ) + + # Install debug libraries to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + # Clean up for the next round + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + + # Release build + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib") + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=yes + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-rel + ) + + # Install release libraries and other files to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + install_includes("${UNIX_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${UNIX_BUILD_DIR}/cpp/include/generated" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_RELEASE_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB ICE_RELEASE_EXECUTABLES "${UNIX_BUILD_DIR}/cpp/bin/*") + file(COPY ${ICE_RELEASE_EXECUTABLES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Clean up + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-after-build-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + +else() # VCPKG_TARGET_IS_WINDOWS + + # Fix project files to prevent nuget restore of dependencies and + # remove hard coded runtime linkage + include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") + prepare_for_build("${SOURCE_PATH}") + + vcpkg_list(SET MSBUILD_OPTIONS + "/p:UseVcpkg=yes" + "/p:IceBuildingSrc=yes" + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ) + + # Build Ice + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln" + SKIP_CLEAN + TARGET "C++11\\ice++11" + USE_VCPKG_INTEGRATION + OPTIONS + ${MSBUILD_OPTIONS} + ) + + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + endif() + + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include/generated/cpp11/${TRIPLET_SYSTEM_ARCH}/Release" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + vcpkg_clean_msbuild() + +endif() + +# Remove unnecessary static libraries. +file(GLOB PDLIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*") +file(GLOB PRLIBS "${CURRENT_PACKAGES_DIR}/lib/*") +list(FILTER PDLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +file(REMOVE ${PDLIBS} ${PRLIBS}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright) diff --git a/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake b/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake new file mode 100644 index 000000000..df3e93003 --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/prepare_for_build.cmake @@ -0,0 +1,76 @@ + +# This function modifies hardcoded RuntimeLibrary directives in Ice's .vcxproj files and downloads +# Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition +# files (.ice). + +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 + REPLACE + "" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + + if((NOT ${PROJ_FILE} MATCHES ".*slice\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*iceutil\.vcxproj") AND + (NOT ${PROJ_FILE} MATCHES ".*slice2cpp\.vcxproj")) + + if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static") + STRING(REGEX + REPLACE + "DynamicLibrary" + "StaticLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + else() + STRING(REGEX + REPLACE + "StaticLibrary" + "DynamicLibrary" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + endif() + endif() + + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + + vcpkg_execute_required_process( + COMMAND pwsh ${CURRENT_PORT_DIR}/change_to_mt.ps1 ${PROJ_FILE} ${VCPKG_CRT_LINKAGE} + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME change_to_mt-${TARGET_TRIPLET}-rel + ) + endforeach() + + 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") + 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 + ) + + vcpkg_extract_source_archive( + ICE_BUILDER_MSBUILD_DIRECTORY + ARCHIVE + "${ICE_BUILDER_MSBUILD_ARCHIVE}" + NO_REMOVE_ONE_LEVEL + SOURCE_BASE icebuilder + ) + + file(MAKE_DIRECTORY "${ICE_SOURCE_DIR}/cpp/msbuild/packages") + file(RENAME "${ICE_BUILDER_MSBUILD_DIRECTORY}" "${ICE_BUILDER_DEST_DIRECTORY}") + endif() + +endfunction() diff --git a/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch b/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch new file mode 100644 index 000000000..6c45cb82d --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/slice2swift.patch @@ -0,0 +1,25 @@ +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/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json b/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json new file mode 100644 index 000000000..2335597fc --- /dev/null +++ b/external_imported/vcpkg/ports/zeroc-ice/vcpkg.json @@ -0,0 +1,122 @@ +{ + "name": "zeroc-ice", + "version": "3.7.7", + "port-version": 2, + "maintainers": "Benjamin Oldenburg ", + "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", + "homepage": "https://github.com/zeroc-ice/ice", + "license": null, + "supports": "!uwp & !(windows & arm) & !wasm32", + "dependencies": [ + "bzip2", + "expat", + "lmdb", + "mcpp", + { + "name": "openssl", + "platform": "!windows" + }, + "zlib" + ], + "features": { + "glacier2lib": { + "description": "Glacier2 libraries" + }, + "glacier2router": { + "description": "Glacier2Router", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "icessl" + ] + } + ] + }, + "iceboxlib": { + "description": "IceBox libraries and runtime" + }, + "iceboxtools": { + "description": "IceBox tools" + }, + "icebridge": { + "description": "IceBridge", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "iceboxlib" + ] + } + ] + }, + "icediscovery": { + "description": "IceDiscovery", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icessl", + "icestormlib" + ] + } + ] + }, + "icegridlib": { + "description": "IceGrid library", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib" + ] + } + ] + }, + "icegridtools": { + "description": "IceGrid tools", + "dependencies": [ + "expat", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icessl" + ] + } + ] + }, + "icessl": { + "description": "IceSSL", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows" + } + ] + }, + "icestormlib": { + "description": "IceStorm library" + }, + "icestormtools": { + "description": "IceStorm tools", + "dependencies": [ + "lmdb", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icestormlib" + ] + } + ] + } + } +} diff --git a/external_imported/vcpkg/ports/zeromq/portfile.cmake b/external_imported/vcpkg/ports/zeromq/portfile.cmake index 671fc2ed6..041e7b88c 100644 --- a/external_imported/vcpkg/ports/zeromq/portfile.cmake +++ b/external_imported/vcpkg/ports/zeromq/portfile.cmake @@ -20,9 +20,9 @@ vcpkg_check_features( websockets-sha1 ENABLE_WS ) -set(PLATFORM_OPTIONS) +set(PLATFORM_OPTIONS "") if(VCPKG_TARGET_IS_MINGW) - set(PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0") + set(PLATFORM_OPTIONS -DCMAKE_SYSTEM_VERSION=6.0 -DZMQ_HAVE_IPC=0) endif() vcpkg_cmake_configure( @@ -39,6 +39,8 @@ vcpkg_cmake_configure( ${PLATFORM_OPTIONS} OPTIONS_DEBUG "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + MAYBE_UNUSED_VARIABLES + USE_PERF_TOOLS ) vcpkg_cmake_install() diff --git a/external_imported/vcpkg/ports/zeromq/vcpkg.json b/external_imported/vcpkg/ports/zeromq/vcpkg.json index e3f4426db..06da0f09a 100644 --- a/external_imported/vcpkg/ports/zeromq/vcpkg.json +++ b/external_imported/vcpkg/ports/zeromq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 5, + "port-version": 6, "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/external_imported/vcpkg/ports/zlib-ng/portfile.cmake b/external_imported/vcpkg/ports/zlib-ng/portfile.cmake index f1f4e3caf..4b9f595a1 100644 --- a/external_imported/vcpkg/ports/zlib-ng/portfile.cmake +++ b/external_imported/vcpkg/ports/zlib-ng/portfile.cmake @@ -1,15 +1,17 @@ +set(ZLIB_FULL_VERSION 2.0.6) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng - REF 2.0.5 - SHA512 a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654 - HEAD_REF master + REF "${ZLIB_FULL_VERSION}" + SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 + HEAD_REF develop ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DZLIB_FULL_VERSION=2.0.3 + "-DZLIB_FULL_VERSION=${ZLIB_FULL_VERSION}" -DZLIB_ENABLE_TESTS=OFF -DWITH_NEW_STRATEGIES=ON OPTIONS_RELEASE @@ -24,4 +26,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright -) \ No newline at end of file +) diff --git a/external_imported/vcpkg/ports/zlib-ng/vcpkg.json b/external_imported/vcpkg/ports/zlib-ng/vcpkg.json index 2822189a6..c36f24e4f 100644 --- a/external_imported/vcpkg/ports/zlib-ng/vcpkg.json +++ b/external_imported/vcpkg/ports/zlib-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zlib-ng", - "version": "2.0.5", + "version": "2.0.6", + "port-version": 1, "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/external_imported/vcpkg/ports/zlib/CVE-2022-37434.patch b/external_imported/vcpkg/ports/zlib/CVE-2022-37434.patch new file mode 100644 index 000000000..65cab9519 --- /dev/null +++ b/external_imported/vcpkg/ports/zlib/CVE-2022-37434.patch @@ -0,0 +1,17 @@ +diff --git a/inflate.c b/inflate.c +index 7be8c6366..7a7289749 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,9 +763,10 @@ int flush; + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && +- state->head->extra != Z_NULL) { +- len = state->head->extra_len - state->length; ++ state->head->extra != Z_NULL && ++ (len = state->head->extra_len - state->length) < ++ state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); diff --git a/external_imported/vcpkg/ports/zlib/LICENSE b/external_imported/vcpkg/ports/zlib/LICENSE deleted file mode 100644 index ca5fddfe0..000000000 --- a/external_imported/vcpkg/ports/zlib/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ - Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu \ No newline at end of file diff --git a/external_imported/vcpkg/ports/zlib/add_debug_postfix_on_mingw.patch b/external_imported/vcpkg/ports/zlib/debug-postfix-mingw.patch similarity index 100% rename from external_imported/vcpkg/ports/zlib/add_debug_postfix_on_mingw.patch rename to external_imported/vcpkg/ports/zlib/debug-postfix-mingw.patch diff --git a/external_imported/vcpkg/ports/zlib/portfile.cmake b/external_imported/vcpkg/ports/zlib/portfile.cmake index f1699178f..4e48b9ec7 100644 --- a/external_imported/vcpkg/ports/zlib/portfile.cmake +++ b/external_imported/vcpkg/ports/zlib/portfile.cmake @@ -1,28 +1,22 @@ -set(VERSION 1.2.12) - -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" - FILENAME "zlib1212.tar.gz" - SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} - REF ${VERSION} + REPO madler/zlib + REF v1.2.12 + SHA512 5b029532a9f5f12ad425c12eccdf1b77c8d91801342c5b5e26ffb539f76a204e6c4882b40f0130f143f2cd38df90e90af2978cf4bb997e1fa3a0d1eff2ca979e + HEAD_REF master PATCHES - "cmake_dont_build_more_than_needed.patch" - "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch" - "add_debug_postfix_on_mingw.patch" - "0002-android-build-mingw.patch" + cmake_dont_build_more_than_needed.patch + 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch + debug-postfix-mingw.patch + 0002-android-build-mingw.patch + CVE-2022-37434.patch ) # This is generated during the cmake build -file(REMOVE ${SOURCE_PATH}/zconf.h) +file(REMOVE "${SOURCE_PATH}/zconf.h") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSKIP_INSTALL_FILES=ON -DSKIP_BUILD_EXAMPLES=ON @@ -30,27 +24,25 @@ vcpkg_configure_cmake( -DSKIP_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_cmake_install() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Install the pkgconfig file if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc "-lz" "-lzlib") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib") endif() - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc "-lz" "-lzlibd") + vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd") endif() - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() vcpkg_fixup_pkgconfig() - -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/zlib/vcpkg.json b/external_imported/vcpkg/ports/zlib/vcpkg.json index d147fad30..8dccdf32d 100644 --- a/external_imported/vcpkg/ports/zlib/vcpkg.json +++ b/external_imported/vcpkg/ports/zlib/vcpkg.json @@ -1,6 +1,14 @@ { "name": "zlib", "version": "1.2.12", + "port-version": 2, "description": "A compression library", - "homepage": "https://www.zlib.net/" + "homepage": "https://www.zlib.net/", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/zookeeper/portfile.cmake b/external_imported/vcpkg/ports/zookeeper/portfile.cmake index 1dfcfb376..ff67f0750 100644 --- a/external_imported/vcpkg/ports/zookeeper/portfile.cmake +++ b/external_imported/vcpkg/ports/zookeeper/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.5/apache-zookeeper-3.5.5.tar.gz" - FILENAME "zookeeper-3.5.5.tar.gz" - SHA512 4e22df899a83ca3cc15f6d94daadb1a8631fb4108e67b4f56d1f4fcf95f10f89c8ff1fb8a7c84799a3856d8803a8db1e1f2f3fe1b7dc0d6cedf485ef90fd212d + URLS "https://archive.apache.org/dist/zookeeper/zookeeper-3.5.6/apache-zookeeper-3.5.6.tar.gz" + FILENAME "zookeeper-3.5.6.tar.gz" + SHA512 7f45817cbbc42aec5a7817fa2ae99656128e666dc58ace23d86bcfc5ca0dc49e418d1a7d1f082ad80ccb916f9f1b490167d16f836886af1a56fbcf720ad3b9d0 ) vcpkg_extract_source_archive_ex( @@ -14,26 +14,25 @@ vcpkg_extract_source_archive_ex( win32.patch ) -set(WANT_SYNCAPI OFF) -if("sync" IN_LIST FEATURES) - set(WANT_SYNCAPI ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sync WANT_SYNCAPI +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DWANT_CPPUNIT=OFF - -DWANT_SYNCAPI=${WANT_SYNCAPI} + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zookeeper RENAME copyright) +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets() +file(INSTALL "${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/external_imported/vcpkg/ports/zookeeper/vcpkg.json b/external_imported/vcpkg/ports/zookeeper/vcpkg.json index 20e655e5a..eee539a28 100644 --- a/external_imported/vcpkg/ports/zookeeper/vcpkg.json +++ b/external_imported/vcpkg/ports/zookeeper/vcpkg.json @@ -1,8 +1,19 @@ { "name": "zookeeper", - "version-string": "3.5.5", - "port-version": 2, + "version": "3.5.6", "description": "ZooKeeper C bindings", + "homepage": "https://github.com/apache/zookeeper", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "sync" ], diff --git a/external_imported/vcpkg/ports/zopfli/portfile.cmake b/external_imported/vcpkg/ports/zopfli/portfile.cmake index 7ce1dfeff..d796980a8 100644 --- a/external_imported/vcpkg/ports/zopfli/portfile.cmake +++ b/external_imported/vcpkg/ports/zopfli/portfile.cmake @@ -6,64 +6,57 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZOPFLI_BUILD_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() - # Install tools -file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(COPY "${CURRENT_PACKAGES_DIR}/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY "${CURRENT_PACKAGES_DIR}/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" +) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${EXECUTABLE_SUFFIX} - ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Zopfli) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Zopfli") -# vcpkg_fixup_cmake_targets can not handles this on UNIX currently. +# vcpkg_cmake_config_fixup can not handles this on UNIX currently. if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake" "\"\${_IMPORT_PREFIX}/bin/zopfli\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake" "\"\${_IMPORT_PREFIX}/bin/zopflipng\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/external_imported/vcpkg/ports/zopfli/vcpkg.json b/external_imported/vcpkg/ports/zopfli/vcpkg.json index 668234f53..f0f895ab3 100644 --- a/external_imported/vcpkg/ports/zopfli/vcpkg.json +++ b/external_imported/vcpkg/ports/zopfli/vcpkg.json @@ -1,7 +1,18 @@ { "name": "zopfli", - "version-string": "1.0.3", - "port-version": 1, + "version": "1.0.3", + "port-version": 2, "description": "Zopfli Compression Algorithm compression library programmed in C", - "homepage": "https://github.com/google/zopfli" + "homepage": "https://github.com/google/zopfli", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/external_imported/vcpkg/ports/zpp-bits/portfile.cmake b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake index 02287e7b2..97f383420 100644 --- a/external_imported/vcpkg/ports/zpp-bits/portfile.cmake +++ b/external_imported/vcpkg/ports/zpp-bits/portfile.cmake @@ -1,14 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalz800/zpp_bits - REF v4.3.3 - SHA512 6534711a75d62e4244125329db436ca27bf6b8c31aa9ecb92473f4e5687aa390d9d197d1cb91ed3452363af1537ffdef4a13fe6a1c3049616576a475ba69a548 + REF v.4.4.4 + SHA512 172300f1547b985702698d7f10ac5bd804421226a8c20b26b60608aaa10bf4f9682fd1a3e49e75c309c9cb30b888f623aa5eb7ace5705d85601a2c67c8829b3f HEAD_REF master ) -file( - COPY "${SOURCE_PATH}/zpp_bits.h" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" -) +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) diff --git a/external_imported/vcpkg/ports/zpp-bits/vcpkg.json b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json index b75cc2d3d..c3b2175ca 100644 --- a/external_imported/vcpkg/ports/zpp-bits/vcpkg.json +++ b/external_imported/vcpkg/ports/zpp-bits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zpp-bits", - "version": "4.3.3", + "version": "4.4.4", "description": "A lightweight C++20 serialization and RPC library", "homepage": "https://github.com/eyalz800/zpp_bits", "license": "MIT" diff --git a/external_imported/vcpkg/ports/zserge-webview/portfile.cmake b/external_imported/vcpkg/ports/zserge-webview/portfile.cmake index 47b3e0c58..9bd482b8b 100644 --- a/external_imported/vcpkg/ports/zserge-webview/portfile.cmake +++ b/external_imported/vcpkg/ports/zserge-webview/portfile.cmake @@ -2,27 +2,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO zserge/webview - REF 16c93bcaeaeb6aa7bb5a1432de3bef0b9ecc44f3 - SHA512 153824bd444eafe6cc5ae00800422b41d4047dc85a164c465990c3be06d82003b532e1e869bb40e3a77cbe4789ff970fcda50ef00ac7b3e2f22ef3f566340026 + REPO webview/webview + REF 2ee04ccd0530e3928a872f5d508c114403803e61 #commit-2022-09-07 + SHA512 c784635a0c0948d91fea12643b04f0125e0be64d34aeddafbd0240aa977e867fa74efaf4e5dea7fe207bc0d1461b544f483d6228bf92dade7dc0d5e2c5a585a6 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/webview.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/webview.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") set(WEBVIEW_GTK "0") -set(WEBVIEW_WINAPI "0") +set(WEBVIEW_EDGE "0") set(WEBVIEW_COCOA "0") if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(WEBVIEW_WINAPI "1") + set(WEBVIEW_EDGE "1") elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(WEBVIEW_COCOA "1") elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(WEBVIEW_GTK "1") endif() -file(READ ${CURRENT_PACKAGES_DIR}/include/webview.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/webview.h" _contents) string(REPLACE "#ifdef WEBVIEW_STATIC" "#if 1 // #ifdef WEBVIEW_STATIC" @@ -48,7 +48,7 @@ string(REPLACE "${WEBVIEW_COCOA} // defined(WEBVIEW_COCOA)" _contents "${_contents}" ) -file(WRITE ${CURRENT_PACKAGES_DIR}/include/webview.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/webview.h" "${_contents}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/external_imported/vcpkg/ports/zserge-webview/vcpkg.json b/external_imported/vcpkg/ports/zserge-webview/vcpkg.json index dbdfa5bf1..f7b41f314 100644 --- a/external_imported/vcpkg/ports/zserge-webview/vcpkg.json +++ b/external_imported/vcpkg/ports/zserge-webview/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zserge-webview", - "version-string": "2019-04-27", - "port-version": 3, - "description": "Tiny cross-platform webview library for C/C++/Golang." + "version-date": "2022-09-07", + "description": "Tiny cross-platform webview library for C/C++/Golang.", + "homepage": "https://github.com/webview/webview", + "license": "MIT" } diff --git a/external_imported/vcpkg/ports/zug/vcpkg.json b/external_imported/vcpkg/ports/zug/vcpkg.json index ac59f865e..87bee1b28 100644 --- a/external_imported/vcpkg/ports/zug/vcpkg.json +++ b/external_imported/vcpkg/ports/zug/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zug", "version-date": "2021-04-23", + "port-version": 1, "description": "Transducers for C++", "homepage": "https://sinusoid.es/zug/", "dependencies": [ diff --git a/external_imported/vcpkg/ports/zziplib/export-targets.patch b/external_imported/vcpkg/ports/zziplib/export-targets.patch new file mode 100644 index 000000000..7bcc0655b --- /dev/null +++ b/external_imported/vcpkg/ports/zziplib/export-targets.patch @@ -0,0 +1,73 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index 1883272..16d4380 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -175,7 +175,7 @@ set(libzzipmmapped_HDRS mmapped.h memdisk.h) + + add_library(libzzip ${libzzip_SRCS} ) + target_link_libraries(libzzip ZLIB::ZLIB ) +-target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) ++target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC $) + + if(ZZIPFSEEKO) + add_library(libzzipfseeko ${libzzipfseeko_SRCS} ) +@@ -255,14 +255,14 @@ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko + endif() + + install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzip ++install(TARGETS libzzip EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(ZZIPFSEEKO) + install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipfseeko ++install(TARGETS libzzipfseeko EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -270,12 +270,28 @@ endif() + + if(ZZIPMMAPPED) + install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipmmapped ++install(TARGETS libzzipmmapped EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + ++install(EXPORT unofficial-zziplibTargets ++ NAMESPACE unofficial::zziplib:: ++ DESTINATION share/unofficial-zziplib ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/*Targets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake DESTINATION share/unofficial-zziplib) ++ + if(ZZIP_COMPAT) + install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt +index ea7ea93..2d41f70 100644 +--- a/zzipwrap/CMakeLists.txt ++++ b/zzipwrap/CMakeLists.txt +@@ -83,7 +83,7 @@ install(FILES ${outdir}/zzipwrap.pc + endif() + + install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipwrap ++install(TARGETS libzzipwrap EXPORT unofficial-zziplibTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + diff --git a/external_imported/vcpkg/ports/zziplib/portfile.cmake b/external_imported/vcpkg/ports/zziplib/portfile.cmake index c771e9aa3..00c9291e8 100644 --- a/external_imported/vcpkg/ports/zziplib/portfile.cmake +++ b/external_imported/vcpkg/ports/zziplib/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 PATCHES no-release-postfix.patch + export-targets.patch ) string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) @@ -26,6 +27,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zziplib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc" diff --git a/external_imported/vcpkg/ports/zziplib/vcpkg.json b/external_imported/vcpkg/ports/zziplib/vcpkg.json index e0ede655b..d833544ea 100644 --- a/external_imported/vcpkg/ports/zziplib/vcpkg.json +++ b/external_imported/vcpkg/ports/zziplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zziplib", "version": "0.13.72", + "port-version": 1, "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", "license": "LGPL-2.0-or-later OR MPL-1.1", diff --git a/external_imported/vcpkg/scripts/Get-Changelog.ps1 b/external_imported/vcpkg/scripts/Get-Changelog.ps1 index 68f02957e..5beebce6e 100644 --- a/external_imported/vcpkg/scripts/Get-Changelog.ps1 +++ b/external_imported/vcpkg/scripts/Get-Changelog.ps1 @@ -405,7 +405,7 @@ $output = @" vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) --- #### Total port count: -#### Total port count per triplet (tested): +#### Total port count per triplet (tested) (tentative): LINK TO BUILD |triplet|ports available| |---|---| |x86-windows|NUM| @@ -424,12 +424,12 @@ if ($UpdatedDocumentation) { $output += @" #### The following documentation has been updated: -$(-join ($UpdatedDocumentation | ForEach-Object { +$(-join ($UpdatedDocumentation | Sort-Object -Property 'Path' | ForEach-Object { $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' - "- [{0}]({0}){1}`n" -f $PathWithoutDocs, $_.Path, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) + "- [{0}](https://github.com/microsoft/vcpkg/blob/master/docs/{0}){1}`n" -f $PathWithoutDocs, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) $_.Pulls | ForEach-Object { - " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number } })) @@ -443,13 +443,13 @@ if ($NewPorts) { |port|version| |---|---| -$(-join ($NewPorts | ForEach-Object { +$(-join ($NewPorts | Sort-Object -Property 'Port' | ForEach-Object { "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url if ($_.Pulls.Length -gt 1 ) { '' $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object { - "[#{0}]({1})" -f $_.number, $_.html_url + " #{0}" -f $_.number } '' } @@ -466,13 +466,13 @@ if ($ChangedPorts) {
The following $($ChangedPorts.Length) ports have been updated: -$(-join ($ChangedPorts | ForEach-Object { +$(-join ($ChangedPorts | Sort-Object -Property 'Port' | ForEach-Object { "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort ' -> ' "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort $_.Pulls | ForEach-Object { - " - [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number } }))
@@ -486,17 +486,13 @@ if ($UpdatedInfrastructure) { The following additional changes have been made to vcpkg's infrastructure: $(-join ($UpdatedInfrastructure | ForEach-Object { - "- [(#{0})]({1}) {2} (by @{3})`n" -f $_.number, $_.html_url, $_.title, $_.user.login + "- {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number })) "@ } -$output += @" --- vcpkg team vcpkg@microsoft.com $(Get-Date -UFormat "%a, %d %B %T %Z00") -"@ - Set-Content -Value $Output -Path $OutFile Write-Progress -Activity 'Writing changelog file' -Completed diff --git a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml index 4ef04aa9b..87b5f3b61 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/azure-pipelines.yml @@ -2,57 +2,72 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-03-09-1' - linux-pool: 'PrLin-2022-03-09-1' + windows-pool: 'PrWin-2022-09-20' + linux-pool: 'PrLin-2022-09-25' osx-pool: 'PrOsx-2022-02-04' +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + jobs: - template: windows/azure-pipelines.yml parameters: triplet: x86-windows jobName: x86_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows jobName: x64_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows-static jobName: x64_windows_static poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-windows-static-md jobName: x64_windows_static_md poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: x64-uwp jobName: x64_uwp poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: arm64-windows jobName: arm64_windows poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: windows/azure-pipelines.yml parameters: triplet: arm-uwp jobName: arm_uwp poolName: $(windows-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} - template: linux/azure-pipelines.yml parameters: poolName: $(linux-pool) + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} diff --git a/external_imported/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh b/external_imported/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh new file mode 100755 index 000000000..b998568eb --- /dev/null +++ b/external_imported/vcpkg/scripts/azure-pipelines/bootstrap-from-source.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d $1 +rm -rf build.x64.release +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x64.release -S vcpkg-tool +ninja -C build.x64.release +mv build.x64.release/vcpkg vcpkg diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml index 5c50454b4..3b0d41be4 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -2,6 +2,14 @@ # SPDX-License-Identifier: MIT # +parameters: + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string + jobs: - job: x64_linux pool: @@ -16,41 +24,33 @@ jobs: value: /mnt/vcpkg-ci/downloads - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + 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),$(sas-bin)" + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - - bash: df -h - displayName: 'Report on Disk Space' + # Note: /mnt is the Azure machines' temporary disk. - bash: | sudo mkdir /home/agent -m=777 sudo chown `id -u` /home/agent - exit 0 - displayName: 'Create /home/agent' - # Note: /mnt is the Azure machines' temporary disk. - - bash: | - sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} sudo mkdir ${{ variables.WORKING_ROOT }} -m=777 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777 exit 0 - displayName: 'Create ${{ variables.WORKING_ROOT }} and ${{ variables.VCPKG_DOWNLOADS }}' - - task: Bash@3 + displayName: 'Create working directories' + - bash: ./bootstrap-vcpkg.sh displayName: 'Bootstrap vcpkg' - inputs: - filePath: bootstrap-vcpkg.sh + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - task: PowerShell@2 - displayName: '*** Test Modified Ports for x64-linux' + displayName: '*** Test Modified Ports' 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)' pwsh: true - - bash: | - df -h - displayName: 'Report on Disk Space After Build' - condition: always() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for x64-linux' inputs: @@ -67,3 +67,12 @@ jobs: inputs: PathtoPublish: scripts/list_files ArtifactName: 'file lists for x64-linux' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-linux + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-linux + configuration: static diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 index d19bb673f..932d25aec 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-image.ps1 @@ -15,10 +15,10 @@ or are running from Azure Cloud Shell. This script assumes you have installed the OpenSSH Client optional Windows component. #> -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'Lin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32as_v4' +$VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' $ErrorActionPreference = 'Stop' @@ -89,7 +89,7 @@ $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts-gen2' ` + -Skus '20_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable @@ -159,7 +159,7 @@ Set-AzVM ` -Generalized $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID $ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 index 08210cc0d..54ed2142b 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -28,7 +28,7 @@ Param( [string]$ImageName ) -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'PrLin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' @@ -98,6 +98,10 @@ $Vmss = Set-AzVmssStorageProfile ` -DiffDiskSetting Local ` -ImageReferenceId $Image.Id +$Vmss = Set-AzVmssBootDiagnostic ` + -VirtualMachineScaleSet $Vmss ` + -Enabled $true + New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` diff --git a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh index d72c669cc..e3c6732e9 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh +++ b/external_imported/vcpkg/scripts/azure-pipelines/linux/provision-image.sh @@ -5,84 +5,100 @@ export DEBIAN_FRONTEND=noninteractive +# Add apt repos + +## CUDA +apt-key del 7fa2af80 +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin +mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" + +## PowerShell +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 +add-apt-repository universe + apt-get -y update apt-get -y dist-upgrade -# Install common build dependencies -APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ - build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ + +# Add apt packages + +## vcpkg prerequisites +APT_PACKAGES="git curl zip unzip tar" + +## common build dependencies +APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ + build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ - libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ - flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ + libxcursor-dev yasm libnuma1 libnuma-dev \ + flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ - pkg-config meson" + pkg-config meson nasm cmake ninja-build" -# Additionally required by qt5-base +## required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" -# Additionally required by qt5-base for qt5-x11extras +## required by qt5-base for qt5-x11extras APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ - libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-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" -# Additionally required by libhdfs3 +## required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" -# Additionally required by kf5windowsystem +## required by kf5windowsystem APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" -# Additionally required by mesa +## required by mesa APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" -# Additionally required by some packages to install additional python packages +## required by some packages to install additional python packages APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" -# Additionally required by qtwebengine +## required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" -# Additionally required by qtwayland +## required by qtwayland APT_PACKAGES="$APT_PACKAGES libwayland-dev" -# Additionally required by all GN projects +## required by all GN projects APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" -# Additionally required by libctl +## required by libctl APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" -# Additionally required by gtk +## required by gtk APT_PACKAGES="$APT_PACKAGES libxdamage-dev" -# Additionally required/installed by Azure DevOps Scale Set Agents -APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" +## required by gtk3 and at-spi2-atk +APT_PACKAGES="$APT_PACKAGES libdbus-1-dev" -apt-get -y install $APT_PACKAGES +## required by at-spi2-atk +APT_PACKAGES="$APT_PACKAGES libxtst-dev" -# Install newer version of nasm than the apt package, required by intel-ipsec -mkdir /tmp/nasm -cd /tmp/nasm -curl -O https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz -tar -xf nasm-2.15.05.tar.gz -cd nasm-2.15.05/ -./configure --prefix=/usr && make -j -make install -cd ~ +## required by bond +APT_PACKAGES="$APT_PACKAGES haskell-stack" -# Install the latest Haskell stack -curl -sSL https://get.haskellstack.org/ | sh +## required by duktape +APT_PACKAGES="$APT_PACKAGES python-yaml" -# Install CUDA -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub -add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" -apt-get -y update -apt-get install -y --no-install-recommends cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ - cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev +## CUDA +APT_PACKAGES="$APT_PACKAGES cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 \ + libnccl-dev" -# Install PowerShell -wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -dpkg -i packages-microsoft-prod.deb -apt-get update -add-apt-repository universe -apt-get install -y powershell +## PowerShell +APT_PACKAGES="$APT_PACKAGES powershell" + +## Additionally required/installed by Azure DevOps Scale Set Agents, skip on WSL +if [[ $(grep microsoft /proc/version) ]]; then +echo "Skipping install of ADO prerequisites on WSL." +else +APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66" +fi + +apt-get -y --no-install-recommends install $APT_PACKAGES diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml index ce5c095d2..4647b17c9 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -3,8 +3,12 @@ # parameters: -- name: poolName - type: string + - name: vcpkgToolSha + displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap' + type: string + default: 'use default' + - name: poolName + type: string jobs: - job: x64_osx @@ -20,26 +24,27 @@ jobs: value: /Users/vagrant/Data/downloads - group: vcpkg-binary-caching-credentials - name: X_VCPKG_BINARY_SOURCE_STUB - value: "x-azblob,$(root-bin-url),$(sas-bin)" + value: "x-azblob,$(root-bin-url),$(sas-bin)" # not in eastasia due to physical location - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" steps: - - bash: df -h - displayName: 'Report on Disk Space' - bash: | - sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0 exit 0 displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' - - task: Bash@3 + - bash: ./bootstrap-vcpkg.sh displayName: 'Bootstrap vcpkg' - inputs: - filePath: bootstrap-vcpkg.sh + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - bash: | + brew install cmake + ./scripts/azure-pipelines/bootstrap-from-source.sh ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - task: PowerShell@2 - displayName: '*** Test Modified Ports for x64-osx' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' @@ -50,18 +55,13 @@ jobs: -WorkingRoot "${{ variables.WORKING_ROOT }}" -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" pwsh: true - - bash: | - df -h - displayName: 'Report on Disk Space After Build' - condition: always() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for x64-osx' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' ArtifactName: 'failure logs for x64-osx${{ variables.Postfix }}' condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - - bash: | - python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ + - bash: python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ displayName: 'Build a file list for all packages' condition: always() - task: PublishBuildArtifacts@1 @@ -70,3 +70,12 @@ jobs: inputs: PathtoPublish: scripts/list_files ArtifactName: 'file lists for x64-osx${{ variables.Postfix }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-osx + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-osx + configuration: static diff --git a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json index 45917784a..75cb83719 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json +++ b/external_imported/vcpkg/scripts/azure-pipelines/osx/configuration/vagrant-box-configuration.json @@ -1,10 +1,11 @@ { "$schema": "./vagrant-box-configuration.schema.json", "brew": [ - "autoconf", "autoconf-archive", + "autoconf", "automake", "bison", + "cmake", "gettext", "gfortran", "gperf", @@ -13,6 +14,7 @@ "meson", "mono", "nasm", + "ninja", "pkg-config", "texinfo", "yasm" diff --git a/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 index 4fb4a180b..55a05aef3 100755 --- a/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 @@ -115,11 +115,8 @@ else { $executableExtension = '.exe' } -$xmlResults = Join-Path $ArtifactStagingDirectory 'xml-results' -mkdir $xmlResults -$xmlFile = Join-Path $xmlResults "$Triplet.xml" - $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' +$xunitFile = Join-Path $ArtifactStagingDirectory "$Triplet-results.xml" if ($IsWindows) { @@ -166,7 +163,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # 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" --x-xunit=$xmlFile --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" @@ -175,3 +172,5 @@ if ($LASTEXITCODE -ne 0) { throw "vcpkg ci failed" } + +Write-Host "##vso[task.setvariable variable=XML_RESULTS_FILE]$xunitFile" diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 65ee8decf..b86cdc13e 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - unstable-pool: 'VcpkgUnstable1ES' + unstable-pool: 'vcpkg-testing-msvc' jobs: - template: job.yml diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml index bac59834b..a4b09cd6e 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows-unstable/job.yml @@ -8,7 +8,7 @@ jobs: name: $(unstable-pool) workspace: clean: resources - timeoutInMinutes: 1440 # 1 day + timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT value: D:\ @@ -24,7 +24,7 @@ jobs: inputs: buildType: specific project: '0bdbc590-a062-4c3f-b0f6-9383f67865ee' - pipeline: 8136 + pipeline: 16549 buildVersionToDownload: latestFromBranch branchName: 'refs/heads/$(MSVCBranchName)' artifactName: BuildNumber @@ -59,30 +59,18 @@ jobs: filePath: 'scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1' arguments: '-DropRoot "D:\msvc-drops\$(DropBuildNumber)" -BuildType ret' pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - script: .\bootstrap-vcpkg.bat - displayName: 'Build vcpkg' + displayName: 'Bootstrap vcpkg' - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing' pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space After Build' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' ArtifactName: 'failure logs for ${{ parameters.triplet }}' - condition: always() + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml b/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml index de254db64..a06da2a2c 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -2,6 +2,20 @@ # 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 + default: 'x86-windows' + - name: jobName + type: string + default: 'x86_windows' + - name: poolName + type: string + jobs: - job: ${{ parameters.jobName }} pool: @@ -20,31 +34,18 @@ jobs: value: x86-windows - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(root-url),$(sas),readwrite" + 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),$(sas-bin)" + value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" steps: - - task: PowerShell@2 - displayName: 'Report on Disk Space' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' - pwsh: true - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - - script: | - if exist ${{ variables.VCPKG_DOWNLOADS }} rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 - displayName: 'Clean downloads' - # Note that we run docs checks before PR checks because they are likely to invalidate a whole run anyway - - task: Powershell@2 - displayName: 'Generate Documentation' - condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') - inputs: - filePath: 'docs/regenerate.ps1' - arguments: '-VcpkgRoot . -WarningAction Stop' - pwsh: true + condition: eq('use default', '${{ parameters.vcpkgToolSha }}') + - script: .\scripts\azure-pipelines\windows\bootstrap-from-source.cmd ${{ parameters.vcpkgToolSha }} + displayName: "Build vcpkg with CMake" + condition: ne('use default', '${{ parameters.vcpkgToolSha }}') - script: '.\vcpkg.exe format-manifest --all' displayName: 'Format Manifests' condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') @@ -62,7 +63,7 @@ jobs: PathtoPublish: '$(DiffFile)' ArtifactName: 'format.diff' - task: PowerShell@2 - displayName: '*** Test Modified Ports for ${{ parameters.triplet }}' + displayName: '*** Test Modified Ports' inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' @@ -72,43 +73,7 @@ jobs: displayName: 'Validate version files' condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') inputs: - targetType: inline - script: | - ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | - ForEach-Object -Begin { - $long_error = '' - } -Process { - if ($long_error -ne '' -and $_ -match '^$|^ ') { - # Extend multi-line message - $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` - -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) - } else { - if ($long_error -ne '') { - # Flush multi-line message - $long_error - $long_error = '' - } - if ($_ -match '^Error: ') { - # Start multi-line message - $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` - -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' - } else { - # Normal line - $_ - } - } - } -End { - if ($long_error -ne '') { - # Flush multi-line message - $long_error - } - } - pwsh: true - - task: PowerShell@2 - displayName: 'Report on Disk Space After Build' - condition: always() - inputs: - filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' + filePath: 'scripts/azure-pipelines/windows/validate-version-files.ps1' pwsh: true - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: failure logs for ${{ parameters.triplet }}' @@ -131,3 +96,12 @@ jobs: 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 }} + diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd b/external_imported/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd new file mode 100644 index 000000000..8f8aae337 --- /dev/null +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/bootstrap-from-source.cmd @@ -0,0 +1,7 @@ +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86 -host_arch=x86 +git clone https://github.com/microsoft/vcpkg-tool vcpkg-tool +git -C vcpkg-tool switch -d %1 +rmdir /s /q build.x86.release > nul 2> nul +cmake.exe -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=OFF -DVCPKG_BUILD_FUZZING=OFF -DVCPKG_BUILD_TLS12_DOWNLOADER=OFF -B build.x86.release -S vcpkg-tool +ninja.exe -C build.x86.release +move build.x86.release\vcpkg.exe vcpkg.exe diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 index 5d07c5994..c358aa6bd 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/create-image.ps1 @@ -14,12 +14,12 @@ at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6 or are running from Azure Cloud Shell. #> -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'Win-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32as_v4' +$VMSize = 'Standard_D8a_v4' $ProtoVMName = 'PROTOTYPE' -$WindowsServerSku = '2022-datacenter-g2' +$WindowsServerSku = '2022-datacenter' $ErrorActionPreference = 'Stop' $CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip' @@ -253,7 +253,7 @@ Set-AzVM ` -Generalized $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID $ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 index 96135831f..ea2a00a7f 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -25,7 +25,7 @@ Param( [string]$ImageName ) -$Location = 'westus2' +$Location = 'eastasia' $Prefix = 'PrWin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32a_v4' @@ -84,6 +84,10 @@ $Vmss = Set-AzVmssStorageProfile ` -DiffDiskSetting Local ` -ImageReferenceId $Image.Id +$Vmss = Set-AzVmssBootDiagnostic ` + -VirtualMachineScaleSet $Vmss ` + -Enabled $true + New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 index a0b32cebb..5b58b7eb4 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 @@ -7,7 +7,7 @@ # Seems like only the HPC kit is really needed? #$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe' -$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/18578/w_HPCKit_p_2022.1.3.145_offline.exe' # Possible oneAPI Base components: #intel.oneapi.win.vtune 2021.1.1-68 true Intel® VTune(TM) Profiler diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 332d68f92..9eb60f094 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/external_imported/vcpkg/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.2.1/PowerShell-7.2.1-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 2567d4c11..ced950265 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -14,14 +14,18 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ATL', 'Microsoft.VisualStudio.Component.VC.ATLMFC', - 'Microsoft.VisualStudio.Component.Windows10SDK.18362', - 'Microsoft.VisualStudio.Component.Windows10SDK.19041', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM', + 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM', + 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', + "Microsoft.VisualStudio.Component.Windows11SDK.22621", 'Microsoft.Net.Component.4.8.SDK', 'Microsoft.Net.Component.4.7.2.TargetingPack', 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', - 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools' + 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools', + 'Microsoft.VisualStudio.Component.VC.CMake.Project' ) <# diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 index 9c6ca0a5d..b1b013383 100644 --- a/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 @@ -42,8 +42,5 @@ Function InstallWindowsDK { } } -# Windows 10 SDK, version 2004 (10.0.19041.0) -InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843' - # Windows 10 WDK, version 2004 InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854' diff --git a/external_imported/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 b/external_imported/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 new file mode 100644 index 000000000..1bcb05a7b --- /dev/null +++ b/external_imported/vcpkg/scripts/azure-pipelines/windows/validate-version-files.ps1 @@ -0,0 +1,29 @@ +./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | +ForEach-Object -Begin { + $long_error = '' +} -Process { + if ($long_error -ne '' -and $_ -match '^$|^ ') { + # Extend multi-line message + $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` + -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) + } else { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + $long_error = '' + } + if ($_ -match '^Error: ') { + # Start multi-line message + $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` + -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' + } else { + # Normal line + $_ + } + } +} -End { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + } +} diff --git a/external_imported/vcpkg/scripts/boost/generate-ports.ps1 b/external_imported/vcpkg/scripts/boost/generate-ports.ps1 index 7c71e7ba2..1f9242c65 100644 --- a/external_imported/vcpkg/scripts/boost/generate-ports.ps1 +++ b/external_imported/vcpkg/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.78.0", + $version = "1.80.0", $portsDir = $null ) @@ -24,7 +24,6 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; - "boost-vcpkg-helpers" = 1; } $portData = @{ @@ -168,13 +167,17 @@ function GeneratePortManifest() { [string]$PortName, [string]$Homepage, [string]$Description, + [string]$License, $Dependencies = @() ) $manifest = @{ - "name" = $PortName - "version" = $version - "homepage" = $Homepage - "description" = $Description + "name" = $PortName + "version" = $version + "homepage" = $Homepage + "description" = $Description + } + if ($License) { + $manifest["license"] += $License } if ($portData.Contains($PortName)) { $manifest += $portData[$PortName] @@ -230,6 +233,7 @@ function GeneratePort() { -PortName $portName ` -Homepage "https://github.com/boostorg/$Library" ` -Description "Boost $Library module" ` + -License "BSL-1.0" ` -Dependencies $Dependencies $portfileLines = @( @@ -275,9 +279,6 @@ function GeneratePort() { if ($NeedsBuild) { $portfileLines += @( - "if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)" - " message(FATAL_ERROR `"$portName requires a newer version of vcpkg in order to build.`")" - "endif()" "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" ) # b2-options.cmake contains port-specific build options @@ -564,6 +565,7 @@ if ($updateServicePorts) { -PortName "boost" ` -Homepage "https://boost.org" ` -Description "Peer-reviewed portable C++ source libraries" ` + -License "BSL-1.0" ` -Dependencies $boostPortDependencies Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` @@ -574,25 +576,29 @@ if ($updateServicePorts) { # Generate manifest files for boost-uninstall GeneratePortManifest ` -PortName "boost-uninstall" ` - -Description "Internal vcpkg port used to uninstall Boost" + -Description "Internal vcpkg port used to uninstall Boost" ` + -License "MIT" # Generate manifest files for boost-vcpkg-helpers GeneratePortManifest ` -PortName "boost-vcpkg-helpers" ` -Description "Internal vcpkg port used to modularize Boost" ` + -License "MIT" ` -Dependencies @("boost-uninstall") # Generate manifest files for boost-modular-build-helper GeneratePortManifest ` -PortName "boost-modular-build-helper" ` -Description "Internal vcpkg port used to build Boost libraries" ` - -Dependencies @("boost-uninstall", "vcpkg-cmake") + -License "MIT" ` + -Dependencies @("boost-uninstall", @{ name = "vcpkg-cmake"; host = $True }, @{ name = "vcpkg-cmake-get-vars"; host = $True }) # Generate manifest files for boost-build GeneratePortManifest ` -PortName "boost-build" ` -Homepage "https://github.com/boostorg/build" ` -Description "Boost.Build" ` + -License "BSL-1.0" ` -Dependencies @("boost-uninstall") # Update Boost version in CMake files @@ -606,7 +612,7 @@ if ($updateServicePorts) { -Encoding UTF8 ` -Raw $content = $content -replace ` - "set\(BOOST_VERSION [0-9\.]+\)", ` + "set\(BOOST_VERSION [0-9\.a-zA-Z]+\)", ` "set(BOOST_VERSION $version)" Set-Content -LiteralPath $_ ` diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake index 373b2a4ea..5c524cd70 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/atomic.cmake @@ -1,7 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/context.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/context.cmake index 48e4e5eec..90080695f 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/context.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/context.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/fiber.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/fiber.cmake index 7a2f4acf5..90080695f 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/fiber.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/fiber.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/json.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/json.cmake index bea05e660..fae13263b 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/json.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/json.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake index cb3cb67fd..9f4656d66 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/log.cmake @@ -2,11 +2,8 @@ file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") string(REPLACE " @select-arch-specific-sources" "#@select-arch-specific-sources" _contents "${_contents}") file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") - -file(READ ${SOURCE_PATH}/build/log-arch-config.jam _contents) -string(REPLACE +vcpkg_replace_string("${SOURCE_PATH}/build/log-arch-config.jam" "project.load [ path.join [ path.make $(here:D) ] ../../config/checks/architecture ]" "project.load [ path.join [ path.make $(here:D) ] ../config/checks/architecture ]" - _contents "${_contents}") -file(WRITE ${SOURCE_PATH}/build/log-arch-config.jam "${_contents}") +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/nowide.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/nowide.cmake index 7a2f4acf5..90080695f 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/nowide.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/nowide.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import ../config/checks/config" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/test.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/test.cmake index 29ff6947f..6e8ee9738 100644 --- a/external_imported/vcpkg/scripts/boost/post-source-stubs/test.cmake +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/test.cmake @@ -1,4 +1,5 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../predef/check/predef" "import ../predef/check/predef" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../predef/check/predef" + "import ../predef/check/predef" +) file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${SOURCE_PATH}/predef") diff --git a/external_imported/vcpkg/scripts/boost/post-source-stubs/wave.cmake b/external_imported/vcpkg/scripts/boost/post-source-stubs/wave.cmake new file mode 100644 index 000000000..90080695f --- /dev/null +++ b/external_imported/vcpkg/scripts/boost/post-source-stubs/wave.cmake @@ -0,0 +1,5 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" + "import ../../config/checks/config" + "import ../config/checks/config" +) +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/config") diff --git a/external_imported/vcpkg/scripts/bootstrap.ps1 b/external_imported/vcpkg/scripts/bootstrap.ps1 index ea1edb8e8..03f4ec2a9 100644 --- a/external_imported/vcpkg/scripts/bootstrap.ps1 +++ b/external_imported/vcpkg/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-03-30' +$versionDate = '2022-09-20' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/external_imported/vcpkg/scripts/bootstrap.sh b/external_imported/vcpkg/scripts/bootstrap.sh index 474d56cfe..c8bc5927f 100644 --- a/external_imported/vcpkg/scripts/bootstrap.sh +++ b/external_imported/vcpkg/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-03-30" +vcpkgToolReleaseTag="2022-09-20" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="8bf65bc52b48c0c048c465036dfab60c0d6b84d2c61bf36c948b58d2da0a6f9f21b00dbc888fe5b163c275e901a0014482e50895ee607408cf533057b66a4e73" + vcpkgToolReleaseSha="d09cf1fb57d3a5a8965723e0de4fc29d05d3d48c06a2b21a027750c955d7f54a881265ae53805d0b0e674db6d4c0b303a915a070daacd72d87a111132daea5df" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d5a0a67ef966b1db5ded37986ccabd8a6dc2531209e07945c32679faab45c0f001b95eef342e41f8937234e8efa6b038847b78f77c19d949a7d2aa7857b6a019" + vcpkgToolReleaseSha="f454db52986d6ac57117c61696d3d8f581db154d38a2aac1e7d2c234e3ed8486e017f2db4638e6d26fc5d6e545e76edc20d2a7e3a0fe12ca507bae86a250cca5" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="14dae353ce576e688cd93f0607f4eb7d724fb34f4c78c62d90db0c0fc4806e21c0da2b4fbe0b2a776ac3e8c669685e8d26990b5828be252645ac9289c7d015f9" + vcpkgToolReleaseSha="9f360cfd7189cc5c09f7445782075e524ba9e0e2f9205d5e7bfb0c531ade180678ee729e764955ca06056acb5d2b5892c92681e9fb8b7f77b8437924a2c9909d" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16" + vcpkgToolReleaseSha="0c7e90821889b3a5a1bec8542445c92226fa0201232dbde042ef1ba3bf6cb6f9eb0f0d99d509b064eb6023f97ab9491a11ab38cd39a4db6caa3183b7bcc4fe36" fi # Do the download or build. @@ -195,7 +195,9 @@ if [ "$vcpkgDownloadTool" = "ON" ]; then vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha else if [ "x$CXX" = "x" ]; then - if which g++-11 >/dev/null 2>&1; then + if which g++-12 >/dev/null 2>&1; then + CXX=g++-12 + elif which g++-11 >/dev/null 2>&1; then CXX=g++-11 elif which g++-10 >/dev/null 2>&1; then CXX=g++-10 diff --git a/external_imported/vcpkg/scripts/build_info.cmake b/external_imported/vcpkg/scripts/build_info.cmake index a6208016a..112e07465 100644 --- a/external_imported/vcpkg/scripts/build_info.cmake +++ b/external_imported/vcpkg/scripts/build_info.cmake @@ -35,6 +35,9 @@ endif() if (DEFINED VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicySkipArchitectureCheck: ${VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK}\n") endif() +if (DEFINED VCPKG_POLICY_CMAKE_HELPER_PORT) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyCmakeHelperPort: ${VCPKG_POLICY_CMAKE_HELPER_PORT}\n") +endif() if (DEFINED VCPKG_HEAD_VERSION) file(APPEND ${BUILD_INFO_FILE_PATH} "Version: ${VCPKG_HEAD_VERSION}\n") endif() diff --git a/external_imported/vcpkg/scripts/buildsystems/make_wrapper/windres-rc b/external_imported/vcpkg/scripts/buildsystems/make_wrapper/windres-rc old mode 100644 new mode 100755 index bb2aac0d8..9d20158f1 --- a/external_imported/vcpkg/scripts/buildsystems/make_wrapper/windres-rc +++ b/external_imported/vcpkg/scripts/buildsystems/make_wrapper/windres-rc @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for windres to rc which do not understand '-i -o --output-format'. # cvtres is invoked by the linker -scriptversion=2021-04-02.18; # UTC +scriptversion=2022-08-24.12; # UTC nl=' @@ -59,56 +59,61 @@ func_file_conv () func_windres_wrapper () { # Assume a capable shell + bin= in= out= for arg do - if test -n "$eat"; then + if test -z "$bin"; then + bin=$1 + elif test -n "$eat"; then eat= else case $1 in + --output-format=*) + ;; + --define*) + eat=1 + set -- "$@" "-d $2" + ;; + --include-dir*) + eat=1 + func_file_conv "$2" + set -- "$@" "-I $file" + ;; -o) eat=1 func_file_conv "$2" out="$file" echo "OUTPUT:$file" - set x "$@" - shift ;; *.obj) func_file_conv "$1" out="$file" echo "OUTPUT:$file" - set x "$@" - shift - ;; - --output-format=*) - set x "$@" - shift ;; -i) eat=1 func_file_conv "$2" mingw in="$file" echo "INPUT:$file" - set x "$@" - shift ;; -*) - set x "$@" "${1//\\\"/\"}" - shift + set -- "$@" "${1//\\\"/\"}" ;; *) - set x "$@" "$1" - shift + # libtool reorders arguments; save unqualified one as input + func_file_conv "$1" + in="$file" + echo "INPUT:$file" ;; esac fi shift done - echo "$@" -fo "$out" "$in" - exec "$@" -fo "$out" "$in" + echo "$bin" "$@" -fo "$out" "$in" + exec "$bin" "$@" -fo "$out" "$in" exit 1 } diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props index 9a01beb5a..f728dc737 100644 --- a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props +++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.props @@ -3,7 +3,29 @@ true true - $(Configuration) + + + + + + + + $(Configuration) + + + + + Debug + + + + + Release + + + + + false $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..')) diff --git a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets index 3f2b63d85..9719f388e 100644 --- a/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets +++ b/external_imported/vcpkg/scripts/buildsystems/msbuild/vcpkg.targets @@ -109,6 +109,8 @@ + + StandardOutputImportance="High" + IgnoreStandardErrorWarningFormat="true" + CustomWarningRegularExpression="([Ee]rror|[Ww]arning):" /> " -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ${EXTRA_OPTIONS} ) elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") if(NOT MACOSX_BUNDLE_IDX EQUAL -1) add_custom_command(TARGET "${target_name}" POST_BUILD - COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" - "$" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" + "$" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" + VERBATIM ) endif() endif() @@ -618,6 +630,7 @@ function(add_library) -targetBinary "$" -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin" -OutVariable out + VERBATIM ) endif() set_target_properties("${target_name}" PROPERTIES VS_USER_PROPS do_not_import_user.props) diff --git a/external_imported/vcpkg/scripts/ci.baseline.txt b/external_imported/vcpkg/scripts/ci.baseline.txt index 2bbf62cdb..752dd0df3 100644 --- a/external_imported/vcpkg/scripts/ci.baseline.txt +++ b/external_imported/vcpkg/scripts/ci.baseline.txt @@ -2,13 +2,18 @@ ## This file defines the current expected build state of ports in CI. ## ## States -## pass - (default) the port builds in the CI system. If a port is -## missing from this file then it is assumed to build. -## fail - the port does not build in the CI system. +## (default) - +## If a port is missing from this file then it is assumed +## to build successfully if not blocked by a dependency. +## pass - The port must build successfully in the CI system. It is a hard +## error if the port build is blocked by a failed dependency. +## fail - The port build is expected to fail in the CI system. ## This is not necessarily the same as if a port is expected to build ## on a developers machine because it may fail due to the machine -## configuration. When set to fail the CI system will still attempt -## to build the port and will report a CI failure until this file is updated. +## configuration. When set to fail the CI system will silently skip +## the port for pull request CI runs. But the CI system will still +## attempt to build the port in scheduled runs, reporting unexpected +## build success as a CI failure. ## skip - Do not build this port in the CI system. ## This is added to ports that may be flaky or conflict with other ## ports. Please comment for why a port is skipped so it can be @@ -29,45 +34,31 @@ # Add new items alphabetically -# script ports -#vcpkg-cmake:arm64-windows=fail -#vcpkg-cmake:arm-uwp=fail -#vcpkg-cmake:x64-uwp=fail -#vcpkg-cmake:x64-windows-static=fail -#vcpkg-cmake:x64-windows-static-md=fail -#vcpkg-cmake:x86-windows=fail - -#vcpkg-cmake-config:arm64-windows=fail -#vcpkg-cmake-config:arm-uwp=fail -#vcpkg-cmake-config:x64-uwp=fail -#vcpkg-cmake-config:x64-windows-static=fail -#vcpkg-cmake-config:x64-windows-static-md=fail -#vcpkg-cmake-config:x86-windows=fail - -# other ports # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -# Requires ATL for ARM64 to be installed in CI -azure-storage-cpp:arm64-windows=fail - -aubio:arm-uwp=fail -aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail +bitserializer:arm64-osx=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail -blosc:arm64-windows=fail -blosc:arm-uwp=fail -blosc:x64-uwp=fail +# Conflicts with openssl +boringssl:arm64-windows=skip +boringssl:arm-uwp=skip +boringssl:x64-linux=skip +boringssl:x64-osx=skip +boringssl:arm64-osx=skip +boringssl:x64-uwp=skip +boringssl:x64-windows=skip +boringssl:x64-windows-static=skip +boringssl:x64-windows-static-md=skip +boringssl:x86-windows=skip bond:arm-uwp=fail bond:x64-osx=fail +bond:arm64-osx=fail bond:x64-uwp=fail botan:x64-uwp=fail -breakpad:arm64-windows=fail -buck-yeh-bux:x64-linux=fail -buck-yeh-bux-mariadb-client:x64-linux=fail caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail @@ -82,6 +73,7 @@ c-dbg-macro:x64-uwp=skip c-dbg-macro:arm64-windows=skip c-dbg-macro:arm-uwp=skip c-dbg-macro:x64-osx=skip +c-dbg-macro:arm64-osx=skip c-dbg-macro:x64-linux=skip casclib:arm-uwp=fail @@ -90,13 +82,12 @@ catch-classic:arm64-windows = skip catch-classic:arm-uwp = skip catch-classic:x64-linux = skip catch-classic:x64-osx = skip +catch-classic:arm64-osx = skip catch-classic:x64-uwp = skip catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip -ccd:arm-uwp=fail -ccd:x64-uwp=fail cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail @@ -124,8 +115,6 @@ chartdir:x86-windows=skip chartdir:x64-windows=skip chartdir:x64-windows-static-md=skip chartdir:x64-osx=skip -chmlib:arm-uwp=fail -chmlib:x64-uwp=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 @@ -170,11 +159,6 @@ coolprop:x64-uwp=fail coroutine:arm-uwp=fail coroutine:x64-linux=fail coroutine:x64-uwp=fail -corrade:arm-uwp=fail -corrade:x64-uwp=fail -cppcms:x64-linux=fail -cppcms:x64-osx=fail -cppcms:x64-windows-static=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -190,16 +174,10 @@ cppcoro:x64-uwp=fail cppgraphqlgen:x64-linux=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail -crashpad:x64-linux=fail crashpad:x86-windows=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail cuda:x64-osx=fail -cudnn:arm64-windows=fail -cudnn:arm-uwp=fail -cudnn:x64-uwp=fail -cudnn:x64-windows-static=fail -cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip dbghelp:arm64-windows=skip @@ -211,42 +189,25 @@ dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:x64-uwp=fail -devicenameresolver:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip +directxsdk:x64-windows-static-md=skip discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail - # requires g++11 discordcoreapi:x64-linux=fail - +dlib:arm-uwp=fail +dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail -dpdk:arm-uwp=fail -dpdk:arm64-windows=fail -dpdk:x64-linux=fail -dpdk:x64-osx=fail -dpdk:x64-uwp=fail -dpdk:x64-windows-static=fail -dpdk:x64-windows-static-md=fail -dpdk:x64-windows=fail -dpdk:x86-windows=fail -duckx:arm64-windows = skip -duckx:arm-uwp = skip -duckx:x64-linux = skip -duckx:x64-osx = skip -duckx:x64-uwp = skip -duckx:x64-windows = skip -duckx:x64-windows-static = skip -duckx:x64-windows-static-md=skip -duckx:x86-windows = skip # requires python@2 from brew, but that no longer exists # python2 EOL yay! duktape:x64-osx=skip +duktape:arm64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail @@ -260,40 +221,26 @@ ecsutil:x64-osx=fail ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail -# embree creates common conflicting static library names when built in static mode, reported upstream: -# https://github.com/embree/embree/issues/331 -embree2:x64-windows-static=skip -embree2:x64-windows-static-md=skip -# embree2 conflicts with embree3 -embree2:x64-linux=skip -embree2:x64-osx=skip -enet:arm-uwp=fail -enet:x64-uwp=fail +elfutils:arm64-osx=fail epsilon:arm-uwp=fail epsilon:x64-uwp=fail -epsilon:x64-windows-static=fail -fann:x64-windows-static=fail +faiss:arm64-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail -fdlibm:arm-uwp=fail -fdlibm:x64-uwp=fail -fftw3:arm-uwp=fail -fftw3:x64-uwp=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 fluidlite:arm64-windows=skip fluidlite:x64-linux=skip fluidlite:x64-osx=skip +fluidlite:arm64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip -fmem:arm-uwp=fail -fmem:x64-uwp=fail fmi4cpp:arm-uwp=fail fmi4cpp:x64-uwp=fail fmilib:arm64-windows=fail @@ -306,24 +253,29 @@ foonathan-memory:arm64-windows=fail foonathan-memory:arm-uwp=fail foonathan-memory:x64-uwp=fail forge:x86-windows=fail -freeglut:arm64-windows=fail freeglut:arm-uwp=fail freeglut:x64-uwp=fail freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail -freetype-gl:x64-uwp=fail ftgl:x64-uwp=fail +ftgl:arm-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail -fuzzylite:x64-osx=fail +# VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 +gazebo:x64-windows=fail +gazebo:x64-linux=fail + +gdk-pixbuf:x64-windows-static=fail +gdk-pixbuf:x64-windows-static-md=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 +geogram:arm64-windows=fail # Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip @@ -331,11 +283,8 @@ geotrans:x64-windows = skip geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail -getopt-win32:arm64-windows=fail -getopt-win32:arm-uwp=fail getopt-win32:x64-linux=fail getopt-win32:x64-osx=fail -getopt-win32:x64-uwp=fail gflags:arm-uwp=fail gflags:x64-uwp=fail @@ -349,43 +298,37 @@ gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip gherkin-c:x64-windows-static-md = skip gherkin-c:x86-windows = skip -gl3w:arm64-windows=fail -gl3w:arm-uwp=fail glew:arm64-windows=fail -glew:arm-uwp=fail glfw3:arm-uwp=fail glfw3:x64-uwp=fail -glib:x64-uwp=fail -glib:x64-windows-static=fail -gmmlib:arm64-windows=fail +glibmm:x64-windows-static-md=fail +glibmm:x64-windows-static=fail gmmlib:arm-uwp=fail +gmmlib:arm64-windows=fail gmmlib:x64-osx=fail gmmlib:x64-uwp=fail -gmmlib:x64-windows=fail -gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail +gmmlib:x64-windows-static=fail +gmmlib:x64-windows=fail gmmlib:x86-windows=fail - +gstreamer:x64-windows-static=fail +gstreamer:x64-windows-static-md=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail -gppanel:x64-osx=fail -gperf:x64-uwp=fail -gperf:arm-uwp=fail gperftools:arm64-windows=fail gperftools:x64-uwp=fail gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail -graphite2:arm-uwp=fail -graphite2:x64-uwp=fail -graphqlparser:arm-uwp=fail -graphqlparser:x64-uwp=fail -gsl:arm-uwp=fail -gsl: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:x64-windows-static-md=fail gstreamer:x64-osx=fail +gstreamer:arm64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail -gts:x64-osx=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail @@ -398,8 +341,6 @@ healpix:x64-uwp=fail healpix:arm64-windows=fail healpix:arm-uwp=fail healpix:x64-osx=fail -hiredis:arm-uwp=fail -hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:arm64-windows=fail hunspell:x64-windows-static-md=fail @@ -414,11 +355,13 @@ ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip +igraph:x64-uwp=fail # Conflicts with libjpeg-turbo, mozjpeg ijg-libjpeg:arm64-windows = skip ijg-libjpeg:arm-uwp = skip 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 @@ -427,68 +370,33 @@ intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail intel-mkl:x64-linux=fail intel-mkl:x64-osx=fail +intel-mkl:arm64-osx=fail intel-mkl:x64-uwp=fail intel-mkl:x64-windows=fail intel-mkl:x64-windows-static=fail intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail -intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail -isal:arm64-windows=fail -isal:arm-uwp=fail -isal:x64-osx=fail -isal:x64-uwp=fail -isal:x64-windows=fail -isal:x64-windows-static=fail -isal:x64-windows-static-md=fail -isal:x86-windows=fail -jbig2dec:arm-uwp=fail -jbig2dec:x64-uwp=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail -jemalloc:x64-linux=fail -jemalloc:x64-osx=fail jemalloc:x64-uwp=fail -jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail kfr:arm64-windows=fail kfr:arm-uwp=fail kfr:x64-linux=fail -kinectsdk1:arm64-windows=fail -kinectsdk1:arm-uwp=fail -kinectsdk1:x64-linux=fail -kinectsdk1:x64-osx=fail -kinectsdk2:arm64-windows=fail -kinectsdk2:arm-uwp=fail -kinectsdk2:x64-linux=fail -kinectsdk2:x64-osx=fail lastools:arm-uwp=fail lastools:x64-uwp=fail -laszip:arm-uwp=fail -laszip:x64-uwp=fail -lcm:x64-osx=fail +lcm:x64-windows-static=fail +lcm:x64-windows-static-md=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 -libbf:arm64-windows=fail -libbf:arm-uwp=fail -libbf:x64-uwp=fail -libbf:x64-windows=fail -libbf:x64-windows-static=fail -libbf:x64-windows-static-md=fail -libbf:x86-windows=fail -libbson:arm-uwp=fail -libbson:x64-uwp=fail -libcds:arm64-windows=fail -libcds:arm-uwp=fail -libcds:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf @@ -509,37 +417,29 @@ libevhtp:arm-uwp=fail libexif:arm-uwp=fail libexif:x64-uwp=fail libfreenect2:arm64-windows=fail -libfreenect2:x64-osx=fail libgit2:arm-uwp=fail libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail - -# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing +# the msbuild for libgpg:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing libgpg:x64-uwp=fail -libgpg-error:x64-uwp=fail - +libgxps:x64-windows-static=fail +libgxps:x64-windows-static-md=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail -libhydrogen:arm64-windows=fail -libics:arm-uwp=fail -libics:x64-uwp=fail +libhdfs3:arm64-osx=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip -liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail liblo:x64-uwp=fail -libmad:arm-uwp=fail -libmad:x64-uwp=fail libmagic:x64-uwp=fail -libmagic:arm64-windows=fail libmagic:arm-uwp=fail libmariadb:arm64-windows = skip libmariadb:arm-uwp = skip @@ -558,8 +458,13 @@ libmesh:x64-windows-static=skip libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip +libmesh:arm64-osx=skip 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 libmikmod:x64-osx=fail +libmikmod:arm64-osx=fail libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail @@ -585,8 +490,6 @@ libpng-apng:x64-windows = skip libpng-apng:x64-windows-static = skip libpng-apng:x64-windows-static-md=skip libpng-apng:x86-windows = skip -libpq:arm-uwp=fail -libpq:x64-uwp=fail # The developer of libqcow does not offer stable release archives libqcow:arm-uwp=skip libqcow:x64-uwp=skip @@ -598,38 +501,23 @@ libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip # Conflicts with openssl -boringssl:arm64-windows = skip -boringssl:arm-uwp = skip -boringssl:x64-linux = skip -boringssl:x64-osx = skip -boringssl:x64-uwp = skip -boringssl:x64-windows = skip -boringssl:x64-windows-static = skip -boringssl:x64-windows-static-md=skip -boringssl:x86-windows = skip -libressl:arm64-windows = skip -libressl:arm-uwp = skip -libressl:x64-linux = skip -libressl:x64-osx = skip -libressl:x64-uwp = skip -libressl:x64-windows = skip -libressl:x64-windows-static = skip +libressl:arm64-windows=skip +libressl:arm-uwp=skip +libressl:x64-linux=skip +libressl:x64-osx=skip +libressl:x64-uwp=skip +libressl:x64-windows=skip +libressl:x64-windows-static=skip libressl:x64-windows-static-md=skip -libressl:x86-windows = skip +libressl:x86-windows=skip libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail libspatialite:arm-uwp=fail libspatialite:x64-uwp=fail -libsrt:arm-uwp=fail -libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail -libstk:arm-uwp=fail -libstk:x64-uwp=fail -libtcod:arm-uwp=fail -libtcod:x64-uwp=fail libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail @@ -660,7 +548,7 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip -libvpx:arm-uwp=fail +libvmdk:arm64-osx=skip libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -674,29 +562,20 @@ linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail live555:arm-uwp=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-uwp=fail llgl:x64-uwp=fail -lmdb:arm-uwp=fail -lmdb:x64-uwp=fail log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail -luajit:arm64-windows = skip -luajit:arm-uwp = skip -luajit:x64-linux = skip -luajit:x64-osx = skip -luajit:x64-uwp = skip -luajit:x64-windows = skip -luajit:x64-windows-static = skip -luajit:x64-windows-static-md=skip -luajit:x86-windows = skip +luajit:arm64-windows=fail luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail -luasocket:arm-uwp=fail -luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail @@ -706,7 +585,9 @@ marble:arm-uwp=fail marble:x64-linux=fail marble:x64-osx=fail marble:x86-windows=fail +mathgl:arm-uwp=fail mathgl:x64-osx=fail +mathgl:arm64-osx=fail mathgl:x64-uwp=fail mecab:arm64-windows = skip mecab:arm-uwp = skip @@ -718,23 +599,18 @@ mecab:x64-windows-static-md=skip mecab:x86-windows = skip # Due to static crt. mesa:x64-windows-static=fail -mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -meschach:arm-uwp=fail -meschach:x64-linux=fail -meschach:x64-osx=fail -meschach:x64-uwp=fail -metis:arm-uwp=fail -metis:x64-uwp=fail +# Triggers an ICE +mfl:x64-windows-static=fail +mfl:x64-windows-static-md=fail mfl:x64-linux=skip mfl:x64-osx=skip +mfl:arm64-osx=skip milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail minifb:x64-uwp=fail -minisat-master-keying:arm-uwp=fail -minisat-master-keying:x64-uwp=fail miniupnpc:arm-uwp=fail miniupnpc:x64-uwp=fail minizip:arm-uwp=fail @@ -744,6 +620,7 @@ microsoft-signalr:arm64-windows=skip microsoft-signalr:arm-uwp=skip microsoft-signalr:x64-linux=skip microsoft-signalr:x64-osx=skip +microsoft-signalr:arm64-osx=skip microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip @@ -751,13 +628,12 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mmloader:arm64-windows=fail -mmloader:arm-uwp=fail -mmloader:x64-linux=fail -mmloader:x64-osx=fail -mmloader:x64-uwp=fail -mmloader:x64-windows=fail -mmloader:x86-windows=fail +ms-quic:arm-uwp=fail +ms-quic:arm64-windows=fail +ms-quic:x64-uwp=fail +ms-quic:x64-windows-static-md=fail +ms-quic:x64-windows=fail +ms-quic:x86-windows=fail # mmx installs many problematic headers, such as `json.h` and `sched.h` mmx:x64-windows=skip mmx:x64-windows-static=skip @@ -765,11 +641,14 @@ mmx:x64-windows-static-md=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip +mmx:arm64-osx=skip mmx:arm-uwp=skip mmx:x64-uwp=skip mmx:arm64-windows=skip # Flaky strange linker error mongo-c-driver:x64-osx=skip +mongo-c-driver:arm-uwp=fail +mongo-c-driver:x64-uwp=fail mongoose:arm-uwp=fail mongoose:x64-uwp=fail monkeys-audio:arm64-windows=fail @@ -790,6 +669,7 @@ mozjpeg:arm64-windows = skip mozjpeg:arm-uwp = skip mozjpeg:x64-linux = skip mozjpeg:x64-osx = skip +mozjpeg:arm64-osx = skip mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip @@ -804,9 +684,6 @@ mpir:x64-windows-static-md=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip -msix:x64-linux=fail -msix:x64-osx=fail -msix:x64-windows-static=fail msmpi:arm64-windows=fail msmpi:arm-uwp=fail msmpi:x64-linux=fail @@ -824,11 +701,11 @@ nanodbc:x64-uwp=fail nanodbc:x64-linux=skip nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail +nettle:arm-uwp=fail +nettle:arm64-windows=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail -nrf-ble-driver:arm-uwp=fail -nrf-ble-driver:x64-uwp=fail numactl:arm64-windows=fail numactl:arm-uwp=fail numactl:x64-osx=fail @@ -854,6 +731,7 @@ offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-windows = skip ogdf:arm-uwp = skip ogdf:x64-osx=fail +ogdf:arm64-osx=fail ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip @@ -862,10 +740,12 @@ ogdf:x86-windows = skip # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 ogdf:x64-linux=fail ogre:x64-osx=fail +ogre:arm64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip ogre-next:arm-uwp = skip ogre-next:x64-osx = skip +ogre-next:arm64-osx = skip ogre-next:x64-linux = skip ogre-next:x64-uwp = skip ogre-next:x64-windows = skip @@ -882,68 +762,52 @@ ogre-next:x86-windows = skip # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_system.a -lpthread && : # /usr/bin/ld: cannot find -lode ompl:x64-osx=fail +ompl:arm64-osx=fail ompl:x64-linux=fail openal-soft:arm-uwp=fail openal-soft:x64-uwp=fail -openblas:arm64-windows=fail -openblas:arm-uwp=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected 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-uwp=fail -opencensus-cpp:arm64-windows=fail -opencensus-cpp:x64-windows=fail -opencensus-cpp:x64-windows-static=fail -opencensus-cpp:x64-windows-static-md=fail -opencensus-cpp:x86-windows=fail -opencensus-cpp:x64-uwp=fail opencl:arm-uwp=fail opencl:x64-uwp=fail +opencsg:arm-uwp=fail opencsg:x64-uwp=fail -opencv2:arm64-windows = skip -opencv2:arm-uwp = skip -opencv2:x64-linux = skip -opencv2:x64-osx = skip -opencv2:x64-uwp = skip -opencv2:x64-windows = skip -opencv2:x64-windows-static = skip -opencv2:x64-windows-static-md=skip -opencv2:x86-windows = skip -opencv3:arm64-windows = skip -opencv3:arm-uwp = skip -opencv3:x64-linux = skip -opencv3:x64-osx = skip -opencv3:x64-uwp = skip -opencv3:x64-windows = skip -opencv3:x64-windows-static = skip -opencv3:x64-windows-static-md=skip -opencv3:x86-windows = skip +opencv2:arm64-windows = skip +opencv2:arm-uwp = skip +opencv2:x64-linux = skip +opencv2:x64-osx = skip +opencv2:x64-uwp = skip +opencv2:x64-windows = skip +opencv2:x64-windows-static = skip +opencv2:x64-windows-static-md = skip +opencv2:x86-windows = skip +opencv3:arm64-windows = skip +opencv3:arm-uwp = skip +opencv3:x64-linux = skip +opencv3:x64-osx = skip +opencv3:x64-uwp = skip +opencv3:x64-windows = skip +opencv3:x64-windows-static = skip +opencv3:x64-windows-static-md = skip +opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail -openexr:arm64-windows=fail -openexr:arm-uwp=fail -openexr:x64-uwp=fail -opengl:arm64-windows=fail -opengl:arm-uwp=fail +opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail openmesh:arm-uwp=fail openmesh:x64-uwp=fail -openmpi:arm64-windows=fail -openmpi:arm-uwp=fail -openmpi:x64-uwp=fail -openmpi:x64-windows=fail -openmpi:x64-windows-static=fail -openmpi:x64-windows-static-md=fail -openmpi:x86-windows=fail -openni2:x64-uwp=fail -openni2:x64-windows-static=fail -openscap:x64-linux=fail +openscap:x64-windows-static=fail openscap:x64-osx=fail -opentracing:arm-uwp=fail -opentracing:x64-uwp=fail +# https://github.com/AcademySoftwareFoundation/openvdb/issues/1362 +# openvdb\openvdb\libopenvdb.lib : fatal error LNK1248: image size (109A36020) exceeds maximum allowable size (FFFFFFFF) +openvdb:x64-windows-static=fail +openvdb:x64-windows-static-md=fail openvpn3:x64-osx=fail +openvpn3:arm64-osx=fail openvr:arm64-windows=fail openvr:arm-uwp=fail openvr:x64-osx=fail @@ -960,22 +824,21 @@ optional-bare:x64-windows-static-md=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail -orocos-kdl:arm-uwp=fail -orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=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 -physx:arm64-windows=fail pixman:arm-uwp=fail platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail plib:arm-uwp=fail plib:x64-osx=fail +plib:arm64-osx=fail plib:x64-uwp=fail plibsys:arm-uwp=fail plibsys:x64-uwp=fail @@ -989,35 +852,21 @@ pmdk:x64-osx=fail pmdk:x64-uwp=fail pmdk:x64-windows-static=fail pmdk:x86-windows=fail -pngwriter:arm-uwp=fail -pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail -pqp:arm-uwp=fail -pqp:x64-uwp=fail -python2:arm64-windows=fail -python2:arm-uwp=fail -python2:x64-uwp=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail -qhull:x64-uwp=fail -qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail qt5-base:arm64-windows=fail -# qtwebengine:x64-windows has an ICE in VS2022 -qtwebengine:x64-windows=fail - -# upstream bug, see https://github.com/microsoft/vcpkg/issues/23766 -qtinterfaceframework:x64-windows=skip - # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip +qt5-canvas3d:arm64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip @@ -1025,6 +874,9 @@ qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail qtwayland:x64-osx=fail +qtwayland:arm64-osx=fail +# Post build checks fail +qtwebengine:arm64-windows=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail @@ -1034,26 +886,24 @@ qt5-webengine:x64-osx=fail # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. qt5-webengine:x64-windows=skip qt5-webengine:x86-windows=skip -# Static builds of qt5-webengine are not supported by the port itself -qt5-webengine:x64-windows-static=skip -qt5-webengine:x64-windows-static-md=skip # Missing system libraries qt5-x11extras:x64-osx=fail +qt5-x11extras:arm64-osx=fail # Missing libraries qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail qwt:x64-osx=fail +qwt:arm64-osx=fail qwt-qt6:x64-osx=fail -qwtw:x64-windows=fail rabit:x64-osx=fail -ragel:arm-uwp=fail -ragel:x64-uwp=fail +rabit:arm64-osx=fail range-v3-vs2015:arm64-windows = skip range-v3-vs2015:arm-uwp = skip range-v3-vs2015:x64-linux = skip range-v3-vs2015:x64-osx = skip +range-v3-vs2015:arm64-osx = skip range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip @@ -1099,6 +949,7 @@ rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip +rest-rpc:arm64-osx=skip rhash:arm64-windows=fail rocksdb:arm-uwp=fail rocksdb:x64-uwp=fail @@ -1127,8 +978,6 @@ rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail -rttr:arm-uwp=fail -rttr:x64-uwp=fail # ryu does not support VS2022 yet ryu:x64-windows=fail @@ -1139,6 +988,7 @@ sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-linux=fail sciter:x64-osx=fail +sciter:arm64-osx=fail sciter:x64-uwp=fail sciter:x64-windows=fail sciter:x64-windows-static=fail @@ -1152,29 +1002,20 @@ sdformat6:arm64-windows=fail sdformat6:x64-uwp=fail sdformat6:x64-windows-static-md=fail sdformat9:arm-uwp=fail -sdformat9:x64-linux=fail sdformat9:x64-uwp=fail sdformat9:x64-windows-static-md=fail -sdl1:arm-uwp=fail -sdl1:x64-uwp=fail -sdl1:x64-osx=fail sdl2-mixer:arm-uwp=fail sdl2-mixer:x64-uwp=fail sdl2-net:arm-uwp=fail sdl2-net:x64-uwp=fail -# https://github.com/microsoft/vcpkg/issues/10918 -seal:arm-uwp=fail -seal:x64-uwp=fail septag-sx:arm64-windows=fail septag-sx:arm-uwp=fail septag-sx:x64-uwp=fail -sfml:arm64-windows=fail -shapelib:arm-uwp=fail -shapelib:x64-uwp=fail shiva:x64-windows-static=fail shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail +shiva-sfml:arm64-osx=fail shiva-sfml:x86-windows=fail shiva-sfml:x64-windows=fail shogun:arm64-windows = skip @@ -1187,16 +1028,13 @@ shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail +simbody:arm64-windows=fail skia:arm-uwp=fail -skia:x64-linux=fail skia:x64-uwp=fail -skia:x86-windows=fail sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail -smpeg2:arm-uwp=fail smpeg2:x64-linux=fail -smpeg2:x64-uwp=fail soci:arm-uwp=fail soci:x64-uwp=fail sockpp:arm-uwp=fail @@ -1228,6 +1066,8 @@ spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail 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 spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail @@ -1287,7 +1127,6 @@ torch-th:arm64-windows=fail torch-th:arm-uwp=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -tre:x64-osx=fail treehopper:x64-windows-static=fail treehopper:x64-linux=fail unicorn-lib:arm-uwp=fail @@ -1295,15 +1134,16 @@ unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail unittest-cpp:x64-uwp=fail -unixodbc:arm64-windows=fail -unixodbc:arm-uwp=fail -unixodbc:x64-uwp=fail -unixodbc:x64-windows=fail -unixodbc:x64-windows-static=fail -unixodbc:x64-windows-static-md=fail -unixodbc:x86-windows=fail -urdfdom:x64-windows-static=fail -usd:x86-windows=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 +usd:x64-uwp=skip +usd:x64-windows=skip +usd:x64-windows-static=skip +usd:x64-windows-static-md=skip +usd:x64-linux=skip +usd:x64-osx=skip +usd:x86-windows=skip uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail v8:arm64-windows=fail @@ -1316,6 +1156,7 @@ vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail vulkan:x64-osx=fail +vulkan:arm64-osx=fail vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail @@ -1341,8 +1182,10 @@ winpcap:x64-windows-static-md=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail +winsock2:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 wpilib:arm64-windows=fail wpilib:x64-osx=fail +wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 wxchartdir:x64-osx=fail wxwidgets:x64-linux=fail x265:arm64-windows=fail @@ -1350,37 +1193,19 @@ x265:arm-uwp=fail x265:x64-uwp=fail xalan-c:x64-windows-static=fail xalan-c:arm64-windows=fail -xbyak:arm64-windows=fail -xbyak:arm-uwp=fail -xbyak:x64-uwp=fail xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail -yajl:arm-uwp=fail -yajl:x64-uwp=fail yara:arm-uwp=fail yara:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail -# Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market -# Skip CI to avoid random failures -ctp:arm64-windows=skip -ctp:arm-uwp=skip -ctp:x64-linux=skip -ctp:x64-osx=skip -ctp:x64-uwp=skip -ctp:x64-windows=skip -ctp:x64-windows-static=skip -ctp:x64-windows-static-md=skip -ctp:x86-windows=skip -protozero:arm-uwp=fail -protozero: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 @@ -1391,8 +1216,6 @@ lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail -akali:x64-windows-static-md=fail -fastcgi:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail @@ -1421,3 +1244,67 @@ workflow:arm-uwp=fail # See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 dimcli:x64-windows-static-md=fail dimcli:x64-windows-static=fail + +# ZeroC doesn't provide ARM tagets in project files. +zeroc-ice:arm64-windows=fail +zeroc-ice:arm-uwp=fail +zeroc-ice:x64-uwp=fail + +cmake-user:arm-uwp=pass +cmake-user:arm64-windows=pass +cmake-user:x64-linux=pass +cmake-user:x64-osx=pass +cmake-user:x64-windows-static-md=pass +cmake-user:x64-windows-static=pass +cmake-user:x64-windows=pass +cmake-user:x86-windows=pass +vcpkg-ci-arrow:x64-windows=pass +vcpkg-ci-arrow:x64-windows-static=pass +vcpkg-ci-arrow:x64-windows-static-md=pass +vcpkg-ci-arrow:x64-osx=pass +vcpkg-ci-arrow:x64-linux=pass +vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:x64-windows-static-md=pass +vcpkg-ci-boost:x64-windows-static=pass +vcpkg-ci-boost:x64-windows=pass +vcpkg-ci-boost:x86-windows=pass +vcpkg-ci-ffmpeg:arm-uwp=pass +vcpkg-ci-ffmpeg:arm64-windows=pass +vcpkg-ci-ffmpeg:x64-linux=pass +vcpkg-ci-ffmpeg:x64-uwp=pass +vcpkg-ci-ffmpeg:x64-windows-static-md=pass +vcpkg-ci-ffmpeg:x64-windows-static=pass +vcpkg-ci-ffmpeg:x64-windows=pass +vcpkg-ci-ffmpeg:x86-windows=pass +vcpkg-ci-llvm:x64-linux=pass +vcpkg-ci-llvm:x64-osx=pass +vcpkg-ci-llvm:x64-windows-static-md=pass +vcpkg-ci-llvm:x64-windows-static=pass +vcpkg-ci-llvm:x64-windows=pass +vcpkg-ci-llvm:x86-windows=pass +vcpkg-ci-opencv:arm-uwp=pass +vcpkg-ci-opencv:arm64-windows=pass +vcpkg-ci-opencv:x64-linux=pass +vcpkg-ci-opencv:x64-uwp=pass +vcpkg-ci-opencv:x64-windows-static-md=pass +vcpkg-ci-opencv:x64-windows-static=pass +vcpkg-ci-opencv:x64-windows=pass +vcpkg-ci-opencv:x86-windows=pass +vcpkg-ci-openimageio:x86-windows=pass +vcpkg-ci-openimageio:x64-windows=pass +vcpkg-ci-openimageio:x64-windows-static=pass +vcpkg-ci-openimageio:x64-windows-static-md=pass +vcpkg-ci-openimageio:x64-osx=pass +vcpkg-ci-openimageio:x64-linux=pass +vcpkg-ci-paraview:x64-linux=pass +vcpkg-ci-paraview:x64-osx=pass +vcpkg-ci-paraview:x64-windows-static-md=pass +vcpkg-ci-paraview:x64-windows-static=pass +vcpkg-ci-paraview:x64-windows=pass +vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-wxwidgets:arm64-windows=pass +vcpkg-ci-wxwidgets:x64-osx=pass +vcpkg-ci-wxwidgets:x64-windows-static-md=pass +vcpkg-ci-wxwidgets:x64-windows-static=pass +vcpkg-ci-wxwidgets:x64-windows=pass +vcpkg-ci-wxwidgets:x86-windows=pass diff --git a/external_imported/vcpkg/scripts/cmake/execute_process.cmake b/external_imported/vcpkg/scripts/cmake/execute_process.cmake index be45604d6..a338dda36 100644 --- a/external_imported/vcpkg/scripts/cmake/execute_process.cmake +++ b/external_imported/vcpkg/scripts/cmake/execute_process.cmake @@ -1,12 +1,3 @@ -#[===[.md: -# execute_process - -Intercepts all calls to execute_process() inside portfiles and fails when Download Mode -is enabled. - -In order to execute a process in Download Mode call `vcpkg_execute_in_download_mode()` instead. -#]===] - if (NOT DEFINED Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS) set(Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS ON) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake index dcd93ed4f..98effb4f9 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_acquire_msys.cmake @@ -1,61 +1,3 @@ -#[===[.md: -# vcpkg_acquire_msys - -Download and prepare an MSYS2 instance. - -## Usage -```cmake -vcpkg_acquire_msys( - PACKAGES ... - [NO_DEFAULT_PACKAGES] - [DIRECT_PACKAGES ...] -) -``` - -## Parameters -### MSYS_ROOT_VAR -An out-variable that will be set to the path to MSYS2. - -### PACKAGES -A list of packages to acquire in msys. - -To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)` - -### NO_DEFAULT_PACKAGES -Exclude the normal base packages. - -The list of base packages includes: bash, coreutils, sed, grep, gawk, gzip, diffutils, make, and pkg-config - -### DIRECT_PACKAGES -A list of URL/SHA512 pairs to acquire in msys. - -This parameter can be used by a port to privately extend the list of msys packages to be acquired. -The URLs can be found on the msys2 website[1] and should be a direct archive link: - - https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst - -[1] https://packages.msys2.org/search - -## Notes -A call to `vcpkg_acquire_msys` will usually be followed by a call to `bash.exe`: -```cmake -vcpkg_acquire_msys(MSYS_ROOT) -set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) - -vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME build-${TARGET_TRIPLET}-rel -) -``` - -## Examples - -* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) -* [libvpx](https://github.com/Microsoft/vcpkg/blob/master/ports/libvpx/portfile.cmake) -#]===] - # 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 set(Z_VCPKG_ACQUIRE_MSYS_MIRRORS @@ -94,8 +36,10 @@ endfunction() # - Z_VCPKG_MSYS_ARCHIVES # - Z_VCPKG_MSYS_TOTAL_HASH # - Z_VCPKG_MSYS_PACKAGES +# - Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE +# - Z_VCPKG_MSYS_${arg_NAME}_PATCHES function(z_vcpkg_acquire_msys_declare_package) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS;PATCHES") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") @@ -126,9 +70,15 @@ function(z_vcpkg_acquire_msys_declare_package) FILENAME "${filename}" ) - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + 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) + file(SHA512 "${patch}" patch_sha) + string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${patch_sha}") + endforeach() set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE) endif() endfunction() @@ -144,8 +94,8 @@ 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_TOTAL_HASH "") + set(Z_VCPKG_MSYS_ARCHIVES "") set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") @@ -176,7 +126,10 @@ function(vcpkg_acquire_msys out_msys_root) SHA512 "${sha512}" FILENAME "${filename}" ) - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + 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}") endforeach() endif() @@ -322,6 +275,7 @@ function(vcpkg_acquire_msys out_msys_root) 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" ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" @@ -392,6 +346,10 @@ function(vcpkg_acquire_msys out_msys_root) URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.2.0-8-x86_64.pkg.tar.zst" SHA512 fdd86f4ffa6e274d6fef1676a4987971b1f2e1ec556eee947adcb4240dc562180afc4914c2bdecba284012967d3d3cf4d1a392f798a3b32a3668d6678a86e8d3 ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" + SHA512 5323fd6635093adf67c24889f469e1ca8ac969188c7f087244a43b3afa0bf8f14579bd87d9d7beb16a7cd61a5ca1108515a46b331868b4817b35cebcb4eba1d1 + ) 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" @@ -550,11 +508,17 @@ This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive}" + 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() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake index b17aca368..1ea11a665 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_add_to_path.cmake @@ -1,27 +1,3 @@ -#[===[ -# vcpkg_add_to_path - -Add a directory or directories to the PATH environment variable - -```cmake -vcpkg_add_to_path([PREPEND] [...]) -``` - -`vcpkg_add_to_path` adds all of the paths passed to it to the PATH environment variable. -If PREPEND is passed, then those paths are prepended to the PATH environment variable, -so that they are searched first; otherwise, those paths are appended, so they are -searched after the paths which are already in the environment variable. - -The paths are added in the order received, so that the first path is always searched -before a later path. - -If no paths are passed, then nothing will be done. - -## Examples: -* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) -* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) -* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) -#]===] function(vcpkg_add_to_path) cmake_parse_arguments(PARSE_ARGV 0 "arg" "PREPEND" "" "") if(arg_PREPEND) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake index dae9e6018..1a3756ec5 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_apply_patches.cmake @@ -1,19 +1,3 @@ -# DEPRECATED: in favor of the `PATCHES` argument to [`vcpkg_from_github()`](vcpkg_from_github.md) et al. - -#[===[.md -# vcpkg_apply_patches - -Apply a set of patches to a source tree. - -```cmake -vcpkg_apply_patches( - SOURCE_PATH <${SOURCE_PATH}> - [QUIET] - PATCHES ... -) -``` -#]===] - function(vcpkg_apply_patches) z_vcpkg_deprecation_message("vcpkg_apply_patches has been deprecated in favor of the `PATCHES` argument to `vcpkg_from_*`.") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake index d7eb5f383..63220f434 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_backup_restore_env_vars.cmake @@ -1,27 +1,3 @@ -#[===[.md: -# vcpkg_backup_restore_env_vars - -Backup or restore the environment variables - -## Usage: -```cmake -vcpkg_backup_env_variables(VARS [...]) -vcpkg_restore_env_variables(VARS [...]) -``` - -### VARS -The variables to back up or restore. -These are placed in the parent scope, so you must backup and restore -from the same scope. - -## Notes -One must always call `vcpkg_backup_env_variables` before -`vcpkg_restore_env_variables`; however, `vcpkg_restore_env_variables` -does not change the back up variables, and so you may call `restore` -multiple times for one `backup`. - -#]===] - function(vcpkg_backup_env_variables) cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "VARS") if(NOT DEFINED arg_VARS) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake index b3015ae29..592f6508e 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_cmake.cmake @@ -1,38 +1,3 @@ -# DEPRECATED BY ports/vcpkg-cmake/vcpkg_cmake_build -#[===[.md: -# vcpkg_build_cmake - -Build a cmake project. - -## Usage: -```cmake -vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET ]) -``` - -## Parameters: -### DISABLE_PARALLEL -The underlying buildsystem will be instructed to not parallelize - -### TARGET -The target passed to the cmake build command (`cmake --build . --target `). If not specified, no target will -be passed. - -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs. - -## Notes: -This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). -You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the -"install" target - -## Examples: - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) -#]===] - function(vcpkg_build_cmake) cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_PARALLEL;ADD_BIN_TO_PATH" @@ -64,6 +29,13 @@ function(vcpkg_build_cmake) vcpkg_list(SET parallel_param "/m") elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + vcpkg_list(SET build_args "VERBOSE=1") + vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_args -jobs 1) else() message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") endif() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake old mode 100755 new mode 100644 index dd5b061ee..11e4072cc --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_make.cmake @@ -1,58 +1,3 @@ -#[===[.md: -# vcpkg_build_make - -Build a linux makefile project. - -## Usage: -```cmake -vcpkg_build_make([BUILD_TARGET ] - [INSTALL_TARGET ] - [ADD_BIN_TO_PATH] - [ENABLE_INSTALL] - [MAKEFILE ] - [LOGFILE_ROOT ] - [DISABLE_PARALLEL] - [SUBPATH ]) -``` - -### BUILD_TARGET -The target passed to the make build command (`./make `). If not specified, the 'all' target will -be passed. - -### INSTALL_TARGET -The target passed to the make build command (`./make `) if `ENABLE_INSTALL` is used. Defaults to 'install'. - -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. - -### ENABLE_INSTALL -IF the port supports the install target use vcpkg_install_make() instead of vcpkg_build_make() - -### MAKEFILE -Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_configure_make()` - -### LOGFILE_ROOT -Specifies a log file prefix. - -### DISABLE_PARALLEL -The underlying buildsystem will be instructed to not parallelize - -### SUBPATH -Additional subdir to invoke make in. Useful if only parts of a port should be built. - -## Notes: -This command should be preceded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md). -You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function if your makefile supports the -"install" target - -## Examples - -* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) -#]===] - function(vcpkg_build_make) z_vcpkg_get_cmake_vars(cmake_vars_file) include("${cmake_vars_file}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake index 831887dc2..90fb313c9 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_msbuild.cmake @@ -1,67 +1,3 @@ -#[===[.md: -# vcpkg_build_msbuild - -Build a msbuild-based project. Deprecated in favor of `vcpkg_install_msbuild()`. - -## Usage -```cmake -vcpkg_build_msbuild( - PROJECT_PATH <${SOURCE_PATH}/port.sln> - [RELEASE_CONFIGURATION ] - [DEBUG_CONFIGURATION ] - [TARGET ] - [TARGET_PLATFORM_VERSION <10.0.15063.0>] - [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] - [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] - [OPTIONS ...] - [OPTIONS_RELEASE ...] - [OPTIONS_DEBUG ...] - [USE_VCPKG_INTEGRATION] -) -``` - -## Parameters -### USE_VCPKG_INTEGRATION -Apply the normal `integrate install` integration for building the project. - -By default, projects built with this command will not automatically link libraries or have header paths set. - -### PROJECT_PATH -The path to the solution (`.sln`) or project (`.vcxproj`) file. - -### RELEASE_CONFIGURATION -The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. - -### DEBUG_CONFIGURATION -The configuration (``/p:Configuration`` msbuild parameter) -used for Debug builds. - -### TARGET_PLATFORM_VERSION -The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) - -### TARGET -The MSBuild target to build. (``/t:``) - -### PLATFORM -The platform (``/p:Platform`` msbuild parameter) used for the build. - -### PLATFORM_TOOLSET -The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. - -### OPTIONS -Additional options passed to msbuild for all builds. - -### OPTIONS_RELEASE -Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. - -## Examples - -* [chakracore](https://github.com/Microsoft/vcpkg/blob/master/ports/chakracore/portfile.cmake) -#]===] - function(vcpkg_build_msbuild) cmake_parse_arguments( PARSE_ARGV 0 diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake index 5a0a1755f..a06f35024 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_ninja.cmake @@ -1,20 +1,3 @@ -#[===[.md: -# vcpkg_build_ninja - -Build a ninja project - -## Usage: -```cmake -vcpkg_build_ninja( - [TARGETS ...] -) -``` - -## Parameters: -### TARGETS -Only build the specified targets. -#]===] - function(z_vcpkg_build_ninja_build config targets) message(STATUS "Building (${config})...") vcpkg_execute_build_process( diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake index 282e04f5f..d73551e77 100755 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_nmake.cmake @@ -1,73 +1,3 @@ -#[===[.md: -# vcpkg_build_nmake - -Build a msvc makefile project. - -## Usage: -```cmake -vcpkg_build_nmake( - SOURCE_PATH <${SOURCE_PATH}> - [NO_DEBUG] - [ENABLE_INSTALL] - [TARGET ] - [PROJECT_SUBPATH <${SUBPATH}>] - [PROJECT_NAME <${MAKEFILE_NAME}>] - [PRERUN_SHELL <${SHELL_PATH}>] - [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] - [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] - [OPTIONS_RELEASE <-DOPTIMIZE=1>...] - [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [TARGET ]) -``` - -## Parameters -### SOURCE_PATH -Specifies the directory containing the source files. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### PROJECT_SUBPATH -Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. - -### PROJECT_NAME -Specifies the name of msvc makefile name. -Default is `makefile.vc` - -### ENABLE_INSTALL -Install binaries after build. - -### PRERUN_SHELL -Script that needs to be called before build - -### PRERUN_SHELL_DEBUG -Script that needs to be called before debug build - -### PRERUN_SHELL_RELEASE -Script that needs to be called before release build - -### OPTIONS -Additional options passed to generate during the generation. - -### OPTIONS_RELEASE -Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. - -### TARGET -The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will -be passed. - -## Notes: -You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the -"install" target - -## Examples - -* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -#]===] - function(vcpkg_build_nmake) cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH;ENABLE_INSTALL;NO_DEBUG" @@ -105,10 +35,9 @@ function(vcpkg_build_nmake) find_program(NMAKE nmake REQUIRED) get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) # Load toolchains - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") # Set needed env set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") @@ -127,7 +56,7 @@ function(vcpkg_build_nmake) set(project_subpath "") endif() - vcpkg_backup_env_variables(VARS CL) + vcpkg_backup_env_variables(VARS CL LINK) cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native) foreach(build_type IN ITEMS debug release) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL build_type) @@ -140,7 +69,8 @@ function(vcpkg_build_nmake) vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}\\debug") endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) - set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + set(ENV{_CL_} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + set(ENV{_LINK_} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") set(prerun_variable_name arg_PRERUN_SHELL_DEBUG) else() @@ -152,7 +82,8 @@ function(vcpkg_build_nmake) endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) - set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(ENV{_CL_} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + set(ENV{_LINK_} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") set(prerun_variable_name arg_PRERUN_SHELL_RELEASE) endif() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake index eea3b822c..39aca2629 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_build_qmake.cmake @@ -1,13 +1,3 @@ -#[===[.md: -# vcpkg_build_qmake - -Build a qmake-based project, previously configured using vcpkg_configure_qmake. - -```cmake -vcpkg_build_qmake() -``` -#]===] - function(z_run_jom_build invoke_command targets log_prefix log_suffix) message(STATUS "Package ${log_prefix}-${TARGET_TRIPLET}-${log_suffix}") vcpkg_execute_build_process( @@ -48,8 +38,6 @@ function(vcpkg_build_qmake) set(invoke_command "${MAKE}") endif() - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) - if(NOT DEFINED arg_BUILD_LOGNAME) set(arg_BUILD_LOGNAME build) endif() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake index 7b4032e7c..bb7d6844d 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_buildpath_length_warning.cmake @@ -1,17 +1,3 @@ -#[===[.md: -# vcpkg_buildpath_length_warning - -Warns the user if their vcpkg installation path might be too long for the package they're installing. - -```cmake -vcpkg_buildpath_length_warning() -``` - -`vcpkg_buildpath_length_warning` warns the user if the number of bytes in the -path to `buildtrees` is bigger than `N`. Note that this is simply a warning, -and isn't relied on for correctness. -#]===] - function(vcpkg_buildpath_length_warning warning_length) string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake index 5f4c5339b..d0573d77a 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_check_features.cmake @@ -1,137 +1,3 @@ -#[===[.md: -# vcpkg_check_features -Check if one or more features are a part of a package installation. - -```cmake -vcpkg_check_features( - OUT_FEATURE_OPTIONS - [PREFIX ] - [FEATURES - [ ]... - ] - [INVERTED_FEATURES - [ ]... - ] -) -``` - -The `` should be set to `FEATURE_OPTIONS` by convention. - -`vcpkg_check_features()` will: - -- for each `` passed in `FEATURES`: - - if the feature is set, add `-D=ON` to ``, - and set `_` to ON. - - if the feature is not set, add `-D=OFF` to ``, - and set `_` to OFF. -- for each `` passed in `INVERTED_FEATURES`: - - if the feature is set, add `-D=OFF` to ``, - and set `_` to OFF. - - if the feature is not set, add `-D=ON` to ``, - and set `_` to ON. - -If `` is not passed, then the feature vars set are simply ``, -not `_`. - -If `INVERTED_FEATURES` is not passed, then the `FEATURES` keyword is optional. -This behavior is deprecated. - -If the same `` is passed multiple times, -then `vcpkg_check_features` will cause a fatal error, -since that is a bug. - -## Examples - -### Example 1: Regular features - -```cmake -$ ./vcpkg install mimalloc[asm,secure] - -# ports/mimalloc/portfile.cmake -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - asm MI_SEE_ASM - override MI_OVERRIDE - secure MI_SECURE -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - # Expands to "-DMI_SEE_ASM=ON;-DMI_OVERRIDE=OFF;-DMI_SECURE=ON" - ${FEATURE_OPTIONS} -) -``` - -### Example 2: Inverted features - -```cmake -$ ./vcpkg install cpprestsdk[websockets] - -# ports/cpprestsdk/portfile.cmake -vcpkg_check_features( - INVERTED_FEATURES - brotli CPPREST_EXCLUDE_BROTLI - websockets CPPREST_EXCLUDE_WEBSOCKETS -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - # Expands to "-DCPPREST_EXCLUDE_BROTLI=ON;-DCPPREST_EXCLUDE_WEBSOCKETS=OFF" - ${FEATURE_OPTIONS} -) -``` - -### Example 3: Set multiple options for same feature - -```cmake -$ ./vcpkg install pcl[cuda] - -# ports/pcl/portfile.cmake -vcpkg_check_features( - FEATURES - cuda WITH_CUDA - cuda BUILD_CUDA - cuda BUILD_GPU -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - # Expands to "-DWITH_CUDA=ON;-DBUILD_CUDA=ON;-DBUILD_GPU=ON" - ${FEATURE_OPTIONS} -) -``` - -### Example 4: Use regular and inverted features - -```cmake -$ ./vcpkg install rocksdb[tbb] - -# ports/rocksdb/portfile.cmake -vcpkg_check_features( - FEATURES - tbb WITH_TBB - INVERTED_FEATURES - tbb ROCKSDB_IGNORE_PACKAGE_TBB -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - # Expands to "-DWITH_TBB=ON;-DROCKSDB_IGNORE_PACKAGE_TBB=OFF" - ${FEATURE_OPTIONS} -) -``` - -## Examples in portfiles - -* [cpprestsdk](https://github.com/microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [pcl](https://github.com/microsoft/vcpkg/blob/master/ports/pcl/portfile.cmake) -* [rocksdb](https://github.com/microsoft/vcpkg/blob/master/ports/rocksdb/portfile.cmake) -#]===] - function(z_vcpkg_check_features_last_feature out_var features_name features_list) list(LENGTH features_list features_length) math(EXPR features_length_mod_2 "${features_length} % 2") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake index f2e9fe10a..63242932d 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_check_linkage.cmake @@ -1,39 +1,3 @@ -#[===[.md: -# vcpkg_check_linkage - -Asserts the available library and CRT linkage options for the port. - -## Usage -```cmake -vcpkg_check_linkage( - [ONLY_STATIC_LIBRARY | ONLY_DYNAMIC_LIBRARY] - [ONLY_STATIC_CRT | ONLY_DYNAMIC_CRT] -) -``` - -## Parameters -### ONLY_STATIC_LIBRARY -Indicates that this port can only be built with static library linkage. - -Note: If the user requested a dynamic build ONLY_STATIC_LIBRARY will result in a note being printed, not a fatal error. - -### ONLY_DYNAMIC_LIBRARY -Indicates that this port can only be built with dynamic/shared library linkage. - -### ONLY_STATIC_CRT -Indicates that this port can only be built with static CRT linkage. - -### ONLY_DYNAMIC_CRT -Indicates that this port can only be built with dynamic/shared CRT linkage. - -## Notes -This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, depending on what was requested by the user versus what the library supports. - -## Examples - -* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) -#]===] - function(vcpkg_check_linkage) cmake_parse_arguments(PARSE_ARGV 0 arg "ONLY_STATIC_LIBRARY;ONLY_DYNAMIC_LIBRARY;ONLY_DYNAMIC_CRT;ONLY_STATIC_CRT" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake index e1cea3a95..35cf8a6a3 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_clean_executables_in_bin.cmake @@ -1,26 +1,3 @@ -#[===[.md: -# vcpkg_clean_executables_in_bin - -Remove specified executables found in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. If, after all specified executables have been removed, and the `bin` and `debug/bin` directories are empty, then also delete `bin` and `debug/bin` directories. - -## Usage -```cmake -vcpkg_clean_executables_in_bin( - FILE_NAMES ... -) -``` - -## Parameters -### FILE_NAMES -A list of executable filenames without extension. - -## Notes -Generally, there is no need to call this function manually. Instead, pass an extra `AUTO_CLEAN` argument when calling `vcpkg_copy_tools`. - -## Examples -* [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake) -#]===] - function(z_vcpkg_clean_executables_in_bin_remove_directory_if_empty directory) if(NOT EXISTS "${directory}") return() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake index 068208fb8..904f40ae8 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_clean_msbuild.cmake @@ -1,18 +1,3 @@ -#[===[.md: -# vcpkg_clean_msbuild - -Clean intermediate files generated by `vcpkg_install_msbuild()`. - -## Usage -```cmake -vcpkg_clean_msbuild() -``` - -## Examples - -* [python3](https://github.com/Microsoft/vcpkg/blob/master/ports/python3/portfile.cmake) -#]===] - function(vcpkg_clean_msbuild) if(NOT ARGC EQUAL 0) message(WARNING "vcpkg_clean_msbuild was passed extra arguments: ${ARGV}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake index 40c8183f1..58730a897 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_common_definitions.cmake @@ -1,37 +1,3 @@ -#[===[.md: -# vcpkg_common_definitions - -This file defines the following variables which are commonly needed or used in portfiles: - -```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if -VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if -VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") -VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host -VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target -VCPKG_HOST_BUNDLE_SUFFIX bundle suffix of the host -VCPKG_TARGET_BUNDLE_SUFFIX bundle suffix of the target -VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) -VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) -VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) -VCPKG_TARGET_SHARED_LIBRARY_SUFFIX shared library suffix for target (same as CMAKE_SHARED_LIBRARY_SUFFIX) -VCPKG_TARGET_IMPORT_LIBRARY_PREFIX import library prefix for target (same as CMAKE_IMPORT_LIBRARY_PREFIX) -VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX import library suffix for target (same as CMAKE_IMPORT_LIBRARY_SUFFIX) -VCPKG_FIND_LIBRARY_PREFIXES target dependent prefixes used for find_library calls in portfiles -VCPKG_FIND_LIBRARY_SUFFIXES target dependent suffixes used for find_library calls in portfiles -VCPKG_SYSTEM_LIBRARIES list of libraries are provide by the toolchain and are not managed by vcpkg -TARGET_TRIPLET the name of the current triplet to build for -CURRENT_INSTALLED_DIR the absolute path to the installed files for the current triplet -HOST_TRIPLET the name of the triplet corresponding to the host -CURRENT_HOST_INSTALLED_DIR the absolute path to the installed files for the host triplet -VCPKG_CROSSCOMPILING Whether vcpkg is cross-compiling: in other words, whether TARGET_TRIPLET and HOST_TRIPLET are different -``` - -CMAKE_STATIC_LIBRARY_(PREFIX|SUFFIX), CMAKE_SHARED_LIBRARY_(PREFIX|SUFFIX) and CMAKE_IMPORT_LIBRARY_(PREFIX|SUFFIX) are defined for the target -Furthermore the variables CMAKE_FIND_LIBRARY_(PREFIXES|SUFFIXES) are also defined for the target so that -portfiles are able to use find_library calls to discover dependent libraries within the current triplet for ports. -#]===] - string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILING) #Helper variable to identify the Target system. VCPKG_TARGET_IS_ if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "") @@ -54,6 +20,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") set(VCPKG_TARGET_IS_WINDOWS ON) set(VCPKG_TARGET_IS_MINGW ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + set(VCPKG_TARGET_IS_EMSCRIPTEN ON) endif() #Helper variables to identify the host system name @@ -97,7 +65,7 @@ else() set(VCPKG_HOST_BUNDLE_SUFFIX "") endif() -if(VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(VCPKG_TARGET_BUNDLE_SUFFIX ".app") else() set(VCPKG_TARGET_BUNDLE_SUFFIX "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake index 7f139a4b9..7c642d25c 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_cmake.cmake @@ -1,87 +1,3 @@ -# DEPRECATED BY ports/vcpkg-cmake/vcpkg_cmake_configure -#[===[.md: -# vcpkg_configure_cmake - -Configure CMake for Debug and Release builds of a project. - -## Usage -```cmake -vcpkg_configure_cmake( - SOURCE_PATH <${SOURCE_PATH}> - [PREFER_NINJA] - [DISABLE_PARALLEL_CONFIGURE] - [NO_CHARSET_FLAG] - [GENERATOR <"NMake Makefiles">] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] - [OPTIONS_RELEASE <-DOPTIMIZE=1>...] - [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [MAYBE_UNUSED_VARIABLES ...] -) -``` - -## Parameters -### SOURCE_PATH -Specifies the directory containing the `CMakeLists.txt`. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### PREFER_NINJA -Indicates that, when available, Vcpkg should use Ninja to perform the build. -This should be specified unless the port is known to not work under Ninja. - -### DISABLE_PARALLEL_CONFIGURE -Disables running the CMake configure step in parallel. -This is needed for libraries which write back into their source directory during configure. - -This also disables CMAKE_DISABLE_SOURCE_CHANGES. - -### NO_CHARSET_FLAG -Disables passing `utf-8` as the default character set to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`. - -This is needed for libraries that set their own source code's character set. - -### GENERATOR -Specifies the precise generator to use. - -This is useful if some project-specific buildsystem has been wrapped in a cmake script that won't perform an actual build. -If used for this purpose, it should be set to `"NMake Makefiles"`. - -### OPTIONS -Additional options passed to CMake during the configuration. - -### OPTIONS_RELEASE -Additional options passed to CMake during the Release configuration. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. - -### MAYBE_UNUSED_VARIABLES -Any CMake variables which are explicitly passed in, but which may not be used on all platforms. -For example: -```cmake -vcpkg_cmake_configure( - ... - OPTIONS - -DBUILD_EXAMPLE=OFF - ... - MAYBE_UNUSED_VARIABLES - BUILD_EXAMPLE -) -``` - -### LOGNAME -Name of the log to write the output of the configure call to. - -## Notes -This command supplies many common arguments to CMake. To see the full list, examine the source. - -## Examples - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) -#]===] - function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2) if(DEFINED "${var1}" AND NOT DEFINED "${var2}") message(FATAL_ERROR "If ${var1} is set, ${var2} must be set.") @@ -91,11 +7,12 @@ function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2) endif() endfunction() function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) - set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") + set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n") + string(APPEND line " process = \"${CMAKE_COMMAND}\" -E chdir \"${whereat}\"") foreach(arg IN LISTS "${build_type}_command") string(APPEND line " \"${arg}\"") endforeach() - set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) + set("${out_var}" "${${out_var}}${line}\n\n" PARENT_SCOPE) endfunction() function(z_vcpkg_get_visual_studio_generator) @@ -110,16 +27,22 @@ function(z_vcpkg_get_visual_studio_generator) if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 12 2013") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 14 2015") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") - set(generator "Visual Studio 15 2017") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") - set(generator "Visual Studio 16 2019") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") - set(generator "Visual Studio 17 2022") + + if(DEFINED ENV{VisualStudioVersion}) + if("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "12.99" AND + "$ENV{VisualStudioVersion}" VERSION_GREATER_EQUAL "12.0" AND + NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "14.99" AND + NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "15.99") + set(generator "Visual Studio 15 2017") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "16.99") + set(generator "Visual Studio 16 2019") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "17.99") + set(generator "Visual Studio 17 2022") + endif() endif() if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") @@ -219,9 +142,6 @@ function(vcpkg_configure_cmake) # Prebuilt ninja binaries are only provided for x64 hosts set(ninja_can_be_used OFF) set(ninja_host OFF) - elseif(VCPKG_TARGET_IS_UWP) - # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility - set(ninja_can_be_used OFF) endif() endif() @@ -235,16 +155,20 @@ function(vcpkg_configure_cmake) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: + ENV{VisualStudioVersion} : $ENV{VisualStudioVersion} platform toolset: ${VCPKG_PLATFORM_TOOLSET} architecture : ${VCPKG_TARGET_ARCHITECTURE}") endif() + if(DEFINED VCPKG_PLATFORM_TOOLSET) + vcpkg_list(APPEND arg_OPTIONS "-T${VCPKG_PLATFORM_TOOLSET}") + endif() endif() # If we use Ninja, make sure it's on PATH if("${generator}" STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() @@ -331,23 +255,39 @@ function(vcpkg_configure_cmake) endif() endforeach() + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}) + endif() + vcpkg_list(SET rel_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" - -DCMAKE_BUILD_TYPE=Release - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}") + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) vcpkg_list(SET dbg_command - "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" - -DCMAKE_BUILD_TYPE=Debug - "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug") + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${NINJA_PATH}") + if(NOT DEFINED ninja_path) + # if ninja_path was defined above, we've already done this + get_filename_component(ninja_path "${NINJA}" DIRECTORY) + vcpkg_add_to_path("${ninja_path}") + endif() #parallelize the configure step set(ninja_configure_contents @@ -368,9 +308,10 @@ function(vcpkg_configure_cmake) message(STATUS "${configuring_message}") vcpkg_execute_required_process( - COMMAND ninja -v + COMMAND "${NINJA}" -v WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" LOGNAME "${arg_LOGNAME}" + SAVE_LOG_FILES ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt ../CMakeCache.txt ) vcpkg_list(APPEND config_logs @@ -384,6 +325,7 @@ function(vcpkg_configure_cmake) COMMAND ${dbg_command} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME "${arg_LOGNAME}-dbg" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" @@ -397,6 +339,7 @@ function(vcpkg_configure_cmake) COMMAND ${rel_command} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME "${arg_LOGNAME}-rel" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake index cdd4c313a..336354646 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_gn.cmake @@ -1,34 +1,3 @@ -# DEPRECATED BY ports/vcpkg-gn/vcpkg_gn_configure -#[===[.md: -# vcpkg_configure_gn - -Generate Ninja (GN) targets - -## Usage: -```cmake -vcpkg_configure_gn( - SOURCE_PATH - [OPTIONS ] - [OPTIONS_DEBUG ] - [OPTIONS_RELEASE ] -) -``` - -## Parameters: -### SOURCE_PATH (required) -The path to the GN project. - -### OPTIONS -Options to be passed to both the debug and release targets. -Note: Must be provided as a space-separated string. - -### OPTIONS_DEBUG (space-separated string) -Options to be passed to the debug target. - -### OPTIONS_RELEASE (space-separated string) -Options to be passed to the release target. -#]===] - function(z_vcpkg_configure_gn_generate) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;CONFIG;ARGS" "") if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -56,9 +25,9 @@ function(vcpkg_configure_gn) message(FATAL_ERROR "SOURCE_PATH must be specified.") endif() - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) - vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") vcpkg_find_acquire_program(GN) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake index 3e9c43787..c5d64a082 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_make.cmake @@ -1,94 +1,3 @@ -#[===[.md: -# vcpkg_configure_make - -Configure configure for Debug and Release builds of a project. - -## Usage -```cmake -vcpkg_configure_make( - SOURCE_PATH <${SOURCE_PATH}> - [AUTOCONFIG] - [USE_WRAPPERS] - [DETERMINE_BUILD_TRIPLET] - [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] - [NO_ADDITIONAL_PATHS] - [CONFIG_DEPENDENT_ENVIRONMENT ...] - [CONFIGURE_ENVIRONMENT_VARIABLES ...] - [ADD_BIN_TO_PATH] - [NO_DEBUG] - [SKIP_CONFIGURE] - [PROJECT_SUBPATH <${PROJ_SUBPATH}>] - [PRERUN_SHELL <${SHELL_PATH}>] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] - [OPTIONS_RELEASE <-DOPTIMIZE=1>...] - [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -) -``` - -## Parameters -### SOURCE_PATH -Specifies the directory containing the `configure`/`configure.ac`. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### PROJECT_SUBPATH -Specifies the directory containing the ``configure`/`configure.ac`. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### SKIP_CONFIGURE -Skip configure process - -### USE_WRAPPERS -Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) - -### BUILD_TRIPLET -Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET - -### DETERMINE_BUILD_TRIPLET -For ports having a configure script following the autotools rules for selecting the triplet - -### NO_ADDITIONAL_PATHS -Don't pass any additional paths except for --prefix to the configure call - -### AUTOCONFIG -Need to use autoconfig to generate configure file. - -### PRERUN_SHELL -Script that needs to be called before configuration (do not use for batch files which simply call autoconf or configure) - -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs. - -## DISABLE_VERBOSE_FLAGS -do not pass '--disable-silent-rules --verbose' to configure - -### OPTIONS -Additional options passed to configure during the configuration. - -### OPTIONS_RELEASE -Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`. - -### CONFIG_DEPENDENT_ENVIRONMENT -List of additional configuration dependent environment variables to set. -Pass SOMEVAR to set the environment and have SOMEVAR_(DEBUG|RELEASE) set in the portfile to the appropriate values -General environment variables can be set from within the portfile itself. - -### CONFIGURE_ENVIRONMENT_VARIABLES -List of additional environment variables to pass via the configure call. - -## Notes -This command supplies many common arguments to configure. To see the full list, examine the source. - -## Examples - -* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) -#]===] - macro(z_vcpkg_determine_host_mingw out_var) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(host_arch $ENV{PROCESSOR_ARCHITEW6432}) @@ -208,19 +117,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval) endif() endmacro() -# Setup include environment (since these are buildtype independent restoring them is unnecessary) -macro(z_prepend_include_path var) - unset(ENV{${var}}) - if(NOT DEFINED z_vcpkg_env_backup_${var} OR "${z_vcpkg_env_backup_${var}}" STREQUAL "") - vcpkg_host_path_list(APPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") - else() - foreach (one_bk IN ITEMS ${z_vcpkg_env_backup_${var}}) - vcpkg_host_path_list(PREPEND ENV{${var}} "${one_bk}") - endforeach() - vcpkg_host_path_list(PREPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") - endif() -endmacro() - macro(z_convert_to_list input output) string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}") endmacro() @@ -228,7 +124,7 @@ endmacro() function(vcpkg_configure_make) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 arg - "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" + "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;NO_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) @@ -237,9 +133,14 @@ function(vcpkg_configure_make) message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() + if(arg_USE_WRAPPERS AND arg_NO_WRAPPERS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed conflicting options USE_WRAPPERS and NO_WRAPPERS. Please remove one of them!") + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") + if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling endif() @@ -248,12 +149,9 @@ function(vcpkg_configure_make) set(requires_autogen OFF) # use autogen.sh set(requires_autoconfig OFF) # use autotools and configure.ac - if(EXISTS "${src_dir}/configure" AND "${src_dir}/configure.ac") # remove configure; rerun autoconf - if(NOT VCPKG_MAINTAINER_SKIP_AUTOCONFIG) # If fixing bugs skipping autoconfig saves a lot of time - set(requires_autoconfig ON) - file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts - set(arg_AUTOCONFIG ON) - endif() + if(EXISTS "${src_dir}/configure" AND EXISTS "${src_dir}/configure.ac" AND arg_AUTOCONFIG) # remove configure; rerun autoconf + set(requires_autoconfig ON) + file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig set(requires_autoconfig ON) @@ -278,10 +176,13 @@ function(vcpkg_configure_make) else() set(arg_USE_WRAPPERS OFF) endif() + if(arg_NO_WRAPPERS) + set(arg_USE_WRAPPERS OFF) + endif() # Backup environment variables # CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y - set(cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) + set(cm_FLAGS AR AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) list(TRANSFORM cm_FLAGS APPEND "FLAGS") vcpkg_backup_env_variables(VARS ${cm_FLAGS}) @@ -307,7 +208,7 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (VCPKG_TARGET_IS_WINDOWS) if(CMAKE_HOST_WIN32) - list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) + list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) endif() if (arg_DETERMINE_BUILD_TRIPLET OR NOT arg_BUILD_TRIPLET) @@ -332,15 +233,43 @@ function(vcpkg_configure_make) debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") endif() if(CMAKE_HOST_WIN32) - set(append_env) + vcpkg_list(SET add_to_env) if(arg_USE_WRAPPERS) - set(append_env ";${MSYS_ROOT}/usr/share/automake-1.16") - string(APPEND append_env ";${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + vcpkg_list(APPEND add_to_env "${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + vcpkg_list(APPEND add_to_env "${MSYS_ROOT}/usr/share/automake-1.16") endif() - # This inserts msys before system32 (which masks sort.exe and find.exe) but after MSVC (which avoids masking link.exe) - string(REPLACE ";$ENV{SystemRoot}\\System32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") - string(REPLACE ";$ENV{SystemRoot}\\system32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") - set(ENV{PATH} "${NEWPATH}") + cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path_list NORMALIZE) + cmake_path(CONVERT "$ENV{SystemRoot}" TO_CMAKE_PATH_LIST system_root NORMALIZE) + file(REAL_PATH "${system_root}" system_root) + + message(DEBUG "path_list:${path_list}") # Just to have --trace-expand output + + set(find_system_dirs + "${system_root}/system32" + "${system_root}/System32" + "${system_root}/system32/" + "${system_root}/System32/") + + string(TOUPPER "${find_system_dirs}" find_system_dirs_upper) + + set(index "-1") + foreach(system_dir IN LISTS find_system_dirs find_system_dirs_upper) + list(FIND path_list "${system_dir}" index) + if(NOT index EQUAL "-1") + break() + endif() + endforeach() + + if(index GREATER_EQUAL "0") + vcpkg_list(INSERT path_list "${index}" ${add_to_env} "${MSYS_ROOT}/usr/bin") + else() + message(WARNING "Unable to find system32 dir in the PATH variable! Appending required msys paths!") + vcpkg_list(APPEND path_list ${add_to_env} "${MSYS_ROOT}/usr/bin") + endif() + + cmake_path(CONVERT "${path_list}" TO_NATIVE_PATH_LIST native_path_list) + set(ENV{PATH} "${native_path_list}") + set(bash_executable "${MSYS_ROOT}/usr/bin/bash.exe") endif() @@ -364,7 +293,16 @@ function(vcpkg_configure_make) z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") - z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") @@ -376,7 +314,15 @@ function(vcpkg_configure_make) else() z_vcpkg_append_to_configure_environment(configure_env CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") z_vcpkg_append_to_configure_environment(configure_env CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") - z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() z_vcpkg_append_to_configure_environment(configure_env CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") @@ -438,6 +384,39 @@ function(vcpkg_configure_make) # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() + elseif(NOT VCPKG_TARGET_IS_OSX) + # Because OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++ + function(z_vcpkg_make_set_env envvar cmakevar) + set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}} ${ARGN}") + string(STRIP "${prog}" prog) + if(DEFINED ENV{${envvar}}) + return() + endif() + if(VCPKG_DETECTED_CMAKE_${cmakevar}) + set(ENV{${envvar}} "${prog}") + endif() + endfunction() + z_vcpkg_make_set_env(CC C_COMPILER) + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_make_set_env(CC_FOR_BUILD C_COMPILER) + z_vcpkg_make_set_env(CPP_FOR_BUILD C_COMPILER "-E") + z_vcpkg_make_set_env(CXX_FOR_BUILD C_COMPILER) + else() + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CXX_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() + z_vcpkg_make_set_env(CXX CXX_COMPILER) + z_vcpkg_make_set_env(NM NM) + z_vcpkg_make_set_env(RC RC) + z_vcpkg_make_set_env(WINDRES RC) + z_vcpkg_make_set_env(DLLTOOL DLLTOOL) + z_vcpkg_make_set_env(STRIP STRIP) + z_vcpkg_make_set_env(OBJDUMP OBJDUMP) + z_vcpkg_make_set_env(RANLIB RANLIB) + z_vcpkg_make_set_env(AR AR) + z_vcpkg_make_set_env(LD LINKER) + unset(z_vcpkg_make_set_env) endif() # Some PATH handling for dealing with spaces....some tools will still fail with that! @@ -543,10 +522,10 @@ function(vcpkg_configure_make) endif() # Used by CL - z_prepend_include_path(INCLUDE) + vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # Used by GCC - z_prepend_include_path(C_INCLUDE_PATH) - z_prepend_include_path(CPLUS_INCLUDE_PATH) + vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") + vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include") # Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.) if(VCPKG_TARGET_IS_WINDOWS) @@ -559,12 +538,15 @@ function(vcpkg_configure_make) # IMPORTANT: The only way to pass linker flags through libtool AND the compile wrapper # is to use the CL and LINK environment variables !!! # (This is due to libtool and compiler wrapper using the same set of options to pass those variables around) - string(REPLACE "\\" "/" VCToolsInstallDir "$ENV{VCToolsInstallDir}") + file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" VCToolsInstallDir) + set(_replacement -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "${_replacement}" "" VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") # Can somebody please check if CMake's compiler flags for UWP are correct? - set(ENV{_CL_} "$ENV{_CL_} /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB_ -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE " -ZW:nostdlib") - string(APPEND VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG " -ZW:nostdlib") - set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES} /MANIFEST /DYNAMICBASE /WINMD:NO /APPCONTAINER") + set(ENV{_CL_} "$ENV{_CL_} -FU\"${VCToolsInstallDir}/lib/x86/store/references/platform.winmd\"") + set(ENV{_LINK_} "$ENV{_LINK_} ${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") endif() endif() @@ -607,13 +589,9 @@ function(vcpkg_configure_make) endif() endif() debug_message("ENV{LIBS}:$ENV{LIBS}") - vcpkg_find_acquire_program(PKGCONFIG) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT PKGCONFIG STREQUAL "--static") - set(PKGCONFIG "${PKGCONFIG} --static") # Is this still required or was the PR changing the pc files accordingly merged? - endif() # Run autoconf if necessary - if (arg_AUTOCONFIG OR requires_autoconfig) + if (arg_AUTOCONFIG OR requires_autoconfig AND NOT arg_NO_AUTOCONFIG) find_program(AUTORECONF autoreconf) if(NOT AUTORECONF) message(FATAL_ERROR "${PORT} requires autoconf from the system package manager (example: \"sudo apt-get install autoconf\")") @@ -669,20 +647,17 @@ function(vcpkg_configure_make) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) - set(var_suffix DEBUG) - set(path_suffix_${var_suffix} "/debug") - set(short_name_${var_suffix} "dbg") - list(APPEND all_buildtypes ${var_suffix}) + macro(z_vcpkg_setup_make_linker_flags_vars var_suffix) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") else() # dynamic set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") endif() - z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) - if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + set(ARFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") + set(LDFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES [[cl\.exe$]]) if(NOT vcm_paths_with_spaces) - set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + string(APPEND LDFLAGS_${var_suffix} " -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() if(DEFINED ENV{_LINK_}) set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") @@ -690,7 +665,7 @@ function(vcpkg_configure_make) set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(link_required_dirs) + set(link_required_dirs "") if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() @@ -698,8 +673,40 @@ function(vcpkg_configure_make) set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() string(STRIP "${link_required_dirs}" link_required_dirs) - set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") + if(link_required_dirs) + string(PREPEND LDFLAGS_${var_suffix} "${link_required_dirs} ") + # ARFLAGS doesn't need -L search paths since it just bundles object files + endif() + if(ARFLAGS_${var_suffix}) + # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?) + # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ? + # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE + string(PREPEND ARFLAGS_${var_suffix} "cr ") + endif() + string(STRIP "${LDFLAGS_${var_suffix}}" LDFLAGS_${var_suffix}) + string(STRIP "${ARFLAGS_${var_suffix}}" ARFLAGS_${var_suffix}) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]]) + # Do not touch autotools quirks incoming! + # -Xlinker is repeated three times because: + # - libtool script eats -Xlinker + # - the compile wrapper eats -Xlinker + # - passing through both tools requires 3 -Xlinker; two being eaten in the first script. + # passing only through one script will keep one -Xlinker (done in configure) + # but cl will just ignore those with a warning. (Just like -Xcompiler) + separate_arguments(LDFLAGS_LIST NATIVE_COMMAND "${LDFLAGS_${var_suffix}}") + list(JOIN LDFLAGS_LIST " -Xlinker -Xlinker -Xlinker " LDFLAGS_${var_suffix}) + string(PREPEND LDFLAGS_${var_suffix} "-Xlinker -Xlinker -Xlinker ") + endif() endif() + endmacro() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) + set(var_suffix DEBUG) + set(path_suffix_${var_suffix} "/debug") + set(short_name_${var_suffix} "dbg") + list(APPEND all_buildtypes ${var_suffix}) + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) + z_vcpkg_setup_make_linker_flags_vars(${var_suffix}) unset(var_suffix) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -707,32 +714,8 @@ function(vcpkg_configure_make) set(path_suffix_${var_suffix} "") set(short_name_${var_suffix} "rel") list(APPEND all_buildtypes ${var_suffix}) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") - else() # dynamic - set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") - endif() z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) - if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - if(NOT vcm_paths_with_spaces) - set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") - endif() - if(DEFINED ENV{_LINK_}) - set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") - else() - set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") - endif() - else() - set(link_required_dirs) - if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") - set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") - endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") - set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") - endif() - string(STRIP "${link_required_dirs}" link_required_dirs) - set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") - endif() + z_vcpkg_setup_make_linker_flags_vars(${var_suffix}) unset(var_suffix) endif() @@ -763,13 +746,10 @@ function(vcpkg_configure_make) endif() # Setup PKG_CONFIG_PATH - set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/pkgconfig") - set(pkgconfig_installed_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig") - if(ENV{PKG_CONFIG_PATH}) - set(backup_env_pkg_config_path_${current_buildtype} $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + if ("${current_buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") else() - set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") endif() # Setup environment @@ -778,7 +758,10 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${current_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${current_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${current_buildtype}}") - + if(ARFLAGS_${current_buildtype} AND NOT (arg_USE_WRAPPERS AND VCPKG_TARGET_IS_WINDOWS)) + # Target windows with wrappers enabled cannot forward ARFLAGS since it breaks the wrapper + set(ENV{ARFLAGS} "${ARFLAGS_${current_buildtype}}") + endif() # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker, # and libtool tries to avoid versioning for shared libraries and no symbolic links are created. @@ -790,7 +773,6 @@ function(vcpkg_configure_make) set(link_config_backup "$ENV{_LINK_}") set(ENV{_LINK_} "${LINK_ENV_${current_buildtype}}") endif() - set(ENV{PKG_CONFIG} "${PKGCONFIG}") vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH) # LD_LIBRARY_PATH) foreach(lib_env_var IN LISTS lib_env_vars) @@ -816,6 +798,7 @@ function(vcpkg_configure_make) COMMAND ${command} WORKING_DIRECTORY "${target_dir}" LOGNAME "config-${TARGET_TRIPLET}-${short_name_${current_buildtype}}" + SAVE_LOG_FILES config.log ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE libtool_files "${target_dir}*/libtool") @@ -825,18 +808,8 @@ function(vcpkg_configure_make) file(WRITE "${lt_file}" "${_contents}") endforeach() endif() - - if(EXISTS "${target_dir}/config.log") - file(RENAME "${target_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${short_name_${current_buildtype}}.log") - endif() - endif() - - if(backup_env_pkg_config_path_${current_buildtype}) - set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path_${current_buildtype}}") - else() - unset(ENV{PKG_CONFIG_PATH}) endif() - unset(backup_env_pkg_config_path_${current_buildtype}) + z_vcpkg_restore_pkgconfig_path() if(link_config_backup) set(ENV{_LINK_} "${link_config_backup}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake index 2dc8bd206..2115680d8 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,45 +1,3 @@ -#[===[.md: -# vcpkg_configure_meson - -Configure Meson for Debug and Release builds of a project. - -## Usage -```cmake -vcpkg_configure_meson( - SOURCE_PATH <${SOURCE_PATH}> - [NO_PKG_CONFIG] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] - [OPTIONS_RELEASE <-DOPTIMIZE=1>...] - [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -) -``` - -## Parameters -### SOURCE_PATH -Specifies the directory containing the `meson.build`. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### OPTIONS -Additional options passed to Meson during the configuration. - -### OPTIONS_RELEASE -Additional options passed to Meson during the Release configuration. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. - -### NO_PKG_CONFIG -Disable pkg-config setup - -## Notes -This command supplies many common arguments to Meson. To see the full list, examine the source. - -## Examples - -* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) -* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) -#]===] - function(z_vcpkg_append_proglist var_to_append additional_binaries) string(APPEND "${var_to_append}" "[binaries]\n") if(VCPKG_TARGET_IS_WINDOWS) @@ -275,6 +233,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu elseif(MACHINE MATCHES "i386") set(build_cpu_fam x86) set(build_cpu i386) + elseif(MACHINE MATCHES "loongarch64") + set(build_cpu_fam loongarch64) + set(build_cpu loongarch64) else() # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families message(FATAL_ERROR "Unhandled machine: ${MACHINE}") @@ -295,6 +256,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") set(host_cpu_fam arm) set(host_cpu armv7hl) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch64") + set(host_cpu_fam loongarch64) + set(host_cpu loongarch64) else() message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) endif() @@ -306,7 +270,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu string(APPEND cross_file "[host_machine]\n") string(APPEND cross_file "endian = 'little'\n") - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW) + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP) set(meson_system_name "windows") else() string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) @@ -355,6 +319,15 @@ function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbui if(${config_type} STREQUAL "DEBUG") set(crt_type ${crt_type}d) endif() + set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + foreach(libvar IN ITEMS c_winlibs cpp_winlibs) + string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") + string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") + vcpkg_list(REMOVE_ITEM "${libvar}" "") + vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") + string(APPEND cross_${config_type}_log "${libvar} = ['${${libvar}}']\n") + endforeach() string(APPEND cross_${config_type}_log "b_vscrt = '${crt_type}'\n") endif() string(TOLOWER "${config_type}" lowerconfig) @@ -383,6 +356,17 @@ function(vcpkg_configure_meson) vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) + endif() + if(NOT vcpkg_meson_cross_file) z_vcpkg_meson_generate_cross_file("${arg_ADDITIONAL_CROSS_BINARIES}") endif() @@ -438,13 +422,6 @@ function(vcpkg_configure_meson) vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - if(NOT arg_NO_PKG_CONFIG) - vcpkg_find_acquire_program(PKGCONFIG) - get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) - vcpkg_add_to_path("${PKGCONFIG_PATH}") - set(pkgconfig_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") - endif() - set(buildtypes) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(buildname "DEBUG") @@ -466,35 +443,29 @@ function(vcpkg_configure_meson) message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") #setting up PKGCONFIG - vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) if(NOT arg_NO_PKG_CONFIG) - set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? - set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}/${path_suffix_${buildtype}}lib/pkgconfig/") - vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}" "${pkgconfig_share_dir}" "$ENV{PKG_CONFIG_PATH}") + if ("${buildtype}" STREQUAL "DEBUG") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug") + else() + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}") + endif() endif() vcpkg_execute_required_process( COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" LOGNAME config-${TARGET_TRIPLET}-${suffix_${buildtype}} + SAVE_LOG_FILES + meson-logs/meson-log.txt + meson-info/intro-dependencies.json + meson-logs/install-log.txt ) - #Copy meson log files into buildtree for CI - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.log") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/intro-dependencies.json" "${CURRENT_BUILDTREES_DIR}/intro-dependencies-${suffix_${buildtype}}.log") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.log") - endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") - vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + if(NOT arg_NO_PKG_CONFIG) + z_vcpkg_restore_pkgconfig_path() + endif() endforeach() vcpkg_restore_env_variables(VARS INCLUDE) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake index 0bed7567e..86678d296 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_configure_qmake.cmake @@ -1,30 +1,3 @@ -#[===[.md: -# vcpkg_configure_qmake - -Configure a qmake-based project. - -```cmake -vcpkg_configure_qmake( - SOURCE_PATH - [OPTIONS arg1 [arg2 ...]] - [OPTIONS_RELEASE arg1 [arg2 ...]] - [OPTIONS_DEBUG arg1 [arg2 ...]] - [BUILD_OPTIONS arg1 [arg2 ...]] - [BUILD_OPTIONS_RELEASE arg1 [arg2 ...]] - [BUILD_OPTIONS_DEBUG arg1 [arg2 ...]] -) -``` - -### SOURCE_PATH -The path to the *.pro qmake project file. - -### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG -The options passed to qmake to the configure step. - -### BUILD\_OPTIONS, BUILD\_OPTIONS\_RELEASE, BUILD\_OPTIONS\_DEBUG -The options passed to qmake to the build step. -#]===] - function(vcpkg_configure_qmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 arg @@ -40,6 +13,52 @@ function(vcpkg_configure_qmake) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") + + function(qmake_append_program var qmake_var value) + get_filename_component(prog "${value}" NAME) + # QMake assumes everything is on PATH? + vcpkg_list(APPEND ${var} "${qmake_var}=${prog}") + find_program(${qmake_var} NAMES "${prog}") + cmake_path(COMPARE "${${qmake_var}}" EQUAL "${value}" correct_prog_on_path) + if(NOT correct_prog_on_path AND NOT "${value}" MATCHES "|:") + message(FATAL_ERROR "Detect path mismatch for '${qmake_var}'. '${value}' is not the same as '${${qmake_var}}'. Please correct your PATH!") + endif() + unset(${qmake_var}) + unset(${qmake_var} CACHE) + set(${var} "${${var}}" PARENT_SCOPE) + endfunction() + # Setup Build tools + set(qmake_build_tools "") + qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_AR" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_RANLIB" "${VCPKG_DETECTED_CMAKE_RANLIB}") + qmake_append_program(qmake_build_tools "QMAKE_STRIP" "${VCPKG_DETECTED_CMAKE_STRIP}") + qmake_append_program(qmake_build_tools "QMAKE_NM" "${VCPKG_DETECTED_CMAKE_NM}") + qmake_append_program(qmake_build_tools "QMAKE_RC" "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_MT" "${VCPKG_DETECTED_CMAKE_MT}") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_DETECTED_CMAKE_AR MATCHES "ar$") + vcpkg_list(APPEND qmake_build_tools "QMAKE_AR+=qc") + endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + qmake_append_program(qmake_build_tools "QMAKE_LIB" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_LINKER}") + else() + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_SHLIB" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C_SHLIB" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + endif() + set(qmake_comp_flags "") + macro(qmake_add_flags qmake_var operation flags) + string(STRIP "${flags}" striped_flags) + if(striped_flags) + vcpkg_list(APPEND qmake_comp_flags "${qmake_var}${operation}${striped_flags}") + endif() + endmacro() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_list(APPEND arg_OPTIONS "CONFIG-=shared" "CONFIG*=static") else() @@ -52,22 +71,11 @@ function(vcpkg_configure_qmake) endif() if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) - set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} "${VCPKG_OSX_DEPLOYMENT_TARGET}") endif() - vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) - - vcpkg_find_acquire_program(PKGCONFIG) - set(ENV{PKG_CONFIG} "${PKGCONFIG}") - get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) - vcpkg_add_to_path("${PKGCONFIG_PATH}") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} - "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" - "${CURRENT_INSTALLED_DIR}/share/pkgconfig" - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}" "${CURRENT_PACKAGES_DIR}") set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -79,13 +87,22 @@ function(vcpkg_configure_qmake) message(STATUS "Configuring ${TARGET_TRIPLET}-rel") file(MAKE_DIRECTORY "${current_binary_dir}") + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_DETECTED_CMAKE_RC_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_CFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_CXXFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_DETECTED_CMAKE_MODULE_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LIBFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE}") + vcpkg_list(SET build_opt_param) if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_RELEASE) vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_RELEASE}) endif() vcpkg_execute_required_process( - COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release + COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release ${qmake_build_tools} ${qmake_comp_flags} ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} ${arg_SOURCE_PATH} -qtconf "${current_binary_dir}/qt.conf" ${build_opt_param} @@ -98,15 +115,11 @@ function(vcpkg_configure_qmake) file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") endif() - vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) + z_vcpkg_restore_pkgconfig_path() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} - "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" - "${CURRENT_INSTALLED_DIR}/share/pkgconfig" - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + z_vcpkg_setup_pkgconfig_path(BASE_DIRS "${CURRENT_INSTALLED_DIR}/debug" "${CURRENT_PACKAGES_DIR}/debug") set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -118,12 +131,22 @@ function(vcpkg_configure_qmake) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") file(MAKE_DIRECTORY "${current_binary_dir}") + set(qmake_comp_flags "") + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_DETECTED_CMAKE_RC_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_CFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_CXXFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_DETECTED_CMAKE_MODULE_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LIBFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG}") + vcpkg_list(SET build_opt_param) if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_DEBUG) vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_DEBUG}) endif() vcpkg_execute_required_process( - COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug + COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug ${qmake_build_tools} ${qmake_comp_flags} ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} ${arg_SOURCE_PATH} -qtconf "${current_binary_dir}/qt.conf" ${build_opt_param} @@ -135,6 +158,8 @@ function(vcpkg_configure_qmake) file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") endif() + + z_vcpkg_restore_pkgconfig_path() endif() endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake index 7e5c81e6d..ce26c8d1f 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -1,29 +1,3 @@ -#[===[.md: -# vcpkg_copy_pdbs - -Automatically locate pdbs in the build tree and copy them adjacent to all DLLs. - -```cmake -vcpkg_copy_pdbs( - [BUILD_PATHS ...]) -``` - -The ``s are patterns which will be passed to `file(GLOB_RECURSE)`, -for locating DLLs. It defaults to using: - -- `${CURRENT_PACKAGES_DIR}/bin/*.dll` -- `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll` - -since that is generally where DLLs are located. - -## Notes -This command should always be called by portfiles after they have finished rearranging the binary output. - -## Examples - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -#]===] function(vcpkg_copy_pdbs) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BUILD_PATHS") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index b2c36a8e5..cf3939bac 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -1,24 +1,3 @@ -#[===[.md: -# vcpkg_copy_tool_dependencies - -Copy all DLL dependencies of built tools into the tool folder. - -## Usage -```cmake -vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) -``` -## Parameters -The path to the directory containing the tools. - -## Notes -This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. - -## Examples - -* [glib](https://github.com/Microsoft/vcpkg/blob/master/ports/glib/portfile.cmake) -* [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) -#]===] - function(z_vcpkg_copy_tool_dependencies_search tool_dir path_to_search) if(DEFINED Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT) set(count ${Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT}) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake index a9c19870b..d9b3b9523 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_copy_tools.cmake @@ -1,37 +1,3 @@ -#[===[.md: -# vcpkg_copy_tools - -Copy tools and all their DLL dependencies into the `tools` folder. - -## Usage -```cmake -vcpkg_copy_tools( - TOOL_NAMES ... - [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] - [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] - [AUTO_CLEAN] -) -``` -## Parameters -### TOOL_NAMES -A list of tool filenames without extension. - -### SEARCH_DIR -The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/bin` if omitted. - -### DESTINATION -Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. - -### AUTO_CLEAN -Auto clean the copied executables from `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. - -## Examples - -* [cpuinfo](https://github.com/microsoft/vcpkg/blob/master/ports/cpuinfo/portfile.cmake) -* [nanomsg](https://github.com/microsoft/vcpkg/blob/master/ports/nanomsg/portfile.cmake) -* [uriparser](https://github.com/microsoft/vcpkg/blob/master/ports/uriparser/portfile.cmake) -#]===] - function(vcpkg_copy_tools) cmake_parse_arguments(PARSE_ARGV 0 arg "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake index d9339e059..08ca55deb 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_download_distfile.cmake @@ -1,62 +1,9 @@ -#[===[.md: -# vcpkg_download_distfile - -Download and cache a file needed for this port. - -This helper should always be used instead of CMake's built-in `file(DOWNLOAD)` command. - -## Usage -```cmake -vcpkg_download_distfile( - - URLS ... - FILENAME - SHA512 <5981de...> - [ALWAYS_REDOWNLOAD] -) -``` -## Parameters -### OUT_VARIABLE -This variable will be set to the full path to the downloaded file. This can then immediately be passed in to [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md) for sources. - -### URLS -A list of URLs to be consulted. They will be tried in order until one of the downloaded files successfully matches the SHA512 given. - -### FILENAME -The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. - -### SHA512 -The expected hash for the file. - -If this doesn't match the downloaded version, the build will be terminated with a message describing the mismatch. - -### QUIET -Suppress output on cache hit - -### SKIP_SHA512 -Skip SHA512 hash check for file. - -This switch is only valid when building with the `--head` command line flag. - -### ALWAYS_REDOWNLOAD -Avoid caching; this is a REST call or otherwise unstable. - -Requires `SKIP_SHA512`. - -### HEADERS -A list of headers to append to the download request. This can be used for authentication during a download. - -Headers should be specified as ": ". - -## Notes -The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downloading from GitHub projects. - -## Examples - -* [apr](https://github.com/Microsoft/vcpkg/blob/master/ports/apr/portfile.cmake) -* [fontconfig](https://github.com/Microsoft/vcpkg/blob/master/ports/fontconfig/portfile.cmake) -* [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) -#]===] +function(z_vcpkg_check_hash result file_path sha512) + file(SHA512 "${file_path}" file_hash) + string(TOLOWER "${sha512}" sha512_lower) + string(COMPARE EQUAL "${file_hash}" "${sha512_lower}" hash_match) + set("${result}" "${hash_match}" PARENT_SCOPE) +endfunction() function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 skip_sha512) if(_VCPKG_INTERNAL_NO_HASH_CHECK) @@ -68,9 +15,10 @@ function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 return() endif() - file(SHA512 "${file_path}" file_hash) - string(TOLOWER "${sha512}" sha512_lower) - if(NOT "${file_hash}" STREQUAL "${sha512_lower}") + set(hash_match OFF) + z_vcpkg_check_hash(hash_match "${file_path}" "${sha512}") + + if(NOT hash_match) message(FATAL_ERROR "\nFile does not have expected hash:\n" " File path: [ ${file_path} ]\n" @@ -211,6 +159,22 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") endif() set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + + if(EXISTS "${downloaded_file_path}" AND NOT arg_SKIP_SHA512) + set(hash_match OFF) + z_vcpkg_check_hash(hash_match "${downloaded_file_path}" "${arg_SHA512}") + + if(NOT hash_match) + get_filename_component(filename_component "${arg_FILENAME}" NAME_WE) + get_filename_component(extension_component "${arg_FILENAME}" EXT) + get_filename_component(directory_component "${arg_FILENAME}" DIRECTORY) + + string(SUBSTRING "${arg_SHA512}" 0 8 hash) + set(arg_FILENAME "${directory_component}${filename_component}-${hash}${extension_component}") + set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + endif() + endif() + set(download_file_path_part "${DOWNLOADS}/temp/${arg_FILENAME}") # Works around issue #3399 @@ -220,7 +184,7 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") file(MAKE_DIRECTORY "${DOWNLOADS}/temp") # check if file with same name already exists in downloads - if(EXISTS "${downloaded_file_path}") + if(EXISTS "${downloaded_file_path}" AND NOT arg_ALWAYS_REDOWNLOAD) set(advice_message "The cached file SHA512 doesn't match. The file may have been corrupted.") if(_VCPKG_NO_DOWNLOADS) string(APPEND advice_message " Downloads are disabled please provide a valid file at path ${downloaded_file_path} and retry.") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake index 921196cc2..8f3c9cdcc 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_build_process.cmake @@ -1,39 +1,3 @@ -#[===[.md: -# vcpkg_execute_build_process - -Execute a required build process - -## Usage -```cmake -vcpkg_execute_build_process( - COMMAND [...] - [NO_PARALLEL_COMMAND [...]] - WORKING_DIRECTORY - LOGNAME -) -``` -## Parameters -### COMMAND -The command to be executed, along with its arguments. - -### NO_PARALLEL_COMMAND -Optional parameter which specifies a non-parallel command to attempt if a -failure potentially due to parallelism is detected. - -### WORKING_DIRECTORY -The directory to execute the command in. - -### LOGNAME -The prefix to use for the log files. - -This should be a unique name for different triplets so that the logs don't -conflict when building multiple at once. - -## Examples - -* [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) -#]===] - set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "LINK : fatal error LNK1102:" " fatal error C1060: " @@ -73,6 +37,13 @@ function(vcpkg_execute_build_process) set(log_err "${log_prefix}-err.log") set(all_logs "${log_out}" "${log_err}") + if(X_PORT_PROFILE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + if(DEFINED arg_NO_PARALLEL_COMMAND) + vcpkg_list(PREPEND arg_NO_PARALLEL_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + endif() + execute_process( COMMAND ${arg_COMMAND} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake index bd88f8f5d..2ad1481f8 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_in_download_mode.cmake @@ -1,22 +1,3 @@ -#[===[.md: -# vcpkg_execute_in_download_mode - -Execute a process even in download mode. - -## Usage -```cmake -vcpkg_execute_in_download_mode( - ... -) -``` - -The signature of this function is identical to `execute_process()`. - -See [`execute_process()`] for more details. - -[`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html -#]===] - function(vcpkg_execute_in_download_mode) # this allows us to grab the value of the output variables, but pass through the rest of the arguments cmake_parse_arguments(PARSE_ARGV 0 arg "" "RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE" "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake index cc18c4102..0147b3643 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process.cmake @@ -1,57 +1,8 @@ -#[===[.md: -# vcpkg_execute_required_process - -Execute a process with logging and fail the build if the command fails. - -## Usage -```cmake -vcpkg_execute_required_process( - COMMAND <${PERL}> [...] - WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg> - LOGNAME - [TIMEOUT ] - [OUTPUT_VARIABLE ] - [ERROR_VARIABLE ] -) -``` -## Parameters -### ALLOW_IN_DOWNLOAD_MODE -Allows the command to execute in Download Mode. -[See execute_process() override](../../scripts/cmake/execute_process.cmake). - -### COMMAND -The command to be executed, along with its arguments. - -### WORKING_DIRECTORY -The directory to execute the command in. - -### LOGNAME -The prefix to use for the log files. - -### TIMEOUT -Optional timeout after which to terminate the command. - -### OUTPUT_VARIABLE -Optional variable to receive stdout of the command. - -### ERROR_VARIABLE -Optional variable to receive stderr of the command. - -This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. - -## Examples - -* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) -* [boost](https://github.com/Microsoft/vcpkg/blob/master/ports/boost/portfile.cmake) -* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) -#]===] - function(vcpkg_execute_required_process) cmake_parse_arguments(PARSE_ARGV 0 arg "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE" - "COMMAND" + "COMMAND;SAVE_LOG_FILES" ) if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -100,6 +51,10 @@ Halting portfile execution. endif() endif() + if(X_PORT_PROFILE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + vcpkg_execute_in_download_mode( COMMAND ${arg_COMMAND} OUTPUT_FILE "${log_out}" @@ -110,9 +65,22 @@ Halting portfile execution. ${output_variable_param} ${error_variable_param} ) + vcpkg_list(SET saved_logs) + foreach(logfile IN LISTS arg_SAVE_LOG_FILES) + set(filepath "${arg_WORKING_DIRECTORY}/${logfile}") + if(NOT EXISTS "${filepath}") + continue() + endif() + cmake_path(GET filepath FILENAME filename) + if(NOT filename MATCHES "[.]log\$") + string(APPEND filename ".log") + endif() + configure_file("${filepath}" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-${filename}" COPYONLY) + vcpkg_list(APPEND saved_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-${filename}") + endforeach() if(NOT error_code EQUAL 0) set(stringified_logs "") - foreach(log IN ITEMS "${log_out}" "${log_err}") + foreach(log IN LISTS saved_logs ITEMS "${log_out}" "${log_err}") if(NOT EXISTS "${log}") continue() endif() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake index 3ad8d05ce..a13f8fa6e 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_execute_required_process_repeat.cmake @@ -1,20 +1,3 @@ -#[===[.md: -# vcpkg_execute_required_process_repeat - -Execute a process until the command succeeds, or until the COUNT is reached. - -## Usage -```cmake -vcpkg_execute_required_process_repeat( - COMMAND [] - COUNT - WORKING_DIRECTORY - LOGNAME - [ALLOW_IN_DOWNLOAD_MODE] -) -``` -#]===] - function(vcpkg_execute_required_process_repeat) cmake_parse_arguments(PARSE_ARGV 0 arg "ALLOW_IN_DOWNLOAD_MODE" @@ -44,6 +27,10 @@ Halting portfile execution. ]]) endif() + if(X_PORT_PROFILE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) + vcpkg_list(PREPEND arg_COMMAND "${CMAKE_COMMAND}" "-E" "time") + endif() + set(all_logs "") foreach(loop_count RANGE 1 ${arg_COUNT}) set(out_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log") @@ -79,6 +66,6 @@ Halting portfile execution. " Command failed: ${pretty_command}\n" " Working Directory: ${arg_WORKING_DIRECTORY}\n" " See logs for more information:\n" - "${stringifed_logs}" + "${stringified_logs}" ) endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake index e389d7a12..f1ecb44e2 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -1,87 +1,3 @@ -#[===[.md: -# vcpkg_extract_source_archive - -Extract an archive into the source directory. - -## Usage -There are two "overloads" of this function. The first is deprecated: - -```cmake -vcpkg_extract_source_archive(<${ARCHIVE}> [<${TARGET_DIRECTORY}>]) -``` - -This overload should not be used. - -The latter is suggested to use for all future `vcpkg_extract_source_archive`s. - -```cmake -vcpkg_extract_source_archive( - ARCHIVE - [NO_REMOVE_ONE_LEVEL] - [SKIP_PATCH_CHECK] - [PATCHES ...] - [SOURCE_BASE ] - [BASE_DIRECTORY | WORKING_DIRECTORY ] -) -``` - -`vcpkg_extract_source_archive` takes an archive and extracts it. -It replaces existing uses of `vcpkg_extract_source_archive_ex`. -The simplest use of it is: - -```cmake -vcpkg_download_distfile(archive ...) -vcpkg_extract_source_archive(source_path ARCHIVE "${archive}") -``` - -The general expectation is that an archives are laid out with a base directory, -and all the actual files underneath that directory; in other words, if you -extract the archive, you'll get something that looks like: - -``` -zlib-1.2.11/ - doc/ - ... - examples/ - ... - ChangeLog - CMakeLists.txt - README - zlib.h - ... -``` - -`vcpkg_extract_source_archive` automatically removes this directory, -and gives you the items under it directly. However, this only works -when there is exactly one item in the top level of an archive. -Otherwise, you'll have to pass the `NO_REMOVE_ONE_LEVEL` argument to -prevent `vcpkg_extract_source_archive` from performing this transformation. - -If the source needs to be patched in some way, the `PATCHES` argument -allows one to do this, just like other `vcpkg_from_*` functions. -Additionally, the `SKIP_PATCH_CHECK` is provided for `--head` mode - -this allows patches to fail to apply silently. -This argument should _only_ be used when installing a `--head` library, -since otherwise we want a patch failing to appply to be a hard error. - -`vcpkg_extract_source_archive` extracts the files to -`${CURRENT_BUILDTREES_DIR}//-.clean`. -When in editable mode, no `.clean` is appended, -to allow for a user to modify the sources. -`base-directory` defaults to `src`, -and `source-base` defaults to the stem of ``. -You can change these via the `BASE_DIRECTORY` and `SOURCE_BASE` arguments -respectively. -If you need to extract to a location that is not based in `CURRENT_BUILDTREES_DIR`, -you can use the `WORKING_DIRECTORY` argument to do the same. - -## Examples - -* [libraw](https://github.com/Microsoft/vcpkg/blob/master/ports/libraw/portfile.cmake) -* [protobuf](https://github.com/Microsoft/vcpkg/blob/master/ports/protobuf/portfile.cmake) -* [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) -#]===] - function(z_vcpkg_extract_source_archive_deprecated_mode archive working_directory) cmake_path(GET archive FILENAME archive_filename) if(NOT EXISTS "${working_directory}/${archive_filename}.extracted") @@ -218,6 +134,8 @@ function(vcpkg_extract_source_archive) cmake_path(SET temp_source_path "${temp_dir}") else() file(GLOB archive_directory "${temp_dir}/*") + # Exclude .DS_Store entries created by the finder on macOS + list(FILTER archive_directory EXCLUDE REGEX ".*/.DS_Store$") # make sure `archive_directory` is only a single file if(NOT archive_directory MATCHES ";" AND IS_DIRECTORY "${archive_directory}") cmake_path(SET temp_source_path "${archive_directory}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake index fb48c799d..b279708bd 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_extract_source_archive_ex.cmake @@ -1,27 +1,3 @@ -#[===[.md: -# vcpkg_extract_source_archive_ex - -Extract an archive into the source directory. -Originally replaced [`vcpkg_extract_source_archive()`], -but new ports should instead use the second overload of -[`vcpkg_extract_source_archive()`]. - -## Usage -```cmake -vcpkg_extract_source_archive_ex( - [OUT_SOURCE_PATH ] - ... -) -``` - -See the documentation for [`vcpkg_extract_source_archive()`] for other parameters. -Additionally, `vcpkg_extract_source_archive_ex()` adds the `REF` and `WORKING_DIRECTORY` -parameters, which are wrappers around `SOURCE_BASE` and `BASE_DIRECTORY` -respectively. - -[`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md -#]===] - function(vcpkg_extract_source_archive_ex) # OUT_SOURCE_PATH is an out-parameter so we need to parse it cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_SOURCE_PATH" "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake index 4b760e9a0..a5cb105f9 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_fail_port_install.cmake @@ -1,46 +1,3 @@ -# DEPRECATED: in favor of the `supports` field in [`manifest file`](manifest-files.md#supports) et al. - -#[===[.md: -# vcpkg_fail_port_install - -Checks common requirements and fails the current portfile with a (default) error message - -## Usage -```cmake -vcpkg_fail_port_install( - [ALWAYS] - [MESSAGE <"Reason for failure">] - [ON_TARGET [ ...]] - [ON_ARCH [ ...]] - [ON_CRT_LINKAGE [ ...]]) - [ON_LIBRARY_LINKAGE [ ...]] -) -``` - -## Parameters -### MESSAGE -Additional failure message. If none is given, a default message will be displayed depending on the failure condition. - -### ALWAYS -Will always fail early - -### ON_TARGET -Targets for which the build should fail early. Valid targets are `` from `VCPKG_IS_TARGET_` (see `vcpkg_common_definitions.cmake`). - -### ON_ARCH -Architecture for which the build should fail early. - -### ON_CRT_LINKAGE -CRT linkage for which the build should fail early. - -### ON_LIBRARY_LINKAGE -Library linkage for which the build should fail early. - -## Examples - -* [aws-lambda-cpp](https://github.com/Microsoft/vcpkg/blob/master/ports/aws-lambda-cpp/portfile.cmake) -#]===] - function(vcpkg_fail_port_install) message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}" "vcpkg_fail_port_install has been removed and all values should be moved by adding `supports` field to manifest file or directly adding `${PORT}:${FAILED_TRIPLET}=fail` to _scripts/ci.baseline.txt_.\nPlease remove `vcpkg_fail_port_install(...)`.\n") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake index c85932dc7..58b3d7039 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -1,52 +1,3 @@ -#[===[.md: -# vcpkg_find_acquire_program - -Download or find a well-known tool. - -## Usage -```cmake -vcpkg_find_acquire_program() -``` -## Parameters -### program -This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. - -## Notes -The current list of programs includes: - -* 7Z -* ARIA2 (Downloader) -* BISON -* CLANG -* DARK -* DOXYGEN -* FLEX -* GASPREPROCESSOR -* GPERF -* PERL -* PYTHON2 -* PYTHON3 -* GIT -* GN -* GO -* JOM -* MESON -* NASM -* NINJA -* NUGET -* SCONS -* SWIG -* YASM - -Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md). - -## Examples - -* [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) -* [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake) -* [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) -#]===] - function(z_vcpkg_find_acquire_program_version_check out_var) cmake_parse_arguments(PARSE_ARGV 1 arg "EXACT_VERSION_MATCH" @@ -216,21 +167,47 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "GN") set(program_name gn) set(rename_binary_to "gn") - 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) - set(program_version "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC") - set(gn_platform "linux-amd64") - set(download_sha512 "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135") - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) - set(program_version "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC") - set(gn_platform "mac-amd64") - set(download_sha512 "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937") - else() - set(program_version "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC") - set(gn_platform "windows-amd64") - set(download_sha512 "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db") + 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) + 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) + 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}") @@ -247,17 +224,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.2) + set(program_version 3.10.5) 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 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) + set(download_sha512 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f) 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 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) + set(download_sha512 17b1e00af8a051a4d319dd4bf340a6ad742c1b691faa30ea9f51bc0f2e9daccccd2745e2a081699428981d120d0c06007878ecaafca78936f4cfcab0054b4fb7) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) @@ -568,8 +545,26 @@ function(vcpkg_find_acquire_program program) 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") + if(HOST_ARCH STREQUAL "aarch64") + set(patchelf_platform "aarch64") + set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75") + 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) else() - message(FATAL "unknown tool ${program} -- unable to acquire.") + message(FATAL_ERROR "unknown tool ${program} -- unable to acquire.") endif() if("${program_name}" STREQUAL "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake index 0e82c7d36..2f1c49722 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_find_fortran.cmake @@ -1,26 +1,3 @@ -#[===[.md: -# vcpkg_find_fortran - -Checks if a Fortran compiler can be found. -Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran - and return required cmake args for building. - -## Usage -```cmake -vcpkg_find_fortran() -``` - -## Example -```cmake -vcpkg_find_fortran(fortran_args) -# ... -vcpkg_cmake_configure(... - OPTIONS - ${fortran_args} -) -``` -#]===] - function(vcpkg_find_fortran out_var) if("${ARGC}" GREATER "1") message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra args: ${ARGN}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index a49cfb2b5..3d8a8ba4f 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -1,62 +1,3 @@ -# DEPRECATED BY ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup -#[===[.md: -# vcpkg_fixup_cmake_targets - -Merge release and debug CMake targets and configs to support multiconfig generators. - -Additionally corrects common issues with targets, such as absolute paths and incorrectly placed binaries. - -## Usage -```cmake -vcpkg_fixup_cmake_targets([CONFIG_PATH ] - [TARGET_PATH ] - [TOOLS_PATH ] - [DO_NOT_DELETE_PARENT_CONFIG_PATH]) -``` - -## Parameters - -### CONFIG_PATH -Subpath currently containing `*.cmake` files subdirectory (like `lib/cmake/${PORT}`). Should be relative to `${CURRENT_PACKAGES_DIR}`. - -Defaults to `share/${PORT}`. - -### TARGET_PATH -Subpath to which the above `*.cmake` files should be moved. Should be relative to `${CURRENT_PACKAGES_DIR}`. -This needs to be specified if the port name differs from the `find_package()` name. - -Defaults to `share/${PORT}`. - -### DO_NOT_DELETE_PARENT_CONFIG_PATH -By default the parent directory of CONFIG_PATH is removed if it is named "cmake". -Passing this option disable such behavior, as it is convenient for ports that install -more than one CMake package configuration file. - -### NO_PREFIX_CORRECTION -Disables the correction of_IMPORT_PREFIX done by vcpkg due to moving the targets. -Currently the correction does not take into account how the files are moved and applies -I rather simply correction which in some cases will yield the wrong results. - -### TOOLS_PATH -Define the base path to tools. Default: `tools/` - -## Notes -Transform all `/debug//*targets-debug.cmake` files and move them to `/`. -Removes all `/debug//*targets.cmake` and `/debug//*config.cmake`. - -Transform all references matching `/bin/*.exe` to `/${TOOLS_PATH}/*.exe` on Windows. -Transform all references matching `/bin/*` to `/${TOOLS_PATH}/*` on other platforms. - -Fix `${_IMPORT_PREFIX}` in auto generated targets to be one folder deeper. -Replace `${CURRENT_INSTALLED_DIR}` with `${_IMPORT_PREFIX}` in configs and targets. - -## Examples - -* [concurrentqueue](https://github.com/Microsoft/vcpkg/blob/master/ports/concurrentqueue/portfile.cmake) -* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake) -* [nlohmann-json](https://github.com/Microsoft/vcpkg/blob/master/ports/nlohmann-json/portfile.cmake) -#]===] - function(vcpkg_fixup_cmake_targets) if(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD) message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake-config; using both vcpkg-cmake-config and vcpkg_fixup_cmake_targets in the same port is unsupported.") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 9cb35b7b2..d0aa3d8fe 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -1,50 +1,3 @@ -#[===[.md: -# vcpkg_fixup_pkgconfig - -Fix common paths in *.pc files and make everything relative to $(prefix). -Additionally, on static triplets, private entries are merged with their non-private counterparts, -allowing pkg-config to be called without the ``--static`` flag. -Note that vcpkg is designed to never have to call pkg-config with the ``--static`` flag, -since a consumer cannot know if a dependent library has been built statically or not. - -## Usage -```cmake -vcpkg_fixup_pkgconfig( - [RELEASE_FILES ...] - [DEBUG_FILES ...] - [SKIP_CHECK] -) -``` - -## Parameters -### RELEASE_FILES -Specifies a list of files to apply the fixes for release paths. -Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURRENT_PACKAGES_DIR}/debug/ - -### DEBUG_FILES -Specifies a list of files to apply the fixes for debug paths. -Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/ - -### SKIP_CHECK -Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. - -### SYSTEM_PACKAGES (deprecated) -This argument has been deprecated and has no effect. - -### SYSTEM_LIBRARIES (deprecated) -This argument has been deprecated and has no effect. - -### IGNORE_FLAGS (deprecated) -This argument has been deprecated and has no effect. - -## Notes -Still work in progress. If there are more cases which can be handled here feel free to add them - -## Examples - -* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) -#]===] - function(z_vcpkg_fixup_pkgconfig_check_files file config) set(path_suffix_DEBUG /debug) set(path_suffix_RELEASE "") @@ -151,7 +104,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") - string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") + string(REGEX REPLACE "(^|\n) *prefix[\t ]*=[^\n]*" "" contents "${contents}") if("${config}" STREQUAL "DEBUG") # prefix points at the debug subfolder string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake index e27d62218..2cd9c998a 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -1,61 +1,3 @@ -#[===[.md: -# vcpkg_from_bitbucket - -Download and extract a project from Bitbucket. - -## Usage: -```cmake -vcpkg_from_bitbucket( - OUT_SOURCE_PATH - REPO - [REF ] - [SHA512 <45d0d7f8cc350...>] - [HEAD_REF ] - [PATCHES ...] -) -``` - -## Parameters: -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. - -This should be set to `SOURCE_PATH` by convention. - -### REPO -The organization or user and repository on GitHub. - -### REF -A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** - -For repositories without official releases, this can be set to the full commit id of the current latest master. - -If `REF` is specified, `SHA512` must also be specified. - -### SHA512 -The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). - -This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. - -### HEAD_REF -The unstable git commit-ish (ideally a branch) to pull for `--head` builds. - -For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -## Notes: -At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. - -This exports the `VCPKG_HEAD_VERSION` variable during head builds. - -## Examples: - -* [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake) -#]===] - function(vcpkg_from_bitbucket) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake index 142cae70e..0d9d40fe5 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_git.cmake @@ -1,54 +1,3 @@ -#[===[.md: -# vcpkg_from_git - -Download and extract a project from git - -## Usage: -```cmake -vcpkg_from_git( - OUT_SOURCE_PATH - URL - REF <59f7335e4d...> - [HEAD_REF ] - [PATCHES ...] -) -``` - -## Parameters: -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. - -This should be set to `SOURCE_PATH` by convention. - -### URL -The url of the git repository. - -### REF -The git sha of the commit to download. - -### FETCH_REF -The git branch to fetch in non-HEAD mode. After this is fetched, -then `REF` is checked out. This is useful in cases where the git server -does not allow checking out non-advertised objects. - -### HEAD_REF -The git branch to use when the package is requested to be built from the latest sources. - -Example: `main`, `develop`, `HEAD` - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -## Notes: -`OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. - -## Examples: - -* [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) -#]===] - function(vcpkg_from_git) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" @@ -175,7 +124,7 @@ function(vcpkg_from_git) file(MAKE_DIRECTORY "${DOWNLOADS}/temp") vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" archive "${rev_parse_ref}" -o "${temp_archive}" + COMMAND "${GIT}" -c core.autocrlf=false archive "${rev_parse_ref}" -o "${temp_archive}" WORKING_DIRECTORY "${git_working_directory}" LOGNAME git-archive ) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake index 5313db3db..3b1af1a62 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_github.cmake @@ -1,79 +1,3 @@ -#[===[.md: -# vcpkg_from_github - -Download and extract a project from GitHub. Enables support for `install --head`. - -This also works with Gitea by specifying the Gitea server with the `GITHUB_HOST` option. - -## Usage: -```cmake -vcpkg_from_github( - OUT_SOURCE_PATH - REPO - [REF ] - [SHA512 <45d0d7f8cc350...>] - [HEAD_REF ] - [PATCHES ...] - [GITHUB_HOST ] - [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>] - [FILE_DISAMBIGUATOR ] -) -``` - -## Parameters: -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. - -This should be set to `SOURCE_PATH` by convention. - -### REPO -The organization or user and repository on GitHub. - -### REF -A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.** - -For repositories without official releases, this can be set to the full commit id of the current latest master. - -If `REF` is specified, `SHA512` must also be specified. - -### SHA512 -The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). - -This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. - -### HEAD_REF -The unstable git commit-ish (ideally a branch) to pull for `--head` builds. - -For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -### GITHUB_HOST -A replacement host for enterprise GitHub instances. - -This field should contain the scheme, host, and port of the desired URL without a trailing slash. - -### AUTHORIZATION_TOKEN -A token to be passed via the Authorization HTTP header as "token ${AUTHORIZATION_TOKEN}". - -### FILE_DISAMBIGUATOR -A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. - -## Notes: -At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. - -This exports the `VCPKG_HEAD_VERSION` variable during head builds. - -## Examples: - -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [ms-gsl](https://github.com/Microsoft/vcpkg/blob/master/ports/ms-gsl/portfile.cmake) -* [boost-beast](https://github.com/Microsoft/vcpkg/blob/master/ports/boost-beast/portfile.cmake) -#]===] - function(vcpkg_from_github) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake index e091ca5c0..6a0e29c18 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_gitlab.cmake @@ -1,74 +1,20 @@ -#[===[.md: -# vcpkg_from_gitlab - -Download and extract a project from Gitlab instances. Enables support for `install --head`. - -## Usage: -```cmake -vcpkg_from_gitlab( - GITLAB_URL - OUT_SOURCE_PATH - REPO - [REF ] - [SHA512 <45d0d7f8cc350...>] - [HEAD_REF ] - [PATCHES ...] - [FILE_DISAMBIGUATOR ] -) -``` - -## Parameters: - -### GITLAB_URL -The URL of the Gitlab instance to use. - -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. - -This should be set to `SOURCE_PATH` by convention. - -### REPO -The organization or user plus the repository name on the Gitlab instance. - -### REF -A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.** - -For repositories without official releases, this can be set to the full commit id of the current latest master. - -If `REF` is specified, `SHA512` must also be specified. - -### SHA512 -The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). -The REPO_NAME variable is parsed from the value of REPO. - -This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. - -### HEAD_REF -The unstable git commit-ish (ideally a branch) to pull for `--head` builds. - -For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms. - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -### FILE_DISAMBIGUATOR -A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name. - -## Notes: -At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present. - -This exports the `VCPKG_HEAD_VERSION` variable during head builds. - -## Examples: -* [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] -* [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) -* [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) -#]===] - include(vcpkg_execute_in_download_mode) +function(z_uri_encode input output_variable) + string(HEX "${input}" hex) + string(LENGTH "${hex}" length) + math(EXPR last "${length} - 1") + set(result "") + foreach(i RANGE ${last}) + math(EXPR even "${i} % 2") + if("${even}" STREQUAL "0") + string(SUBSTRING "${hex}" "${i}" 2 char) + string(APPEND result "%${char}") + endif() + endforeach() + set("${output_variable}" ${result} PARENT_SCOPE) +endfunction() + function(vcpkg_from_gitlab) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" @@ -149,25 +95,23 @@ function(vcpkg_from_gitlab) # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. - if(VCPKG_USE_HEAD_VERSION) - # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision - vcpkg_execute_in_download_mode(COMMAND ${GIT} ls-remote - "${gitlab_link}.git" "${arg_HEAD_REF}" - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_output + # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED VCPKG_HEAD_VERSION) + z_uri_encode("${arg_REPO}" encoded_repo_path) + set(version_url "${arg_GITLAB_URL}/api/v4/projects/${encoded_repo_path}/repository/branches/${arg_HEAD_REF}") + vcpkg_download_distfile(archive_version + URLS "${version_url}" + FILENAME "${downloaded_file_name}.version" + ${headers_param} + SKIP_SHA512 + ALWAYS_REDOWNLOAD ) - if(NOT git_result EQUAL 0) - message(FATAL_ERROR "git ls-remote failed to read ref data of repository: '${gitlab_link}'") - endif() - if(NOT git_output MATCHES "^([a-f0-9]*)\t") - message(FATAL_ERROR "git ls-remote returned unexpected result: -${git_output} -") - endif() - # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). - if(NOT DEFINED VCPKG_HEAD_VERSION) - set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + # Parse the gitlab response with regex. + file(READ "${archive_version}" version_contents) + if(NOT version_contents MATCHES [["id":(\ *)"([a-f0-9]+)"]]) + message(FATAL_ERROR "Failed to parse API response from '${version_url}':\n${version_contents}\n") endif() + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_2}" PARENT_SCOPE) endif() # download the file information from gitlab diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake index e1226c3b1..b2209ab35 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -1,74 +1,3 @@ -#[===[.md: -# vcpkg_from_sourceforge - -Download and extract a project from sourceforge. - -This function automatically checks a set of sourceforge mirrors. -Additional mirrors can be injected through the `VCPKG_SOURCEFORGE_EXTRA_MIRRORS` -list variable in the triplet. - -## Usage: -```cmake -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO - [REF <2.1-3>] - SHA512 <547b417109332...> - FILENAME - [DISABLE_SSL] - [NO_REMOVE_ONE_LEVEL] - [PATCHES ...] -) -``` - -## Parameters: -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. - -This should be set to `SOURCE_PATH` by convention. - -### REPO -The organization or user and repository (optional) on sourceforge. - -### REF -A stable version number that will not change contents. - -### FILENAME -The local name for the file. Files are shared between ports, so the file may need to be renamed to make it clearly attributed to this port and avoid conflicts. - -For example, we can get the download link: -https://sourceforge.net/settings/mirror_choices?projectname=mad&filename=libmad/0.15.1b/libmad-0.15.1b.tar.gz&selected=nchc -So the REPO is `mad/libmad`, the REF is `0.15.1b`, and the FILENAME is `libmad-0.15.1b.tar.gz` - -For some special links: -https://sourceforge.net/settings/mirror_choices?projectname=soxr&filename=soxr-0.1.3-Source.tar.xz&selected=nchc -The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar.xz` - -### SHA512 -The SHA512 hash that should match the archive. - -This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. - -### WORKING_DIRECTORY -If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. - -Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -### NO_REMOVE_ONE_LEVEL -Specifies that the default removal of the top level folder should not occur. - -## Examples: - -* [cunit](https://github.com/Microsoft/vcpkg/blob/master/ports/cunit/portfile.cmake) -* [polyclipping](https://github.com/Microsoft/vcpkg/blob/master/ports/polyclipping/portfile.cmake) -* [tinyfiledialogs](https://github.com/Microsoft/vcpkg/blob/master/ports/tinyfiledialogs/portfile.cmake) -#]===] - function(vcpkg_from_sourceforge) cmake_parse_arguments(PARSE_ARGV 0 "arg" "DISABLE_SSL;NO_REMOVE_ONE_LEVEL" diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake index b40b24c42..b24b4d071 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake @@ -1,16 +1,3 @@ -#[===[.md: -# vcpkg_get_program_files_platform_bitness - -Get the Program Files directory of the current platform's bitness: -either `$ENV{ProgramW6432}` on 64-bit windows, -or `$ENV{PROGRAMFILES}` on 32-bit windows. - -## Usage: -```cmake -vcpkg_get_program_files_platform_bitness() -``` -#]===] - function(vcpkg_get_program_files_platform_bitness out_var) if(DEFINED ENV{ProgramW6432}) set("${out_var}" "$ENV{ProgramW6432}" PARENT_SCOPE) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake index 0a80d4c76..bb26b44b7 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_get_windows_sdk.cmake @@ -1,14 +1,3 @@ -#[===[.md: -# vcpkg_get_windows_sdk - -Get the Windows SDK number. - -## Usage: -```cmake -vcpkg_get_windows_sdk() -``` -#]===] - function(vcpkg_get_windows_sdk out_var) if("$ENV{WindowsSDKVersion}" MATCHES [[^([0-9.]*)\\?$]]) set("${out_var}" "${CMAKE_MATCH_1}" PARENT_SCOPE) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake index 3495e803f..81365f62c 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_host_path_list.cmake @@ -1,30 +1,3 @@ -#[===[ -# vcpkg_host_path_list - -Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) - -```cmake -vcpkg_host_path_list(PREPEND [...]) -vcpkg_host_path_list(APPEND [...]) -vcpkg_host_path_list(SET [...]) -``` - -`` may be either a regular variable name, or `ENV{variable-name}`, -in which case `vcpkg_host_path_list` will modify the environment. - -`vcpkg_host_path_list` adds all of the paths passed to it to ``; -`PREPEND` puts them before the existing list, so that they are searched first; -`APPEND` places them after the existing list, -so they would be searched after the paths which are already in the variable, -and `SET` replaces the value of the existing list. - -For all of `APPEND`, `PREPEND`, and `SET`, -the paths are added (and thus searched) in the order received. - -If no paths are passed to `APPEND` or `PREPEND`, nothing will be done; -for `SET`, the variable will be set to the empty string. -#]===] - function(z_vcpkg_translate_to_host_path_list out_var lst) if(NOT DEFINED arg_UNPARSED_ARGUMENTS) set("${out_var}" "" PARENT_SCOPE) @@ -78,7 +51,7 @@ function(vcpkg_host_path_list) # do nothing elseif("${list}" STREQUAL "") set(list "${arguments}") - elseif(arg_PREPEND) + elseif("${operation}" STREQUAL "PREPEND") set(list "${arguments}${VCPKG_HOST_PATH_SEPARATOR}${list}") else() set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${arguments}") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake index 9582419ec..df7d7bf61 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_cmake.cmake @@ -1,29 +1,3 @@ -# DEPRECATED BY ports/vcpkg-cmake/vcpkg_cmake_install -#[===[.md: -# vcpkg_install_cmake - -Build and install a cmake project. - -## Usage: -```cmake -vcpkg_install_cmake(...) -``` - -## Parameters: -See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). - -## Notes: -This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install` -parameter. - -## Examples: - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) -* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) -* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) -#]===] - function(vcpkg_install_cmake) if(Z_VCPKG_CMAKE_INSTALL_GUARD) message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_install_cmake in the same port is unsupported.") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_copyright.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_copyright.cmake new file mode 100644 index 000000000..061eba567 --- /dev/null +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_copyright.cmake @@ -0,0 +1,42 @@ +function(vcpkg_install_copyright) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "COMMENT" "FILE_LIST") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_FILE_LIST) + message(FATAL_ERROR "FILE_LIST must be specified") + endif() + + list(LENGTH arg_FILE_LIST FILE_LIST_LENGTH) + set(out_string "") + + if(FILE_LIST_LENGTH LESS_EQUAL 0) + message(FATAL_ERROR "FILE_LIST must contain at least one file") + elseif(FILE_LIST_LENGTH EQUAL 1) + if(arg_COMMENT) + file(READ "${arg_FILE_LIST}" out_string) + else() + file(INSTALL "${arg_FILE_LIST}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + return() + endif() + else() + foreach(file_item IN LISTS arg_FILE_LIST) + if(NOT EXISTS "${file_item}") + message(FATAL_ERROR "\n${CMAKE_CURRENT_FUNCTION} was passed a non-existing path: ${file_item}\n") + endif() + + get_filename_component(file_name "${file_item}" NAME) + file(READ "${file_item}" file_contents) + + string(APPEND out_string "${file_name}:\n\n${file_contents}\n\n") + endforeach() + endif() + + if(arg_COMMENT) + string(PREPEND out_string "${arg_COMMENT}\n\n") + endif() + + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${out_string}") +endfunction() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_gn.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_gn.cmake index fc51f157c..6f250ec04 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_gn.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_gn.cmake @@ -1,31 +1,3 @@ -# DEPRECATED BY ports/vcpkg-gn/vcpkg_gn_install -#[===[.md: -# vcpkg_install_gn - -Installs a GN project. - -In order to build a GN project without installing, use [`vcpkg_build_ninja()`]. - -## Usage: -```cmake -vcpkg_install_gn( - SOURCE_PATH - [TARGETS ...] -) -``` - -## Parameters: -### SOURCE_PATH -The path to the source directory - -### TARGETS -Only install the specified targets. - -Note: includes must be handled separately - -[`vcpkg_build_ninja()`]: vcpkg_build_ninja.md -#]===] - function(z_vcpkg_install_gn_get_target_type out_var) cmake_parse_arguments(PARSE_ARGV 1 "arg" "" "SOURCE_PATH;BUILD_DIR;TARGET" "") if(DEFINED arg_UNPARSED_ARGUMENTS) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_make.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_make.cmake index f622edd40..281b6237a 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_make.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_make.cmake @@ -1,27 +1,3 @@ -#[===[.md: -# vcpkg_install_make - -Build and install a make project. - -## Usage: -```cmake -vcpkg_install_make(...) -``` - -## Parameters: -See [`vcpkg_build_make()`](vcpkg_build_make.md). - -## Notes: -This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.md), adding `ENABLE_INSTALL` - -## Examples - -* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake) -* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) -#]===] - function(vcpkg_install_make) vcpkg_build_make( ${ARGN} diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_meson.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_meson.cmake index e59162d0a..5971aefd9 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_meson.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_meson.cmake @@ -1,23 +1,3 @@ -#[===[.md: -# vcpkg_install_meson - -Builds a meson project previously configured with `vcpkg_configure_meson()`. - -## Usage -```cmake -vcpkg_install_meson([ADD_BIN_TO_PATH]) -``` - -## Parameters: -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. - -## Examples - -* [fribidi](https://github.com/Microsoft/vcpkg/blob/master/ports/fribidi/portfile.cmake) -* [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) -#]===] - function(vcpkg_install_meson) cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH" "" "") diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake index 580e86ab2..eb93d2e25 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_msbuild.cmake @@ -1,96 +1,3 @@ -#[===[.md: -# vcpkg_install_msbuild - -Build and install a msbuild-based project. This replaces `vcpkg_build_msbuild()`. - -## Usage -```cmake -vcpkg_install_msbuild( - SOURCE_PATH <${SOURCE_PATH}> - PROJECT_SUBPATH - [INCLUDES_SUBPATH ] - [LICENSE_SUBPATH ] - [RELEASE_CONFIGURATION ] - [DEBUG_CONFIGURATION ] - [TARGET ] - [TARGET_PLATFORM_VERSION <10.0.15063.0>] - [PLATFORM <${TRIPLET_SYSTEM_ARCH}>] - [PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>] - [OPTIONS ...] - [OPTIONS_RELEASE ...] - [OPTIONS_DEBUG ...] - [USE_VCPKG_INTEGRATION] - [ALLOW_ROOT_INCLUDES | REMOVE_ROOT_INCLUDES] -) -``` - -## Parameters -### SOURCE_PATH -The path to the root of the source tree. - -Because MSBuild uses in-source builds, the source tree will be copied into a temporary location for the build. This -parameter is the base for that copy and forms the base for all XYZ_SUBPATH options. - -### USE_VCPKG_INTEGRATION -Apply the normal `integrate install` integration for building the project. - -By default, projects built with this command will not automatically link libraries or have header paths set. - -### PROJECT_SUBPATH -The subpath to the solution (`.sln`) or project (`.vcxproj`) file relative to `SOURCE_PATH`. - -### LICENSE_SUBPATH -The subpath to the license file relative to `SOURCE_PATH`. - -### INCLUDES_SUBPATH -The subpath to the includes directory relative to `SOURCE_PATH`. - -This parameter should be a directory and should not end in a trailing slash. - -### ALLOW_ROOT_INCLUDES -Indicates that top-level include files (e.g. `include/zlib.h`) should be allowed. - -### REMOVE_ROOT_INCLUDES -Indicates that top-level include files (e.g. `include/Makefile.am`) should be removed. - -### SKIP_CLEAN -Indicates that the intermediate files should not be removed. - -Ports using this option should later call [`vcpkg_clean_msbuild()`](vcpkg_clean_msbuild.md) to manually clean up. - -### RELEASE_CONFIGURATION -The configuration (``/p:Configuration`` msbuild parameter) used for Release builds. - -### DEBUG_CONFIGURATION -The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds. - -### TARGET_PLATFORM_VERSION -The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter) - -### TARGET -The MSBuild target to build. (``/t:``) - -### PLATFORM -The platform (``/p:Platform`` msbuild parameter) used for the build. - -### PLATFORM_TOOLSET -The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build. - -### OPTIONS -Additional options passed to msbuild for all builds. - -### OPTIONS_RELEASE -Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`. - -## Examples - -* [libirecovery](https://github.com/Microsoft/vcpkg/blob/master/ports/libirecovery/portfile.cmake) -* [libfabric](https://github.com/Microsoft/vcpkg/blob/master/ports/libfabric/portfile.cmake) -#]===] - function(vcpkg_install_msbuild) cmake_parse_arguments( PARSE_ARGV 0 diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake index 2a3cb8270..fc8afa8d4 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_nmake.cmake @@ -1,69 +1,3 @@ -#[===[.md: -# vcpkg_install_nmake - -Build and install a msvc makefile project. - -## Usage: -```cmake -vcpkg_install_nmake( - SOURCE_PATH <${SOURCE_PATH}> - [NO_DEBUG] - [TARGET ] - PROJECT_SUBPATH <${SUBPATH}> - PROJECT_NAME <${MAKEFILE_NAME}> - [PRERUN_SHELL <${SHELL_PATH}>] - [PRERUN_SHELL_DEBUG <${SHELL_PATH}>] - [PRERUN_SHELL_RELEASE <${SHELL_PATH}>] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] - [OPTIONS_RELEASE <-DOPTIMIZE=1>...] - [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] -``` - -## Parameters -### SOURCE_PATH -Specifies the directory containing the source files. -By convention, this is usually set in the portfile as the variable `SOURCE_PATH`. - -### PROJECT_SUBPATH -Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile. - -### PROJECT_NAME -Specifies the name of msvc makefile name. -Default is makefile.vc - -### NO_DEBUG -This port doesn't support debug mode. - -### PRERUN_SHELL -Script that needs to be called before build - -### PRERUN_SHELL_DEBUG -Script that needs to be called before debug build - -### PRERUN_SHELL_RELEASE -Script that needs to be called before release build - -### OPTIONS -Additional options passed to generate during the generation. - -### OPTIONS_RELEASE -Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`. - -### OPTIONS_DEBUG -Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`. - -## Parameters: -See [`vcpkg_build_nmake()`](vcpkg_build_nmake.md). - -## Notes: -This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake.md), adding `ENABLE_INSTALL` - -## Examples - -* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake) -* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake) -#]===] - function(vcpkg_install_nmake) vcpkg_list(SET multi_value_args TARGET diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake index 38d9eacf9..c66548627 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_install_qmake.cmake @@ -1,27 +1,3 @@ -#[===[.md: -# vcpkg_install_qmake - -Build and install a qmake project. - -## Usage: -```cmake -vcpkg_install_qmake(...) -``` - -## Parameters: -See [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). - -## Notes: -This command transparently forwards to [`vcpkg_build_qmake()`](vcpkg_build_qmake.md). - -Additionally, this command will copy produced .libs/.dlls/.as/.dylibs/.sos to the appropriate -staging directories. - -## Examples - -* [libqglviewer](https://github.com/Microsoft/vcpkg/blob/master/ports/libqglviewer/portfile.cmake) -#]===] - function(vcpkg_install_qmake) z_vcpkg_function_arguments(args) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_list.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_list.cmake index 74523dc62..d7fa0fe5b 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_list.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_list.cmake @@ -1,95 +1,3 @@ -#[===[.md: -# vcpkg_list - -A replacement for CMake's `list()` function, which correctly handles elements -with internal semicolons (in other words, escaped semicolons). -Use `vcpkg_list()` instead of `list()` whenever possible. - -```cmake -vcpkg_list(SET [...]) -vcpkg_list( [...]) -``` - -In addition to all of the commands from `list()`, `vcpkg_list` adds -a `vcpkg_list(SET)` command. -This command takes its arguments, escapes them, and then concatenates -them into a list; this should be used instead of `set()` for setting any -list variable. - -Otherwise, the `vcpkg_list()` function is the same as the built-in -`list()` function, with the following restrictions: - -- `GET`, `REMOVE_ITEM`, and `REMOVE_AT` support only one index/value -- `POP_BACK` and `POP_FRONT` do not support getting the value into - another out variable. Use C++ style `GET` then `POP_(BACK|FRONT)`. -- `FILTER` and `TRANSFORM` are unsupported. - -See the [CMake documentation for `list()`](https://cmake.org/cmake/help/latest/command/list.html) -for more information. - -## Notes: Some Weirdnesses - -The most major weirdness is due to `""` pulling double-duty as "list of zero elements", -and "list of one element, which is empty". `vcpkg_list` always uses the former understanding. -This can cause weird behavior, for example: - -```cmake -set(lst "") -vcpkg_list(APPEND lst "" "") -# lst = ";" -``` - -This is because you're appending two elements to the empty list. -One very weird behavior that comes out of this would be: - -```cmake -set(lst "") -vcpkg_list(APPEND lst "") -# lst = "" -``` - -since `""` is the empty list, we append the empty element and end up with a list -of one element, which is empty. This does not happen for non-empty lists; -for example: - -```cmake -set(lst "a") -vcpkg_list(APPEND lst "") -# lst = "a;" -``` - -only the empty list has this odd behavior. - -## Examples - -### Creating a list - -```cmake -vcpkg_list(SET foo_param) -if(DEFINED arg_FOO) - vcpkg_list(SET foo_param FOO "${arg_FOO}") -endif() -``` - -### Appending to a list - -```cmake -set(OPTIONS -DFOO=BAR) -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_list(APPEND OPTIONS "-DOS=WINDOWS;FOO") -endif() -``` - -### Popping the end off a list - -```cmake -if(NOT list STREQUAL "") - vcpkg_list(GET list end -1) - vcpkg_list(POP_BACK list) -endif() -``` -#]===] - macro(z_vcpkg_list_escape_once_more lst) string(REPLACE [[\;]] [[\\;]] "${lst}" "${${lst}}") endmacro() diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake index a8f3a1265..1ef14963b 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_minimum_required.cmake @@ -1,18 +1,3 @@ -#[===[.md: -# vcpkg_minimum_required - -Asserts that the version of the vcpkg program being used to build a port is later than the supplied date, inclusive. - -## Usage -```cmake -vcpkg_minimum_required(VERSION 2021-01-13) -``` - -## Parameters -### VERSION -The date-version to check against. -#]===] - function(vcpkg_minimum_required) cmake_parse_arguments(PARSE_ARGV 0 arg "" "VERSION" "") if(NOT DEFINED VCPKG_BASE_VERSION) diff --git a/external_imported/vcpkg/scripts/cmake/vcpkg_replace_string.cmake b/external_imported/vcpkg/scripts/cmake/vcpkg_replace_string.cmake index 1f8b37b65..7147acdf6 100644 --- a/external_imported/vcpkg/scripts/cmake/vcpkg_replace_string.cmake +++ b/external_imported/vcpkg/scripts/cmake/vcpkg_replace_string.cmake @@ -1,13 +1,3 @@ -#[===[.md: -# vcpkg_replace_string - -Replace a string in a file. - -```cmake -vcpkg_replace_string( ) -``` -#]===] - function(vcpkg_replace_string filename match replace) file(READ "${filename}" contents) string(REPLACE "${match}" "${replace}" contents "${contents}") diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake index 9743981c8..77af63b3b 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_apply_patches.cmake @@ -1,33 +1,3 @@ -#[===[.md: -# z_vcpkg_apply_patches - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** - -Apply a set of patches to a source tree. - -```cmake -z_vcpkg_apply_patches( - SOURCE_PATH - [QUIET] - PATCHES ... -) -``` - -The `` should be set to `${SOURCE_PATH}` by convention, -and is the path to apply the patches in. - -`z_vcpkg_apply_patches` will take the list of ``es, -which are by default relative to the port directory, -and apply them in order using `git apply`. -Generally, these ``es take the form of `some.patch` -to select patches in the port directory. -One may also download patches and use `${VCPKG_DOWNLOADS}/path/to/some.patch`. - -If `QUIET` is not passed, it is a fatal error for a patch to fail to apply; -otherwise, if `QUIET` is passed, no message is printed. -This should only be used for edge cases, such as patches that are known to fail even on a clean source tree. -#]===] - function(z_vcpkg_apply_patches) cmake_parse_arguments(PARSE_ARGV 0 "arg" "QUIET" "SOURCE_PATH" "PATCHES") diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_fixup_rpath.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_fixup_rpath.cmake new file mode 100644 index 000000000..c61bda5a5 --- /dev/null +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_fixup_rpath.cmake @@ -0,0 +1,57 @@ +function(z_vcpkg_fixup_rpath_in_dir) + vcpkg_find_acquire_program(PATCHELF) + + # We need to iterate trough everything because we + # can't predict where an elf file will be located + file(GLOB root_entries LIST_DIRECTORIES TRUE "${CURRENT_PACKAGES_DIR}/*") + + # Skip some folders for better throughput + list(APPEND folders_to_skip "include") + list(JOIN folders_to_skip "|" folders_to_skip_regex) + set(folders_to_skip_regex "^(${folders_to_skip_regex})$") + + foreach(folder IN LISTS root_entries) + if(NOT IS_DIRECTORY "${folder}") + continue() + endif() + + get_filename_component(folder_name "${folder}" NAME) + if(folder_name MATCHES "${folders_to_skip_regex}") + continue() + endif() + + file(GLOB_RECURSE elf_files LIST_DIRECTORIES FALSE "${folder}/*") + foreach(elf_file IN LISTS elf_files) + if(IS_SYMLINK "${elf_file}") + continue() + endif() + + get_filename_component(elf_file_dir "${elf_file}" DIRECTORY) + + set(current_prefix "${CURRENT_PACKAGES_DIR}") + if(elf_file_dir MATCHES "debug/") + set(current_prefix "${CURRENT_PACKAGES_DIR}/debug") + endif() + + # compute path relative to lib + file(RELATIVE_PATH relative_to_lib "${elf_file_dir}" "${current_prefix}/lib") + if(relative_to_lib STREQUAL "") + set(rpath "\$ORIGIN") + else() + set(rpath "\$ORIGIN:\$ORIGIN/${relative_to_lib}") + endif() + + # If this fails, the file is not an elf + execute_process( + COMMAND "${PATCHELF}" --set-rpath "${rpath}" "${elf_file}" + OUTPUT_QUIET + ERROR_VARIABLE set_rpath_error + ) + if("${set_rpath_error}" STREQUAL "") + message(STATUS "Fixed rpath: ${elf_file} (${rpath})") + endif() + endforeach() + endforeach() +endfunction() + +z_vcpkg_fixup_rpath_in_dir() diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake index 4d775b8cc..1177ef36c 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_forward_output_variable.cmake @@ -1,39 +1,3 @@ -#[===[.md: -# z_vcpkg_forward_output_variable - -This macro helps with forwarding values from inner function calls, -through a local function scope, into pointer out parameters. - -```cmake -z_vcpkg_forward_output_variable(ptr_to_parent_var var_to_forward) -``` - -is equivalent to - -```cmake -if(DEFINED ptr_to_parent_var) - if(DEFINED value_var) - set("${ptr_to_parent_var}" "${value_var}" PARENT_SCOPE) - else() - unset("${ptr_to_parent_var}" PARENT_SCOPE) - endif() -endif() -``` - -Take note that the first argument should be a local variable that has a value of the parent variable name. -Most commonly, this local is the result of a pointer-out parameter to a function. -If the variable in the first parameter is not defined, this function does nothing, -simplifying functions with optional out parameters. -Most commonly, this should be used in cases like: - -```cmake -function(my_function out_var) - file(SHA512 "somefile.txt" local_var) - z_vcpkg_forward_output_variable(out_var local_var) -endfunction() -``` -#]===] - macro(z_vcpkg_forward_output_variable ptr_to_parent_var var_to_forward) if("${ARGC}" GREATER "2") message(FATAL_ERROR "z_vcpkg_forward_output_variable was passed extra arguments: ${ARGN}") diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake index 043c86191..45e60a256 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_function_arguments.cmake @@ -1,30 +1,3 @@ -#[===[.md: -# z_vcpkg_function_arguments - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -Get a list of the arguments which were passed in. -Unlike `ARGV`, which is simply the arguments joined with `;`, -so that `(A B)` is not distinguishable from `("A;B")`, -this macro gives `"A;B"` for the first argument list, -and `"A\;B"` for the second. - -```cmake -z_vcpkg_function_arguments( []) -``` - -`z_vcpkg_function_arguments` gets the arguments between `ARGV` and the last argument. -`` defaults to `0`, so that all arguments are taken. - -## Example: -```cmake -function(foo_replacement) - z_vcpkg_function_arguments(ARGS) - foo(${ARGS}) - ... -endfunction() -``` -#]===] - # NOTE: this function definition is copied directly to scripts/buildsystems/vcpkg.cmake # do not make changes here without making the same change there. macro(z_vcpkg_function_arguments OUT_VAR) diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake index bbe88a6db..51e0f03a9 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_get_cmake_vars.cmake @@ -1,37 +1,3 @@ -#[===[.md: -# z_vcpkg_get_cmake_vars - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -Runs a cmake configure with a dummy project to extract certain cmake variables - -## Usage -```cmake -z_vcpkg_get_cmake_vars() -``` - -`z_vcpkg_get_cmake_vars(cmake_vars_file)` sets `` to -a path to a generated CMake file, with the detected `CMAKE_*` variables -re-exported as `VCPKG_DETECTED_*`. - -## Notes -Avoid usage in portfiles. - -All calls to `z_vcpkg_get_cmake_vars` will result in the same output file; -the output file is not generated multiple times. - -## Examples - -* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) - -### Basic Usage - -```cmake -z_vcpkg_get_cmake_vars(cmake_vars_file) -include("${cmake_vars_file}") -message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CXX_FLAGS}") -``` -#]===] - function(z_vcpkg_get_cmake_vars out_file) cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake index ab12e78fe..7752d7a0c 100644 --- a/external_imported/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_prettify_command_line.cmake @@ -1,22 +1,3 @@ -#[===[.md: -# z_vcpkg_prettify_command_line - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -Turn a command line into a formatted string. - -```cmake -z_vcpkg_prettify_command_line( ...) -``` - -This command is for internal use, when printing out to a message. - -## Examples - -* `scripts/cmake/vcpkg_execute_build_process.cmake` -* `scripts/cmake/vcpkg_execute_required_process.cmake` -* `scripts/cmake/vcpkg_execute_required_process_repeat.cmake` -#]===] - function(z_vcpkg_prettify_command_line out_var) set(output_list "") z_vcpkg_function_arguments(args 1) diff --git a/external_imported/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake b/external_imported/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake new file mode 100644 index 000000000..628b71b01 --- /dev/null +++ b/external_imported/vcpkg/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake @@ -0,0 +1,47 @@ +function(z_vcpkg_setup_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BASE_DIRS") + + if(NOT DEFINED arg_BASE_DIRS OR "${arg_BASE_DIRS}" STREQUAL "") + message(FATAL_ERROR "BASE_DIRS is required.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + if(DEFINED ENV{${envvar}}) + set("z_vcpkg_env_backup_${envvar}" "$ENV{${envvar}}" PARENT_SCOPE) + else() + unset("z_vcpkg_env_backup_${envvar}" PARENT_SCOPE) + endif() + endforeach() + + vcpkg_find_acquire_program(PKGCONFIG) + get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY) + vcpkg_add_to_path("${pkgconfig_path}") + + set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/share/pkgconfig/") + endforeach() + + foreach(base_dir IN LISTS arg_BASE_DIRS) + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${base_dir}/lib/pkgconfig/") + endforeach() +endfunction() + +function(z_vcpkg_restore_pkgconfig_path) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + if(DEFINED z_vcpkg_env_backup_${envvar}) + set("ENV{${envvar}}" "${z_vcpkg_env_backup_${envvar}}") + else() + unset("ENV{${envvar}}") + endif() + endforeach() +endfunction() diff --git a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt index 23b7d64e7..ec6ea5539 100644 --- a/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt +++ b/external_imported/vcpkg/scripts/get_cmake_vars/CMakeLists.txt @@ -92,12 +92,16 @@ endforeach() macro(_vcpkg_adjust_flags flag_var) if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if("${flag_var}" STREQUAL "CMAKE_CXX_FLAGS") + string(APPEND ${flag_var} " -ZW:nostdlib") + endif() + endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) # macOS - append arch and isysroot if cross-compiling if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") - foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) string(APPEND ${flag_var} " -arch ${arch}") endforeach() @@ -113,6 +117,7 @@ endmacro() foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces _vcpkg_adjust_flags(${flag}) + string(REPLACE [[\\]] [[\]] ${flag} "${${flag}}") string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") foreach(config IN LISTS VCPKG_CONFIGS) string(STRIP "${${flag}_${config}}" ${flag}_${config}) diff --git a/external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch b/external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch new file mode 100644 index 000000000..c3666ecc9 --- /dev/null +++ b/external_imported/vcpkg/scripts/msys/compile_wrapper_consider_clang-cl.patch @@ -0,0 +1,12 @@ +diff --git a/usr/share/automake-1.16/compile b/usr/share/automake-1.16/compile +index 2078fc833..dfc946593 100755 +--- a/usr/share/automake-1.16/compile ++++ b/usr/share/automake-1.16/compile +@@ -256,6 +256,7 @@ EOF + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ ++ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; diff --git a/external_imported/vcpkg/scripts/ports.cmake b/external_imported/vcpkg/scripts/ports.cmake index 4d11521b4..4c3b9304b 100644 --- a/external_imported/vcpkg/scripts/ports.cmake +++ b/external_imported/vcpkg/scripts/ports.cmake @@ -45,6 +45,7 @@ include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") include("${SCRIPTS}/cmake/vcpkg_host_path_list.cmake") include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_copyright.cmake") include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake") @@ -61,6 +62,7 @@ include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_setup_pkgconfig_path.cmake") function(debug_message) if(PORT_DEBUG) @@ -94,7 +96,7 @@ if(PORT) set(CURRENT_PACKAGES_DIR "${PACKAGES_DIR}/${PORT}_${TARGET_TRIPLET}") endif() -if(CMD MATCHES "^BUILD$") +if(CMD STREQUAL "BUILD") set(CMAKE_TRIPLET_FILE "${TARGET_TRIPLET_FILE}") if(NOT EXISTS "${CMAKE_TRIPLET_FILE}") message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") @@ -144,11 +146,12 @@ if(CMD MATCHES "^BUILD$") include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) + if(VCPKG_FIXUP_ELF_RPATH) + include("${SCRIPTS}/cmake/z_vcpkg_fixup_rpath.cmake") + endif() include("${SCRIPTS}/build_info.cmake") endif() -elseif(CMD MATCHES "^CREATE$") - file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}" NATIVE_VCPKG_ROOT_DIR) - file(TO_NATIVE_PATH "${DOWNLOADS}" NATIVE_DOWNLOADS) +elseif(CMD STREQUAL "CREATE") if(NOT DEFINED PORT_PATH) set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") endif() diff --git a/external_imported/vcpkg/scripts/templates/portfile.in.cmake b/external_imported/vcpkg/scripts/templates/portfile.in.cmake index 3ceac93d1..91b62753b 100644 --- a/external_imported/vcpkg/scripts/templates/portfile.in.cmake +++ b/external_imported/vcpkg/scripts/templates/portfile.in.cmake @@ -29,6 +29,12 @@ # # See additional helpful variables in /docs/maintainers/vcpkg_common_definitions.md +# Also consider vcpkg_from_* functions if you can; the generated code here is for any web accessable +# source archive. +# vcpkg_from_github +# vcpkg_from_gitlab +# vcpkg_from_bitbucket +# vcpkg_from_sourceforge vcpkg_download_distfile(ARCHIVE URLS "@URL@" FILENAME "@FILENAME@" @@ -37,7 +43,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag). # REF 1.0.0 # (Optional) Read the docs for how to generate patches at: @@ -72,7 +78,8 @@ vcpkg_cmake_install() # "name": "vcpkg-cmake-config", # "host": true #} -# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) +# vcpkg_cmake_config_fixup() -# # Handle copyright -# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/@PORT@" RENAME copyright) +# Uncomment the line below if necessary to install the license file for the port +# as a file named `copyright` to the directory `${CURRENT_PACKAGES_DIR}/share/${PORT}` +# vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/external_imported/vcpkg/scripts/templates/vcpkg.json.in b/external_imported/vcpkg/scripts/templates/vcpkg.json.in index 15fcaa167..81004e8ee 100644 --- a/external_imported/vcpkg/scripts/templates/vcpkg.json.in +++ b/external_imported/vcpkg/scripts/templates/vcpkg.json.in @@ -1,6 +1,6 @@ { "name": "@PORT@", - "version-string": "", + "version": "", "homepage": "", "description": "", "dependencies": [ diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake index 7d640a194..96e204b2b 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/portfile.cmake @@ -47,29 +47,50 @@ if("cmake-3-7" IN_LIST FEATURES) list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake") endif() -set(packages "") -if("find-package" IN_LIST FEATURES) - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" vcpkg_json) - string(JSON packages_json GET "${vcpkg_json}" "features" "find-package" "dependencies") - string(JSON packages_count LENGTH "${packages_json}") - if(packages_count GREATER 0) - math(EXPR last "${packages_count} - 1") - foreach(i RANGE 0 ${last}) - string(JSON package GET "${packages_json}" ${i} "$package") - list(APPEND packages "${package}") - endforeach() - endif() - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - list(REMOVE_ITEM packages "Curses") - endif() -endif() - if(DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) set(NINJA "ninja") else() vcpkg_find_acquire_program(NINJA) endif() +if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() +endif() + +function(get_packages out_packages cmake_version) + set(packages "") + if("find-package" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" vcpkg_json) + string(JSON packages_json GET "${vcpkg_json}" "features" "find-package" "dependencies") + string(JSON packages_count LENGTH "${packages_json}") + if(packages_count GREATER 0) + math(EXPR last "${packages_count} - 1") + foreach(i RANGE 0 ${last}) + # Some ports may be excluded via platform expressions, + # because they don't support particular platforms. + # Using the installed vcpkg_abi_info.txt as an indicator. + string(JSON port GET "${packages_json}" "${i}" "name") + if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/share/${port}/vcpkg_abi_info.txt") + continue() + endif() + string(JSON since ERROR_VARIABLE since_not_found GET "${packages_json}" "${i}" "\$since") + if(since AND cmake_version VERSION_LESS since) + continue() + endif() + if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/share/${port}/vcpkg_abi_info.txt") + continue() + endif() + string(JSON package GET "${packages_json}" "${i}" "\$package") + list(APPEND packages "${package}") + endforeach() + endif() + endif() + if("pkg-check-modules" IN_LIST FEATURES) + list(APPEND packages "ZLIBviaPkgConfig") + endif() + set("${out_packages}" "${packages}" PARENT_SCOPE) +endfunction() + function(test_cmake_project) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "CMAKE_COMMAND;NAME" "OPTIONS") if(NOT arg_NAME) @@ -93,10 +114,15 @@ function(test_cmake_project) set(base_options -G "Ninja" "-DCMAKE_MAKE_PROGRAM=${NINJA}" + "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_TOOLCHAIN_FILE=${SCRIPTS}/buildsystems/vcpkg.cmake" + "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" + "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" "-DVCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" "-DCMAKE_INSTALL_PREFIX=${build_dir}/install" - "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_MANIFEST_MODE=OFF" "-DCHECK_CMAKE_VERSION=${cmake_version}" ) @@ -137,7 +163,7 @@ function(test_cmake_project) # To produce better error messages for failing wrappers, # we run execute_process directly here, for each wrapper. string(REPLACE " OFF:" ":" message - " CMake ${cmake_version}: `find_package(@package@)` failed.\n" + " CMake ${cmake_version}: @step@ with `find_package(@package@)` failed.\n" " See logs for more information:\n" " @log_out@\n" " @log_err@\n" @@ -145,6 +171,7 @@ function(test_cmake_project) if(DEFINED ENV{BUILD_REASON}) # On Azure Pipelines, add extra markup. string(REPLACE " CMake" "##vso[task.logissue type=error]CMake" message "${message}") endif() + get_packages(packages "${cmake_version}") foreach(package IN LISTS packages) string(MAKE_C_IDENTIFIER "${package}" package_string) set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}") @@ -166,8 +193,25 @@ function(test_cmake_project) WORKING_DIRECTORY "${find_package_build_dir}" ) if(package_result) + set(step "configuration") string(CONFIGURE "${message}" package_message @ONLY) message(SEND_ERROR "${package_message}") + else() + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-build-err.log") + execute_process( + COMMAND + "${arg_CMAKE_COMMAND}" --build . + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE package_result + WORKING_DIRECTORY "${find_package_build_dir}" + ) + if(package_result) + set(step "build") + string(CONFIGURE "${message}" package_message @ONLY) + message(SEND_ERROR "${package_message}") + endif() endif() endforeach() endfunction() @@ -177,14 +221,10 @@ foreach(executable IN LISTS cmake_commands) CMAKE_COMMAND "${executable}" OPTIONS "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" ) test_cmake_project(NAME "debug" CMAKE_COMMAND "${executable}" OPTIONS "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=ON" ) endforeach() diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt b/external_imported/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt index 9e74608ce..fdb213e5a 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -11,21 +11,6 @@ else() message(STATUS "CMake version check: success (actual: ${CMAKE_VERSION})") endif() -message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") -list(FIND CMAKE_PREFIX_PATH "SYSTEM_LIBS" system_libs) -list(FIND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" vcpkg) -if(system_libs LESS 0) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find SYSTEM_LIBS in CMAKE_PREFIX_PATH.)") -elseif(vcpkg LESS 0) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find vcpkg path in CMAKE_PREFIX_PATH.") -elseif(VCPKG_PREFER_SYSTEM_LIBS AND system_libs GREATER vcpkg) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are before system paths in CMAKE_PREFIX_PATH.)") -elseif(NOT VCPKG_PREFER_SYSTEM_LIBS AND system_libs LESS vcpkg) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are after system paths in CMAKE_PREFIX_PATH.)") -else() - message(STATUS "VCPKG_PREFER_SYSTEM_LIBS check: success (actual: ${VCPKG_PREFER_SYSTEM_LIBS})") -endif() - # add_library overload file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lib.c" "int lib_unused() { return 1; }") add_library(lib "${CMAKE_CURRENT_BINARY_DIR}/lib.c") @@ -44,6 +29,7 @@ install(TARGETS exe lib # find_package overload and wrapper set(FIND_PACKAGES "" CACHE STRING "List of packages to be found and used") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") foreach(package ${FIND_PACKAGES}) string(TOUPPER "${package}" package_upper) set(CMAKE_FIND_DEBUG_MODE ON) @@ -53,6 +39,8 @@ foreach(package ${FIND_PACKAGES}) message(SEND_ERROR "find_package(${package}) check: failed") continue() endif() + # REQUIRED changes the behaviour find_package_handle_standard_args. + find_package("${package}" REQUIRED) message(STATUS "find_package(${package}) check: success") set(libraries_var "") @@ -76,22 +64,32 @@ foreach(package ${FIND_PACKAGES}) endif() target_link_libraries(exe PRIVATE ${libraries}) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - string(REPLACE "debug;" "ignore:" libraries "${libraries}") - elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - string(REPLACE "optimized;" "ignore:" libraries "${libraries}") - endif() + set(last_keyword "") foreach(item IN LISTS libraries) - string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/" starts_with_vcpkg) - if(NOT starts_with_vcpkg EQUAL "0") + if(item STREQUAL "optimized" OR item STREQUAL "debug") + set(last_keyword "${item}") continue() endif() string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/" starts_with_release) string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/" starts_with_debug) - if(CMAKE_BUILD_TYPE STREQUAL "Release" AND starts_with_debug EQUAL "0") - message(SEND_ERROR "Debug lib in release build: ${item}") - elseif(CMAKE_BUILD_TYPE STREQUAL "Debug" AND starts_with_release EQUAL "0") - message(SEND_ERROR "Release lib in debug build: ${item}") + if(starts_with_release EQUAL "0") + if(last_keyword STREQUAL "optimized") + # okay + elseif(last_keyword STREQUAL "debug") + message(SEND_ERROR "Release lib for 'debug' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(SEND_ERROR "Release lib for 'Debug' build: ${item}") + endif() + elseif(starts_with_debug EQUAL "0") + if(last_keyword STREQUAL "debug") + # okay + elseif(last_keyword STREQUAL "optimized") + message(SEND_ERROR "Debug lib for 'optimized' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + message(SEND_ERROR "Debug lib for 'Release' build: ${item}") + endif() endif() + set(last_keyword "") + continue() endforeach() endforeach() diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake b/external_imported/vcpkg/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake new file mode 100644 index 000000000..5f46a943d --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake @@ -0,0 +1,11 @@ +# `pkgconf` is not recognized before CMake 3.22 +find_program(PKG_CONFIG_EXECUTABLE NAMES pkgconf REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(PC_ZLIB zlib) +if(PC_ZLIB_FOUND) + if(NOT PC_ZLIB_LDFLAGS) + message(SEND_ERROR "ZLIBviaPkgConfig_LIBRARIES is empty") + endif() + set(ZLIBviaPkgConfig_LIBRARIES "${PC_ZLIB_LDFLAGS}") + set(ZLIBviaPkgConfig_FOUND "${PC_ZLIB_FOUND}") +endif() diff --git a/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json index 73907dfdc..8b476c587 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/cmake-user/vcpkg.json @@ -1,7 +1,8 @@ { "name": "cmake-user", - "version-date": "2022-03-18", + "version-date": "2022-07-02", "description": "Test port to verify the vcpkg toolchain in cmake user projects", + "license": "MIT", "default-features": [ "ci" ], @@ -14,7 +15,8 @@ "default-features": false, "features": [ "cmake-current", - "find-package" + "find-package", + "pkg-check-modules" ] }, { @@ -40,17 +42,25 @@ "$package": "BZip2", "name": "bzip2" }, + { + "$package": "CURL", + "name": "curl", + "default-features": false + }, { "$package": "EXPAT", "name": "expat" }, { - "$package": "Freetype", - "name": "freetype" + "$package": "Fontconfig", + "$since": "3.14", + "name": "fontconfig", + "platform": "!mingw & !uwp" }, { - "$package": "ICU", - "name": "icu" + "$package": "Freetype", + "name": "freetype", + "default-features": false }, { "$package": "Intl", @@ -60,6 +70,16 @@ "$package": "GIF", "name": "giflib" }, + { + "$package": "ICU", + "name": "icu", + "platform": "!uwp" + }, + { + "$package": "Iconv", + "$since": "3.11", + "name": "libiconv" + }, { "$package": "JPEG", "name": "libjpeg-turbo" @@ -68,15 +88,57 @@ "$package": "LibLZMA", "name": "liblzma" }, + { + "$package": "PNG", + "name": "libpng" + }, + { + "$package": "PostgreSQL", + "name": "libpq", + "default-features": false, + "platform": "!uwp & !mingw" + }, + { + "$comment": "CMake 3.11 because it needs Iconv", + "$package": "LibXml2", + "$since": "3.11", + "name": "libxml2", + "default-features": false + }, + { + "$comment": "CMake 3.11 because it needs Iconv", + "$package": "LibXslt", + "$since": "3.11", + "name": "libxslt", + "default-features": false, + "platform": "!uwp & !mingw" + }, { "$package": "TIFF", - "name": "tiff" + "name": "tiff", + "default-features": false + }, + { + "$package": "wxWidgets", + "name": "wxwidgets", + "default-features": false, + "platform": "!linux & !uwp" }, { "$package": "ZLIB", "name": "zlib" } ] + }, + "pkg-check-modules": { + "description": "Test `find_package(PkgConfig)` and pkg_check_modules(...)", + "dependencies": [ + { + "name": "pkgconf", + "host": true + }, + "zlib" + ] } } } diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch b/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch new file mode 100644 index 000000000..5402a7887 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/cmake/fix-dependency-libuv.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fdfe456..ef2d329 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,16 +647,16 @@ macro (CMAKE_BUILD_UTILITIES) + #--------------------------------------------------------------------- + # Build libuv library. + if(CMAKE_USE_SYSTEM_LIBUV) +- if(WIN32) +- find_package(LibUV 1.38.0) +- else() +- find_package(LibUV 1.10.0) +- endif() +- if(NOT LIBUV_FOUND) ++ find_package(libuv CONFIG REQUIRED) ++ if(0) + message(FATAL_ERROR + "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") + endif() +- set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV) ++ if (TARGET uv) ++ set(CMAKE_LIBUV_LIBRARIES uv) ++ else() ++ set(CMAKE_LIBUV_LIBRARIES uv_a) ++ endif() + else() + set(CMAKE_LIBUV_LIBRARIES cmlibuv) + add_subdirectory(Utilities/cmlibuv) diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake index 3e7276e45..87ad4eb6d 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake +++ b/external_imported/vcpkg/scripts/test_ports/cmake/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_gitlab( SHA512 4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 HEAD_REF master + PATCHES fix-dependency-libuv.patch ) set(OPTIONS) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) diff --git a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json index 89668baef..e5de57132 100644 --- a/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/cmake/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cmake", - "version-string": "3.22.2", + "version": "3.22.2", + "port-version": 1, "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.", "homepage": "https://cmake.org/", "license": "BSD-3-Clause", diff --git a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake index d506ebaf6..c1f0e85a9 100644 --- a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -84,7 +84,7 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) return() endif() - if(NOT DEFINED "${utcve_variable}") + if(NOT DEFINED "${utcve_variable}" AND NOT "${utcve_variable}" MATCHES "^ENV\\{") message(STATUS "${utcve_test} failed to set ${utcve_variable}; expected: \"${utcve_value}\"") set_has_error() @@ -93,7 +93,6 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) if(utcve_MATCHED) - message(STATUS "utcve_variable: ${utcve_CMAKE_MATCH_2}") if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") @@ -114,6 +113,38 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) endif() endfunction() +function(unit_test_check_variable_not_equal utcve_test utcve_variable utcve_value) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + unset_fatal_error() + set_has_error() + message(STATUS "${utcve_test} had an unexpected FATAL_ERROR; + expected: \"${utcve_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcve_MATCHED) + if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") + elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcve_actual_value "$CACHE{${utcve_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcve_CMAKE_MATCH_1}") + endif() + else() + set(utcve_actual_value "${${utcve_variable}}") + endif() + + if("${utcve_actual_value}" STREQUAL "${utcve_value}") + message(STATUS "${utcve_test} failed to change ${utcve_variable}; + unchanged: \"${utcve_value}\"") + set_has_error() + return() + endif() +endfunction() + function(unit_test_ensure_success utcve_test) cmake_language(EVAL CODE "${utcve_test}") if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) @@ -139,7 +170,7 @@ endif() if("list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") endif() -if("add-to-path" IN_LIST FEATURES) +if("host-path-list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_host_path_list.cmake") endif() if("function-arguments" IN_LIST FEATURES) @@ -148,6 +179,12 @@ endif() if("merge-libs" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_cmake_config_fixup_merge.cmake") endif() +if("backup-restore-env-vars" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_backup_restore_env_vars.cmake") +endif() +if("setup-pkgconfig-path" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_setup_pkgconfig_path.cmake") +endif() if(Z_VCPKG_UNIT_TEST_HAS_ERROR) _message(FATAL_ERROR "At least one test failed") diff --git a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake new file mode 100644 index 000000000..ae010b3c6 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake @@ -0,0 +1,38 @@ +# vcpkg_backup_env_variables(VARS ) +# vcpkg_restore_env_variables(VARS ) +# These functions used scoped variables and cannot be called in unit_test_check_*. + +set(ENV{A} [[::a;::b]]) +set(ENV{B} [[]]) + +# Backup doesn't change variables. +vcpkg_backup_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Restore restores. +set(ENV{A} [[::a;::b;::c]]) +set(ENV{B} [[::1]]) +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Restore can be called more than once. +set(ENV{A} [[::a;::b;::c]]) +set(ENV{B} [[::1]]) +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Backups are scoped. +function(change_and_backup) + set(ENV{A} [[::a;::b;::c]]) + set(ENV{B} [[::1]]) + vcpkg_backup_env_variables(VARS A B) + # no further change, no restore, in this scope +endfunction() +vcpkg_backup_env_variables(VARS A B) +change_and_backup() +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) diff --git a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake index a6322d375..01d34da82 100644 --- a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake @@ -15,14 +15,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "a;b;d;e" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "a;b" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e;a;b" ) +set(var "a;b") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "a;b" @@ -33,14 +36,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "d;e" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e" ) +set(var "") unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "" @@ -51,14 +57,17 @@ unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var d e)]] var "d;e" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND var)]] var "" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var d e)]] var "d;e" ) +unset(var) unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND var)]] var "" @@ -71,55 +80,64 @@ unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a:b")]]) unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a:b")]]) set(ENV{var} "a:b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "a:b:d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "a:b" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e:a:b" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "a:b") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "a:b" ) set(ENV{var} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +set(ENV{var} "") +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "" ) unset(ENV{var}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{var})]] ENV{var} "" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] ENV{var} "d:e" ) -unit_test_check_ENV{var}iable_equal( +unset(ENV{var}) +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{var} "" ) @@ -131,64 +149,64 @@ unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{ENV{var}} "a;b")] unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{ENV{var}} "a;b")]]) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "a;b;d;e" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "a;b" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e;a;b" ) set(ENV{ENV{var}} "a;b") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] ENV{ENV{var}} "a;b" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) set(ENV{ENV{var}} "") -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{var})]] ENV{ENV{var}} "" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] ENV{ENV{var}} "d;e" ) unset(ENV{ENV{var}}) -unit_test_check_ENV{var}iable_equal( +unit_test_check_variable_equal( [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] ENV{ENV{var}} "" ) diff --git a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake new file mode 100644 index 000000000..3ae9c8657 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake @@ -0,0 +1,22 @@ +# z_vcpkg_setup_pkgconfig_path(BASE_DIR ) +# z_vcpkg_restore_pkgconfig_path() + +# These functions use vcpkg_backup/restore_env_variables which use scoped variables +# and cannot be called in unit_test_check_*. + +set(ENV{PKG_CONFIG} "/a/pkgconf") +set(ENV{PKG_CONFIG_PATH} "1") +set(saved_path "$ENV{PATH}") + +z_vcpkg_setup_pkgconfig_path(BASE_DIRS "/2") +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG} [[/a/pkgconf]]) +unit_test_check_variable_not_equal([[]] ENV{PKG_CONFIG_PATH} "1") + +z_vcpkg_restore_pkgconfig_path() +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG} [[/a/pkgconf]]) +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG_PATH} "1") + +# z_vcpkg_setup_pkgconfig_path changes PATH but it is not restored. +# It is hard to see which side effects a restore would have, so +# this is expected behaviour for now. +unit_test_check_variable_not_equal([[]] ENV{PATH} "${saved_path}") diff --git a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json index 28cacbc8f..378765428 100644 --- a/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -4,17 +4,24 @@ "description": "Ensures that the CMake scripts are unit tested.", "supports": "x64", "default-features": [ + "backup-restore-env-vars", "function-arguments", + "host-path-list", "list", - "minimum-required" + "merge-libs", + "minimum-required", + "setup-pkgconfig-path" ], "features": { - "host-path-list": { - "description": "Test the vcpkg_host_path_list function" + "backup-restore-env-vars": { + "description": "Test the vcpkg_backup/restore_env_vars functions" }, "function-arguments": { "description": "Test the z_vcpkg_function_arguments function" }, + "host-path-list": { + "description": "Test the vcpkg_host_path_list function" + }, "list": { "description": "Test the vcpkg_list function" }, @@ -29,6 +36,9 @@ }, "minimum-required": { "description": "Test the vcpkg_minimum_required function" + }, + "setup-pkgconfig-path": { + "description": "Test the z_vcpkg_setup/restore_pkgconfig_path functions" } } } diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake new file mode 100644 index 000000000..46a179430 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ARROW_LINK_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/arrow/example" + OPTIONS + -DARROW_LINK_SHARED=${ARROW_LINK_SHARED} +) +vcpkg_cmake_build() diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json new file mode 100644 index 000000000..b5e4ed345 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "vcpkg-ci-arrow", + "version-date": "2022-07-25", + "description": "Builds an example app in order to validate the arrow port.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "arrow", + "default-features": false, + "features": [ + "csv", + "example" + ] + } + ] +} diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index a95645225..eb563a511 100644 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -9,6 +9,7 @@ "name": "llvm", "default-features": false, "features": [ + "bolt", "clang", "disable-assertions", "disable-clang-static-analyzer", @@ -21,6 +22,7 @@ "enable-zlib", "lld", "lldb", + "openmp", "polly", "target-aarch64", "target-amdgpu", diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 7c4043010..83bbc51bc 100644 --- a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-ci-opencv", "version-string": "1", - "port-version": 4, + "port-version": 5, "description": "Port to force features of certain ports within CI", "homepage": "https://github.com/microsoft/vcpkg", "dependencies": [ @@ -26,7 +26,8 @@ "name": "opencv", "default-features": false, "features": [ - "gtk" + "gtk", + "dc1394" ], "platform": "linux" }, @@ -37,7 +38,6 @@ "cuda", "cudnn", "gstreamer", - "halide", "ovis", "tbb" ], diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake new file mode 100644 index 000000000..0015715fb --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json new file mode 100644 index 000000000..0d449b94a --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "vcpkg-ci-openimageio", + "version": "1", + "description": "OpenImageIO features testing within CI.", + "license": "MIT", + "dependencies": [ + { + "name": "openimageio", + "features": [ + "ffmpeg", + "freetype", + "gif", + "libraw", + "opencv", + "openjpeg", + "pybind11", + "tools", + "webp" + ] + } + ] +} diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake new file mode 100644 index 000000000..d301fa74a --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -0,0 +1,34 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS + FEATURES + wxrc USE_WXRC +) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/wxwidgets/example" + DISABLE_PARALLEL_CONFIGURE # Need separate dbg log for following test + OPTIONS + ${OPTIONS} + -DCMAKE_CONFIG_RUN=1 + "-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES" +) +vcpkg_cmake_build() + +if(NOT VCPKG_BUILD_TYPE) + # Check that debug libs are still used after re-configuration, #24489 + set(config_log "config-${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" -DCMAKE_CONFIG_RUN=2 . + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "${config_log}-2" + ) + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-out.log" expected REGEX "wxWidgets_LIBRARIES:=") + file(STRINGS "${CURRENT_BUILDTREES_DIR}/${config_log}-2-out.log" actual REGEX "wxWidgets_LIBRARIES:=") + if(NOT actual STREQUAL expected) + message(FATAL_ERROR "wxWidgets libraries changed after CMake re-run\n" + "actual:\n${actual}\n" + "expected:\n ${expected}\n" + ) + endif() +endif() diff --git a/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json new file mode 100644 index 000000000..989d47a57 --- /dev/null +++ b/external_imported/vcpkg/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "vcpkg-ci-wxwidgets", + "version-date": "2022-04-05", + "description": "Builds a GUI app in order to validate the wxwidgets port.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "wxwidgets", + "default-features": false, + "features": [ + "example" + ] + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Default features depending on system", + "dependencies": [ + { + "name": "vcpkg-ci-wxwidgets", + "default-features": false, + "features": [ + "wxrc" + ], + "platform": "native" + } + ] + }, + "wxrc": { + "description": "Test wxrc" + } + } +} diff --git a/external_imported/vcpkg/scripts/toolchains/linux.cmake b/external_imported/vcpkg/scripts/toolchains/linux.cmake index fb5666538..2fac4922d 100644 --- a/external_imported/vcpkg/scripts/toolchains/linux.cmake +++ b/external_imported/vcpkg/scripts/toolchains/linux.cmake @@ -19,6 +19,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") if(NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "arm-linux-gnueabihf-gcc") endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "arm-linux-gnueabihf-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as") + endif() message(STATUS "Cross compiling arm on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -30,6 +36,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc") endif() + if(NOT DEFINED CMAKE_ASM_COMPILER) + set(CMAKE_ASM_COMPILER "aarch64-linux-gnu-gcc") + endif() + if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) + set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as") + endif() message(STATUS "Cross compiling arm64 on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() endif() diff --git a/external_imported/vcpkg/scripts/toolchains/osx.cmake b/external_imported/vcpkg/scripts/toolchains/osx.cmake index 1ab3da5e5..56a32b669 100644 --- a/external_imported/vcpkg/scripts/toolchains/osx.cmake +++ b/external_imported/vcpkg/scripts/toolchains/osx.cmake @@ -1,18 +1,39 @@ if(NOT _VCPKG_OSX_TOOLCHAIN) set(_VCPKG_OSX_TOOLCHAIN 1) -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") - set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") -else() - set(CMAKE_SYSTEM_VERSION "17.0.0" CACHE STRING "") - set(CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "") -endif() set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "") set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "") + else() + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") + endif() +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 macOS can run x64 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") diff --git a/external_imported/vcpkg/scripts/toolchains/uwp.cmake b/external_imported/vcpkg/scripts/toolchains/uwp.cmake new file mode 100644 index 000000000..9e76d4512 --- /dev/null +++ b/external_imported/vcpkg/scripts/toolchains/uwp.cmake @@ -0,0 +1,93 @@ +if(NOT _VCPKG_WINDOWS_TOOLCHAIN) +set(_VCPKG_WINDOWS_TOOLCHAIN 1) +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") + +set(CMAKE_SYSTEM_NAME WindowsStore CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + +get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) +if(NOT _CMAKE_IN_TRY_COMPILE) + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MD") + elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(VCPKG_CRT_LINK_FLAG_PREFIX "/MT") + else() + message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"") + endif() + + set(_vcpkg_charset "/utf-8") + if (NOT VCPKG_SET_CHARSET_FLAG OR VCPKG_PLATFORM_TOOLSET MATCHES "v120") + # VS 2013 does not support /utf-8 + set(_vcpkg_charset "") + 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") + #/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 + + set(CMAKE_CXX_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_CXX_FLAGS}" CACHE STRING "") + set(CMAKE_C_FLAGS "${_vcpkg_cpp_flags} ${_vcpkg_common_flags} ${_vcpkg_winmd_flag} ${_vcpkg_charset} ${VCPKG_C_FLAGS}" CACHE STRING "") + set(CMAKE_RC_FLAGS "-c65001 ${_vcpkg_cpp_flags}" CACHE STRING "") + + unset(_vcpkg_charset) + unset(_vcpkg_cpp_flags) + unset(_vcpkg_common_flags) + unset(_vcpkg_winmd_flag) + + set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "") + set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /RTC1 ${VCPKG_CRT_LINK_FLAG_PREFIX}d ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "") + + set(CMAKE_CXX_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_CXX_FLAGS_RELEASE}" CACHE STRING "") # VS adds /GL + set(CMAKE_C_FLAGS_RELEASE "/Gy /O2 /Oi /DNDEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX} ${VCPKG_C_FLAGS_RELEASE}" CACHE STRING "") + + 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 + endif() + string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}") + # 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} ${VCPKG_LINKER_FLAGS_RELEASE}") + + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") + string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ") + string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT " /nologo ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_DEBUG} ") +endif() +endif() diff --git a/external_imported/vcpkg/scripts/toolchains/windows.cmake b/external_imported/vcpkg/scripts/toolchains/windows.cmake index 954f95535..7c8a54989 100644 --- a/external_imported/vcpkg/scripts/toolchains/windows.cmake +++ b/external_imported/vcpkg/scripts/toolchains/windows.cmake @@ -2,6 +2,38 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN) set(_VCPKG_WINDOWS_TOOLCHAIN 1) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>$<$:DLL>" CACHE STRING "") +set(CMAKE_SYSTEM_NAME Windows CACHE STRING "") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "") +endif() + +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") + # any of the four platforms can run x86 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 can run binaries of any of the four platforms after Windows 11 + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) diff --git a/external_imported/vcpkg/scripts/vcpkgTools.xml b/external_imported/vcpkg/scripts/vcpkgTools.xml index c3b545910..39863e6c9 100644 --- a/external_imported/vcpkg/scripts/vcpkgTools.xml +++ b/external_imported/vcpkg/scripts/vcpkgTools.xml @@ -1,32 +1,39 @@ - 3.10.2 + 3.10.5 python.exe - https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip - d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 - python-3.10.2-embed-win32.zip + https://www.python.org/ftp/python/3.10.5/python-3.10.5-embed-win32.zip + 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f + python-3.10.5-embed-win32.zip + + + 3.10.5 + tools\python.exe + https://www.nuget.org/api/v2/package/python/3.10.5 + be225985a23b685939ff6cb134fbe29b8fd6683cd6695753fc10ef4784dcc412fc98aa2dedca902cf0be5393dfd97724ea88331cda1bcd4b86a839e9d699de7d + python-3.10.5.nupkg.zip - 3.22.2 - cmake-3.22.2-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip - 969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79 - cmake-3.22.2-windows-i386.zip + 3.24.0 + cmake-3.24.0-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-windows-i386.zip + 0188bed2fea4b40b88c63cd4edbfa1e71f26518286c66ab8719435c6fc0a5d7582a94cdf348c4026bd619292c70247437ff84093abd396d749d438b732b4c6bb + cmake-3.24.0-windows-i386.zip - 3.22.2 - cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz - 08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac - cmake-3.22.2-macos-universal.tar.gz + 3.24.0 + cmake-3.24.0-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-macos-universal.tar.gz + c1480fdc1c28a61ea3979c0a5e58a7cf77ecb8f4797d8b2e605883612fb9681943e3490ebb38b0808e4480c33529e1d8628e7bf860e24874d4e41919cc078ad2 + cmake-3.24.0-macos-universal.tar.gz - 3.22.2 - cmake-3.22.2-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz - 579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b - cmake-3.22.2linux-x86_64.tar.gz + 3.24.0 + cmake-3.24.0-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.tar.gz + 8eb604b80ee6c771d43cc3e430b2a1065319167cb4913258147482d6ef8d6b83ff4451e3173b0ce6e0546a35d6731f334a72479855abe1958b25678cafda21d0 + cmake-3.24.0-linux-x86_64.tar.gz 3.20.4 @@ -88,29 +95,47 @@ 1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 + + + 0.11.0 + coscli-windows.exe + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe + 38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06 + + + 0.11.0 + coscli-linux + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux + 9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924 + + + 0.11.0 + coscli-mac + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac + 9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db - 3.1.81 + 4.4.0 QtInstallerFramework-win-x86\bin\installerbase.exe - https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip - 1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73 - QtInstallerFramework-win-x86.zip + https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip + fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947 + installer-framework-opensource-src-4.4.0.zip 21.07 @@ -169,31 +194,31 @@ ninja-freebsd-1.8.2.zip - 7.2.1 + 7.2.6 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x86.zip - f7a1d7de59c9400ee7d4f988a35daf6f52aef3206a9de9948e5f8d81b7e838301e07491b9cab417fc58f9fd2eb28773175e86a06158ae868c7ef076cc4be7882 - PowerShell-7.2.1-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x86.zip + 4b444e0d5de22380e47701c190cb8ec9464a14a7ca566bcb8a936f723d58571af537d0d872f788dac99e67b27a047ce53de3fe1a986967799c10ea6784dbd6b2 + PowerShell-7.2.6-win-x86.zip - 16.12.0 - node-v16.12.0-win-x64\node.exe - https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z - 0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023fb7068ed1f8a7678e446260c3db3537fa888 - node-v16.12.0-win-x64.7z + 16.15.1 + node-v16.15.1-win-x64\node.exe + https://nodejs.org/dist/v16.15.1/node-v16.15.1-win-x64.7z + 7ec4bfe2ea6034e1461e306b6372d62c0c5d1060c453ba76a73a5cec38ac26b5952a744caa9071455329caa58eb0a96d26c68854c8915c17610ff27b0cf2c1cf + node-v16.15.1-win-x64.7z - 16.12.0 - node-v16.12.0-linux-x64/bin/node - https://nodejs.org/dist/v16.12.0/node-v16.12.0-linux-x64.tar.gz - 45658083c35c13f2bc4b88d68a12c76213bdaf2235776e041c9937ce912a83cb49d655965568c99a5e139ff5c03b1e460c13ad8ab7f0c5570b531907715f6e0f - node-v16.12.0-linux-x64.tar.gz + 16.15.1 + node-v16.15.1-linux-x64/bin/node + https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.gz + 5ad3b4b9caeaa8d31503efa99f5a593118a267dec9d4181d019732126ba248ce9a901207115b3f6b899eb5b3f0373c7f77ea95cc92ac625cddf437ee9b8b8919 + node-v16.15.1-linux-x64.tar.gz - 16.12.0 - node-v16.12.0-darwin-x64/bin/node - https://nodejs.org/dist/v16.12.0/node-v16.12.0-darwin-x64.tar.gz - f758a90d3dcc3adf296abbed01b69a3a27e63c2085b7f604d83550714b1ac374f36e73fc02dd31bf60e532205d92e1605a05b35642142d20ac07c4bb98c69f70 - node-v16.12.0-darwin-x64.tar.gz + 16.15.1 + node-v16.15.1-darwin-x64/bin/node + https://nodejs.org/dist/v16.15.1/node-v16.15.1-darwin-x64.tar.gz + 90d0612bbe5467b6cf385c91a68b8daad0057e3e0ccacea44567f5b95b14f7481cb79784185ab1463b4bd990e092ff0f9109576d1a1934b84e1c816582929611 + node-v16.15.1-darwin-x64.tar.gz diff --git a/external_imported/vcpkg/triplets/community/wasm32-emscripten.cmake b/external_imported/vcpkg/triplets/community/wasm32-emscripten.cmake index 2394e1227..ece5d8a22 100644 --- a/external_imported/vcpkg/triplets/community/wasm32-emscripten.cmake +++ b/external_imported/vcpkg/triplets/community/wasm32-emscripten.cmake @@ -1,10 +1,19 @@ -set(VCPKG_ENV_PASSTHROUGH EMSDK PATH) +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED EMSCRIPTEN_ROOT EMSDK PATH) -if(NOT DEFINED ENV{EMSDK}) - message(FATAL_ERROR "The EMSDK environment variable must be defined") +if(NOT DEFINED ENV{EMSCRIPTEN_ROOT}) + find_path(EMSCRIPTEN_ROOT "emcc") +else() + set(EMSCRIPTEN_ROOT "$ENV{EMSCRIPTEN_ROOT}") endif() -if(NOT EXISTS $ENV{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake) +if(NOT EMSCRIPTEN_ROOT) + if(NOT DEFINED ENV{EMSDK}) + message(FATAL_ERROR "The emcc compiler not found in PATH") + endif() + set(EMSCRIPTEN_ROOT "$ENV{EMSDK}/upstream/emscripten") +endif() + +if(NOT EXISTS "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") message(FATAL_ERROR "Emscripten.cmake toolchain file not found") endif() @@ -12,4 +21,4 @@ set(VCPKG_TARGET_ARCHITECTURE wasm32) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Emscripten) -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE $ENV{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake) +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") diff --git a/external_imported/vcpkg/triplets/community/x64-linux-dynamic.cmake b/external_imported/vcpkg/triplets/community/x64-linux-dynamic.cmake new file mode 100644 index 000000000..abccb40b1 --- /dev/null +++ b/external_imported/vcpkg/triplets/community/x64-linux-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + +set(VCPKG_FIXUP_ELF_RPATH ON) diff --git a/external_imported/vcpkg/versions/7-/7zip.json b/external_imported/vcpkg/versions/7-/7zip.json index 49dd64b19..33107cc50 100644 --- a/external_imported/vcpkg/versions/7-/7zip.json +++ b/external_imported/vcpkg/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15ce7b0d1812f8640e74075ca9f5e3a08b3bc875", + "version": "22.0", + "port-version": 0 + }, { "git-tree": "d60561160384264eaf45a225dcb41beccb87ecbc", "version-string": "21.07", diff --git a/external_imported/vcpkg/versions/a-/ableton.json b/external_imported/vcpkg/versions/a-/ableton.json new file mode 100644 index 000000000..1812776ca --- /dev/null +++ b/external_imported/vcpkg/versions/a-/ableton.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "70d81e7e966f983af654d779a02817d89eacea3b", + "version": "3.0.5", + "port-version": 1 + }, + { + "git-tree": "bac28c4912d6fd4e32ad716ec8bf4e197c9a4cb8", + "version": "3.0.5", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/abseil.json b/external_imported/vcpkg/versions/a-/abseil.json index 5b24f90a9..0bbb1845e 100644 --- a/external_imported/vcpkg/versions/a-/abseil.json +++ b/external_imported/vcpkg/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c569c0e44beca0b94d5a2d52a24e3a91868550ae", + "version-string": "20220623.1", + "port-version": 0 + }, { "git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a", "version-string": "20211102.1", diff --git a/external_imported/vcpkg/versions/a-/ace.json b/external_imported/vcpkg/versions/a-/ace.json index b9dd64eba..7b07ce61b 100644 --- a/external_imported/vcpkg/versions/a-/ace.json +++ b/external_imported/vcpkg/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a22887d1c18c9aa6dddf95aecf25c7595d071ca3", + "version": "7.0.8", + "port-version": 0 + }, { "git-tree": "d20fc0a9eac1744ff9fb5c5427eade58234e35c9", "version": "7.0.6", diff --git a/external_imported/vcpkg/versions/a-/activemq-cpp.json b/external_imported/vcpkg/versions/a-/activemq-cpp.json index 4869266c2..6403895d7 100644 --- a/external_imported/vcpkg/versions/a-/activemq-cpp.json +++ b/external_imported/vcpkg/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e", + "version-semver": "3.9.5", + "port-version": 9 + }, { "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682", "version-semver": "3.9.5", diff --git a/external_imported/vcpkg/versions/a-/air-ctl.json b/external_imported/vcpkg/versions/a-/air-ctl.json new file mode 100644 index 000000000..ab32921e1 --- /dev/null +++ b/external_imported/vcpkg/versions/a-/air-ctl.json @@ -0,0 +1,34 @@ +{ + "versions": [ + { + "git-tree": "334287af2a9a10d76ce270d72f4df58e5ddc7434", + "version": "1.1.2", + "port-version": 1 + }, + { + "git-tree": "7ba95e186d0f375425730cf877027e7e3b9961b1", + "version": "1.1.2", + "port-version": 0 + }, + { + "git-tree": "9d82351b11318cc51aac7ad71e56cef49c83361b", + "version": "1.1.1", + "port-version": 0 + }, + { + "git-tree": "a0f9e096458b1d0a77995acdffca30c15466592e", + "version": "1.1.0", + "port-version": 0 + }, + { + "git-tree": "f903c4c9124f693bab3174cca9bba73ed068bbb4", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "7f997c28da50f2d8c86639da2c7beab3a00189ce", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/aixlog.json b/external_imported/vcpkg/versions/a-/aixlog.json index 203715084..6fa24783c 100644 --- a/external_imported/vcpkg/versions/a-/aixlog.json +++ b/external_imported/vcpkg/versions/a-/aixlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd7db7eb82342728ee7a0e93ce1d446d834232c2", + "version": "1.5.0", + "port-version": 1 + }, { "git-tree": "ca812db174980bd0007da672c5ec4dd52134bf73", "version-semver": "1.5.0", diff --git a/external_imported/vcpkg/versions/a-/akali.json b/external_imported/vcpkg/versions/a-/akali.json index 210ecf510..4d9c7e16a 100644 --- a/external_imported/vcpkg/versions/a-/akali.json +++ b/external_imported/vcpkg/versions/a-/akali.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a0090858a22905c2856b8796f852d1a403081be7", + "version": "1.43", + "port-version": 1 + }, + { + "git-tree": "5e97f0348cd1def4c594fda413436a01609923ec", + "version": "1.43", + "port-version": 0 + }, { "git-tree": "44ab167f077406e598eb19f7e48f10b638bc1547", "version-string": "1.42", diff --git a/external_imported/vcpkg/versions/a-/alpaca.json b/external_imported/vcpkg/versions/a-/alpaca.json new file mode 100644 index 000000000..402a7fdb9 --- /dev/null +++ b/external_imported/vcpkg/versions/a-/alpaca.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d8a880634d8e1b510b01820aea947721639c0d14", + "version": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/alpaka.json b/external_imported/vcpkg/versions/a-/alpaka.json new file mode 100644 index 000000000..c78787d92 --- /dev/null +++ b/external_imported/vcpkg/versions/a-/alpaka.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fa2a5d53283561fed784514fd0063badc589eb39", + "version": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/ampl-mp.json b/external_imported/vcpkg/versions/a-/ampl-mp.json index f10ce12ea..15bbff6a2 100644 --- a/external_imported/vcpkg/versions/a-/ampl-mp.json +++ b/external_imported/vcpkg/versions/a-/ampl-mp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3bdafa2896aad8990e3886bdd83b8cd5538e7ea", + "version-date": "2020-11-11", + "port-version": 3 + }, { "git-tree": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef", "version-string": "2020-11-11", diff --git a/external_imported/vcpkg/versions/a-/angelscript.json b/external_imported/vcpkg/versions/a-/angelscript.json index e94a026e7..fbd7d6637 100644 --- a/external_imported/vcpkg/versions/a-/angelscript.json +++ b/external_imported/vcpkg/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f2a9b2d8cad46707e241ac52565fa50656c0dad", + "version": "2.35.1", + "port-version": 1 + }, { "git-tree": "342bbf5e5b2f9492dc70589d4f73b9ee2990f6d4", "version": "2.35.1", diff --git a/external_imported/vcpkg/versions/a-/angle.json b/external_imported/vcpkg/versions/a-/angle.json index 054aab9b9..942f5ceca 100644 --- a/external_imported/vcpkg/versions/a-/angle.json +++ b/external_imported/vcpkg/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6", + "version-string": "chromium_4472", + "port-version": 3 + }, { "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f", "version-string": "chromium_4472", diff --git a/external_imported/vcpkg/versions/a-/antlr4.json b/external_imported/vcpkg/versions/a-/antlr4.json index c256005fb..7497f91e7 100644 --- a/external_imported/vcpkg/versions/a-/antlr4.json +++ b/external_imported/vcpkg/versions/a-/antlr4.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "77ce1d5e7b1ea96943b3917086e1b75d50ae903c", + "version": "4.10.1", + "port-version": 0 + }, + { + "git-tree": "6a716f472a0639199a0a843a64795a88a39f5dee", + "version": "4.9.3", + "port-version": 2 + }, { "git-tree": "0a3fbd320c22b3c017fe13fb4cac5fe330c0df99", "version": "4.9.3", diff --git a/external_imported/vcpkg/versions/a-/anyrpc.json b/external_imported/vcpkg/versions/a-/anyrpc.json index 62639f3f0..d1cfc15bc 100644 --- a/external_imported/vcpkg/versions/a-/anyrpc.json +++ b/external_imported/vcpkg/versions/a-/anyrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e257a3e62f570c677889ee84e28b96536159e324", + "version-date": "2021-08-24", + "port-version": 1 + }, { "git-tree": "5f4ca4180fb5021b85ae6d4c5ad7b7e15f89b367", "version-date": "2021-08-24", diff --git a/external_imported/vcpkg/versions/a-/aom.json b/external_imported/vcpkg/versions/a-/aom.json index 09f2625b8..39f282cdf 100644 --- a/external_imported/vcpkg/versions/a-/aom.json +++ b/external_imported/vcpkg/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f251779a2df24b29eac37690d2692fda395218dd", + "version-semver": "3.2.0", + "port-version": 3 + }, { "git-tree": "013d95ace27d59d663acada0264327bf5382308c", "version-semver": "3.2.0", diff --git a/external_imported/vcpkg/versions/a-/apr-util.json b/external_imported/vcpkg/versions/a-/apr-util.json index 7eaa48d20..e71d874ad 100644 --- a/external_imported/vcpkg/versions/a-/apr-util.json +++ b/external_imported/vcpkg/versions/a-/apr-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e11acd0b01edac0a064893b89bd9eb2d976f4371", + "version": "1.6.1", + "port-version": 8 + }, { "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629", "version": "1.6.1", diff --git a/external_imported/vcpkg/versions/a-/apr.json b/external_imported/vcpkg/versions/a-/apr.json index d1baaa282..22d2fcf8f 100644 --- a/external_imported/vcpkg/versions/a-/apr.json +++ b/external_imported/vcpkg/versions/a-/apr.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9", + "version": "1.7.0", + "port-version": 11 + }, + { + "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da", + "version": "1.7.0", + "port-version": 10 + }, + { + "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514", + "version": "1.7.0", + "port-version": 9 + }, + { + "git-tree": "9fd8035a5cce96ad1b89000ac34431551ca39458", + "version": "1.7.0", + "port-version": 8 + }, { "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/a-/apsi.json b/external_imported/vcpkg/versions/a-/apsi.json index 991bf7ddc..c5504a33c 100644 --- a/external_imported/vcpkg/versions/a-/apsi.json +++ b/external_imported/vcpkg/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbe91971ef248ba844e254d91cbd73ad10fbe131", + "version-semver": "0.8.2", + "port-version": 0 + }, { "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03", "version-semver": "0.7.0", diff --git a/external_imported/vcpkg/versions/a-/argh.json b/external_imported/vcpkg/versions/a-/argh.json index a66b81ef4..0eea92559 100644 --- a/external_imported/vcpkg/versions/a-/argh.json +++ b/external_imported/vcpkg/versions/a-/argh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ee3072431f9d1aa18b5810e61398b9373fdc0d7", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "09027cc8017226ec7710f564346b5c0bff9e69aa", "version-string": "2018-12-18", diff --git a/external_imported/vcpkg/versions/a-/argon2.json b/external_imported/vcpkg/versions/a-/argon2.json new file mode 100644 index 000000000..c13b5d118 --- /dev/null +++ b/external_imported/vcpkg/versions/a-/argon2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3a15f9b44e7ae1ef03f6f92a5552bc85951fd3a1", + "version": "20190702", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/argparse.json b/external_imported/vcpkg/versions/a-/argparse.json index accdedbe5..4f2083cf4 100644 --- a/external_imported/vcpkg/versions/a-/argparse.json +++ b/external_imported/vcpkg/versions/a-/argparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3bf81ce931b3f8abadb45bd70389073d703af8a", + "version": "2.8", + "port-version": 0 + }, { "git-tree": "928e03159c73294a2e6623d330ea1567190d753f", "version": "2.2", diff --git a/external_imported/vcpkg/versions/a-/aricpp.json b/external_imported/vcpkg/versions/a-/aricpp.json index 728221b15..745be2469 100644 --- a/external_imported/vcpkg/versions/a-/aricpp.json +++ b/external_imported/vcpkg/versions/a-/aricpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4c60d911e60c041e3e7791a84894a1c028a7e85", + "version-semver": "1.1.2", + "port-version": 0 + }, { "git-tree": "266bfd31b17badea05be9f9859b0ce84f4d9f60e", "version-semver": "1.1.1", diff --git a/external_imported/vcpkg/versions/a-/armadillo.json b/external_imported/vcpkg/versions/a-/armadillo.json index 395d93271..02163cc40 100644 --- a/external_imported/vcpkg/versions/a-/armadillo.json +++ b/external_imported/vcpkg/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bc853e4132b3e2f8c13fa5cfc21030daa6d10a", + "version": "11.2.3", + "port-version": 0 + }, { "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", "version": "10.6.2", diff --git a/external_imported/vcpkg/versions/a-/arrayfire.json b/external_imported/vcpkg/versions/a-/arrayfire.json index 59f07bb59..c494abce8 100644 --- a/external_imported/vcpkg/versions/a-/arrayfire.json +++ b/external_imported/vcpkg/versions/a-/arrayfire.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9ce1cae30cfcfd85b9858f5f46a59136cce97e59", + "version-semver": "3.8.0", + "port-version": 2 + }, + { + "git-tree": "137eb0d15f469e75ad3255cf1de871d83b3dff49", + "version-semver": "3.8.0", + "port-version": 1 + }, { "git-tree": "e6c5e8b4e1c52380ebd2050683a185c44a2dbae4", "version-semver": "3.8.0", diff --git a/external_imported/vcpkg/versions/a-/arrow.json b/external_imported/vcpkg/versions/a-/arrow.json index 66bc46896..9c9f29ed9 100644 --- a/external_imported/vcpkg/versions/a-/arrow.json +++ b/external_imported/vcpkg/versions/a-/arrow.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "757fb3dc2404c152b9628f324087a761070406c4", + "version": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "d53797d201548a07be19eaf7d12d87198c458636", + "version": "8.0.1", + "port-version": 1 + }, + { + "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a", + "version": "8.0.1", + "port-version": 0 + }, + { + "git-tree": "4334074d163357f9002145ca722dc8dbcc546dbc", + "version": "8.0.0", + "port-version": 0 + }, + { + "git-tree": "9beefb8449a167f6dbcbe35a2bd2b7d3cb2889a2", + "version": "7.0.0", + "port-version": 3 + }, { "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4", "version": "7.0.0", diff --git a/external_imported/vcpkg/versions/a-/ashes.json b/external_imported/vcpkg/versions/a-/ashes.json index 62c56ba64..d8c48afc4 100644 --- a/external_imported/vcpkg/versions/a-/ashes.json +++ b/external_imported/vcpkg/versions/a-/ashes.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f87e3684259242b878a7ab5617dd0350a6565a15", + "version-date": "2022-06-08", + "port-version": 0 + }, + { + "git-tree": "96b165dc0ea6c62aeabea274f6833c55feaccdd1", + "version-date": "2022-04-03", + "port-version": 1 + }, { "git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469", "version-date": "2022-04-03", diff --git a/external_imported/vcpkg/versions/a-/asio-grpc.json b/external_imported/vcpkg/versions/a-/asio-grpc.json index 86b491f9a..2b240bb0e 100644 --- a/external_imported/vcpkg/versions/a-/asio-grpc.json +++ b/external_imported/vcpkg/versions/a-/asio-grpc.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "83bc5845eda6123bd774834bd5f105294720fef2", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "f4cbd771c2f7eb1d18b71df82696cb23292370fe", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "3f73fa275b5f4d19d244b7212b8c7ae61135fc95", + "version": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "6decc4befbc311b08e2229bf58da567d8a86561c", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "56b29ba569fb72539675ca51ecf3c83fcf8eb0ba", "version": "1.5.1", diff --git a/external_imported/vcpkg/versions/a-/asio.json b/external_imported/vcpkg/versions/a-/asio.json index 8ff066eac..3376212f6 100644 --- a/external_imported/vcpkg/versions/a-/asio.json +++ b/external_imported/vcpkg/versions/a-/asio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bba8740d419878e427c71f076d569f8a26833c6b", + "version": "1.24.0", + "port-version": 0 + }, + { + "git-tree": "029bab0230676c0a38979db2b89076983401e553", + "version": "1.23.0", + "port-version": 0 + }, { "git-tree": "fbf8b87b680829fee5a422169f3d73df4392d8cf", "version": "1.22.1", diff --git a/external_imported/vcpkg/versions/a-/asiosdk.json b/external_imported/vcpkg/versions/a-/asiosdk.json index 087591c2f..b5f3f1c86 100644 --- a/external_imported/vcpkg/versions/a-/asiosdk.json +++ b/external_imported/vcpkg/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473", + "version": "2.3.3", + "port-version": 5 + }, { "git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8", "version": "2.3.3", diff --git a/external_imported/vcpkg/versions/a-/assimp.json b/external_imported/vcpkg/versions/a-/assimp.json index a8986e751..a150b0743 100644 --- a/external_imported/vcpkg/versions/a-/assimp.json +++ b/external_imported/vcpkg/versions/a-/assimp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bdd963b2ef327bf5e8533689aff4707226e22851", + "version": "5.2.5", + "port-version": 0 + }, + { + "git-tree": "28eaf490bb2eaaf52c344b8e8dc16d4619cb863e", + "version": "5.2.4", + "port-version": 0 + }, { "git-tree": "cab54d6dedc48fcb9642f5fbe079e61105405543", "version-string": "5.0.1", diff --git a/external_imported/vcpkg/versions/a-/atk.json b/external_imported/vcpkg/versions/a-/atk.json index 9d9460584..e55c6283e 100644 --- a/external_imported/vcpkg/versions/a-/atk.json +++ b/external_imported/vcpkg/versions/a-/atk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e6aebc3163947c210e176a1e9ab0ddd1c6c7d0bf", + "version": "2.38.0", + "port-version": 2 + }, + { + "git-tree": "4034b57da4c9eeb30d6904339be721b7e45f8a89", + "version": "2.38.0", + "port-version": 1 + }, + { + "git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356", + "version": "2.38.0", + "port-version": 0 + }, { "git-tree": "15723fa24f08f04e859253b16f5cbc05529d10cf", "version": "2.36.0", diff --git a/external_imported/vcpkg/versions/a-/atkmm.json b/external_imported/vcpkg/versions/a-/atkmm.json index 7f0ed6774..18d71ff6f 100644 --- a/external_imported/vcpkg/versions/a-/atkmm.json +++ b/external_imported/vcpkg/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0bad5eb22d4affecd3eb08be801a8692b5704c6", + "version": "2.36.1", + "port-version": 0 + }, { "git-tree": "bd4ca61c3b3fcfbadf494e019aa13a659eeff930", "version": "2.36.0", diff --git a/external_imported/vcpkg/versions/a-/aubio.json b/external_imported/vcpkg/versions/a-/aubio.json index 540f6d7ea..11156e198 100644 --- a/external_imported/vcpkg/versions/a-/aubio.json +++ b/external_imported/vcpkg/versions/a-/aubio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "511a11ecdc92221bcde518ad98f22512788a07a4", + "version-semver": "0.4.9", + "port-version": 9 + }, + { + "git-tree": "4888190139ae3bd7f3fdb15f79453b25f59a45f5", + "version-semver": "0.4.9", + "port-version": 8 + }, { "git-tree": "b7115b787e5f71bf65454f4c3cff3ec85b4eb264", "version-semver": "0.4.9", diff --git a/external_imported/vcpkg/versions/a-/avisynthplus.json b/external_imported/vcpkg/versions/a-/avisynthplus.json index eeb574694..feb78b21b 100644 --- a/external_imported/vcpkg/versions/a-/avisynthplus.json +++ b/external_imported/vcpkg/versions/a-/avisynthplus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "10f62c32226c4f588e4524ebe1ffc36a2ad2165a", + "version": "3.7.2", + "port-version": 1 + }, + { + "git-tree": "e3749b45c163c78cdd03a7e47223634ba17ab58f", + "version-semver": "3.7.2", + "port-version": 0 + }, { "git-tree": "a585670d79213148e938d9f3ea7d2ccb1c784f2c", "version-semver": "3.7.0", diff --git a/external_imported/vcpkg/versions/a-/aws-c-common.json b/external_imported/vcpkg/versions/a-/aws-c-common.json index 6add7a56c..cb690deee 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-common.json +++ b/external_imported/vcpkg/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f38081d38190d2b787b38df2ffe3804fea7746b", + "version": "0.6.20", + "port-version": 0 + }, { "git-tree": "56b4972c2535a4e8991826b6c595e433b0e80bf9", "version": "0.6.9", diff --git a/external_imported/vcpkg/versions/a-/aws-c-io.json b/external_imported/vcpkg/versions/a-/aws-c-io.json index 1ea423119..6f1ff5397 100644 --- a/external_imported/vcpkg/versions/a-/aws-c-io.json +++ b/external_imported/vcpkg/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dc402977f4ed08054b2661b89a211064005e280", + "version": "0.10.22", + "port-version": 0 + }, { "git-tree": "7456b996bdeeeeb59fb39770d797fa2966d0a951", "version": "0.10.7", diff --git a/external_imported/vcpkg/versions/a-/azmq.json b/external_imported/vcpkg/versions/a-/azmq.json index 350ac34d5..d29dbb586 100644 --- a/external_imported/vcpkg/versions/a-/azmq.json +++ b/external_imported/vcpkg/versions/a-/azmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c4381f52a268bbf8084db2b1684ad740d3e4408", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "a82754fa9f38845c88912eb424dbfc718a155fe7", "version-string": "2020-03-03", diff --git a/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json b/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json index ea11d2ee5..d140703f8 100644 --- a/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json +++ b/external_imported/vcpkg/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bfbac018e320a4f8d18aba279855bebd798e74f", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814", "version-date": "2022-01-21", diff --git a/external_imported/vcpkg/versions/a-/azure-core-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-cpp.json index 016f38ece..d4fefb601 100644 --- a/external_imported/vcpkg/versions/a-/azure-core-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-core-cpp.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "5c0aaa2cef20a29b4e141758ed3fcce954449d1b", + "version-semver": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "e17b1885416ae07365e86acec91312d7318cc305", + "version-semver": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "677fc287c3ba4d9a3582498071e1d14d5632e48f", + "version-semver": "1.7.0", + "port-version": 0 + }, + { + "git-tree": "5b920c224b5fa4daa427701a123bdf213dac8c43", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "8940f6b17c33b8076e08c931fcf2ccdafa2fe2f2", "version-semver": "1.5.0", diff --git a/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json new file mode 100644 index 000000000..18ef57de3 --- /dev/null +++ b/external_imported/vcpkg/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "c6c807cb48e2dcdd3ed49e058822402cf1c71d79", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "e0228c8ec49e7dbde7c7044c915945425ce5092d", + "version-semver": "1.0.0-beta.2", + "port-version": 1 + }, + { + "git-tree": "4113db6be129830ea748465ca56fcb75e6ef4a31", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json index 0aaefe2b3..8e78daac4 100644 --- a/external_imported/vcpkg/versions/a-/azure-identity-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6012ea56bf0a94eba27f56156e5f45fda7a34cf", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "f6de8ed7d7b299df5cee8483a4f84cb07dd57b1c", "version-semver": "1.2.0", diff --git a/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json b/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json index 3953986f7..f1a5b978a 100644 --- a/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json +++ b/external_imported/vcpkg/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a47653f79ed3d0017784d96142716554dd4de95", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", "version-date": "2022-01-21", diff --git a/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json index 697ef92ba..3f36992b5 100644 --- a/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8293ab6b738d343991db9a759a62cac032f84d20", + "version-semver": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "e0a46382e8a741a311e07f21ffd28ebb654c32ea", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, + { + "git-tree": "e69adb1c996c0ae3b5bde53d32f619c51d0b95a5", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "9b6b2e71b9d94791a1481a40367fc5ec5607b8aa", "version-semver": "1.0.0-beta.1", diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json index caf536d42..6f5ae12e3 100644 --- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c24da36700f623cd4c2242dcd6a7dae58673a97c", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "bbaebc2afcade7b67f33d7d62ec680aaa0b3700d", "version-semver": "4.0.0-beta.2", diff --git a/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json b/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json index 37bae1323..801b25dc9 100644 --- a/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8129639c271f03d256499116ce6f6572ba11eb87", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "c977a0be18a1e5f8591268d35b0a221ef9e8f7f9", "version-semver": "4.0.0-beta.2", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json index 1fb64da97..ba2990934 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "06433ca908b304e85f642fc3b062db522567bd7c", + "version-semver": "12.6.1", + "port-version": 0 + }, + { + "git-tree": "c715b7df779d48070ba729fd20ffcad27267a7bc", + "version-semver": "12.6.0", + "port-version": 0 + }, + { + "git-tree": "7120a5be966cbf0a79ac6c1efca6ce43c7818d75", + "version-semver": "12.5.0", + "port-version": 0 + }, { "git-tree": "ff9783605f383c1f596ada3a10d2dde88a931f56", "version-semver": "12.4.0", diff --git a/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json b/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json index c62ed9753..e4dbb5378 100644 --- a/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json +++ b/external_imported/vcpkg/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86ad9dc004e0f6fe2a87158ae3aae15bf7bb7033", + "version-semver": "12.3.0", + "port-version": 0 + }, + { + "git-tree": "fdc5c496fd571985967a900838e181cdb04d318b", + "version-semver": "12.2.4", + "port-version": 0 + }, { "git-tree": "c972f7321758abde4e5d5862c4abd7398f1f26a6", "version-semver": "12.2.3", diff --git a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json index 3684f2796..0d039376f 100644 --- a/external_imported/vcpkg/versions/a-/azure-uamqp-c.json +++ b/external_imported/vcpkg/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42efba430e30e78eaf72b03c94f8c4afe07bcfda", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", "version-date": "2022-01-21", diff --git a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json index e7cf5ca1a..ae63cab50 100644 --- a/external_imported/vcpkg/versions/a-/azure-uhttp-c.json +++ b/external_imported/vcpkg/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c83542c6dc2b853932ac25c4d8314a5556aab40", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", "version-date": "2022-01-21", diff --git a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json index 893326599..a010bbe8f 100644 --- a/external_imported/vcpkg/versions/a-/azure-umqtt-c.json +++ b/external_imported/vcpkg/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28ef0c8d4778d3fd30120290bcb4a121a2efc14f", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", "version-date": "2022-01-21", diff --git a/external_imported/vcpkg/versions/b-/b64.json b/external_imported/vcpkg/versions/b-/b64.json index 36e172140..590f69c2b 100644 --- a/external_imported/vcpkg/versions/b-/b64.json +++ b/external_imported/vcpkg/versions/b-/b64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeaf7d2076e25b321032c4fc88c22cbb46002a90", + "version": "2.0.0.1", + "port-version": 1 + }, { "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d", "version": "2.0.0.1", diff --git a/external_imported/vcpkg/versions/b-/basisu.json b/external_imported/vcpkg/versions/b-/basisu.json index c9940a435..d47b96590 100644 --- a/external_imported/vcpkg/versions/b-/basisu.json +++ b/external_imported/vcpkg/versions/b-/basisu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8552deb382fab18170488ffdf05fdd50dd3e2d99", + "version": "1.11", + "port-version": 6 + }, { "git-tree": "70d762c5a7350879f47429ea6275ba34f1c0f449", "version-string": "1.11", diff --git a/external_imported/vcpkg/versions/b-/bdwgc.json b/external_imported/vcpkg/versions/b-/bdwgc.json index 92dbb78c1..6029dfc21 100644 --- a/external_imported/vcpkg/versions/b-/bdwgc.json +++ b/external_imported/vcpkg/versions/b-/bdwgc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f99370553e85e9f6a10878253cdee86883b0ff30", + "version": "8.2.2", + "port-version": 0 + }, + { + "git-tree": "8fe23b71dde5d4abc9a755c359a583b8d7ba3035", + "version": "8.2.0", + "port-version": 4 + }, { "git-tree": "1cf3b7a458af2eba78e5af9674e8f6d28b53e254", "version": "8.2.0", diff --git a/external_imported/vcpkg/versions/b-/bento4.json b/external_imported/vcpkg/versions/b-/bento4.json index a5d351761..d56f92670 100644 --- a/external_imported/vcpkg/versions/b-/bento4.json +++ b/external_imported/vcpkg/versions/b-/bento4.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4da8906f31697785969422135a52cb2d0861fe53", + "version": "1.6.0-639", + "port-version": 1 + }, + { + "git-tree": "834cb05380588e07628713420e709264f168a567", + "version": "1.6.0-639", + "port-version": 0 + }, { "git-tree": "bfedfc70c05cececac8e23b744b43619e2ae3125", "version-string": "1.5.1", diff --git a/external_imported/vcpkg/versions/b-/bext-sml.json b/external_imported/vcpkg/versions/b-/bext-sml.json index 56b065fc3..0f6fd7284 100644 --- a/external_imported/vcpkg/versions/b-/bext-sml.json +++ b/external_imported/vcpkg/versions/b-/bext-sml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "607e0e94d37ca023fd393c42e8acb43881ea8025", + "version": "1.1.5", + "port-version": 0 + }, { "git-tree": "5e5941cb1ecd7988a9f52c1ace73823a4a20743c", "version": "1.1.4", diff --git a/external_imported/vcpkg/versions/b-/bext-ut.json b/external_imported/vcpkg/versions/b-/bext-ut.json index 6e6b6971f..bd99a7fbc 100644 --- a/external_imported/vcpkg/versions/b-/bext-ut.json +++ b/external_imported/vcpkg/versions/b-/bext-ut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea37a3905161a060e837b30d42868792d50029f8", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "b08fed0b83c26aabfdda7db38d43a01b288f6a66", "version": "1.1.8", diff --git a/external_imported/vcpkg/versions/b-/bfgroup-lyra.json b/external_imported/vcpkg/versions/b-/bfgroup-lyra.json index 0a6e8cf00..ef5ca5bf3 100644 --- a/external_imported/vcpkg/versions/b-/bfgroup-lyra.json +++ b/external_imported/vcpkg/versions/b-/bfgroup-lyra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45", + "version": "1.6", + "port-version": 0 + }, { "git-tree": "d06d9dff4b3cb6ea57292cb81460f113a905e3ea", "version": "1.5.1", diff --git a/external_imported/vcpkg/versions/b-/bitmagic.json b/external_imported/vcpkg/versions/b-/bitmagic.json index 07b6ea476..7b1030f15 100644 --- a/external_imported/vcpkg/versions/b-/bitmagic.json +++ b/external_imported/vcpkg/versions/b-/bitmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b5257f630778f4e1acbee7661041a1a67c7f21d", + "version": "7.11.2", + "port-version": 0 + }, { "git-tree": "9a8ea093834ac196fd75eb7d07348dd27ebcb715", "version": "7.5.0", diff --git a/external_imported/vcpkg/versions/b-/bitserializer.json b/external_imported/vcpkg/versions/b-/bitserializer.json index a58466de1..00d44d04e 100644 --- a/external_imported/vcpkg/versions/b-/bitserializer.json +++ b/external_imported/vcpkg/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e25c895f4054e151b1865640ae8500efcddda95b", + "version": "0.44", + "port-version": 1 + }, { "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76", "version": "0.44", diff --git a/external_imported/vcpkg/versions/b-/blake3.json b/external_imported/vcpkg/versions/b-/blake3.json new file mode 100644 index 000000000..71f6cb45e --- /dev/null +++ b/external_imported/vcpkg/versions/b-/blake3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "78cffdc59cdb9f1c75dffa671578203d0a79fa42", + "version": "1.3.1", + "port-version": 1 + }, + { + "git-tree": "62a5201ca424389c823b9b4be3d588e1cbb88a58", + "version": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/b-/blaze.json b/external_imported/vcpkg/versions/b-/blaze.json index 3a4a1c091..2a94caab1 100644 --- a/external_imported/vcpkg/versions/b-/blaze.json +++ b/external_imported/vcpkg/versions/b-/blaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bea7e024ba776f0a7c5462056054529f79aa86d", + "version": "3.8.1", + "port-version": 0 + }, { "git-tree": "8795a94d25adbb75d3be0b191bc3c15321e9c686", "version-string": "3.8", diff --git a/external_imported/vcpkg/versions/b-/blend2d.json b/external_imported/vcpkg/versions/b-/blend2d.json index 280aafcce..d729bd258 100644 --- a/external_imported/vcpkg/versions/b-/blend2d.json +++ b/external_imported/vcpkg/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96db1e7844aafd005e469f47b8f89e139df8d8e1", + "version-date": "2022-05-02", + "port-version": 0 + }, { "git-tree": "ceedb664deed987cc4e4493554ae3aa58088f08c", "version-date": "2022-02-19", diff --git a/external_imported/vcpkg/versions/b-/boinc.json b/external_imported/vcpkg/versions/b-/boinc.json index 3b7ff3232..983198940 100644 --- a/external_imported/vcpkg/versions/b-/boinc.json +++ b/external_imported/vcpkg/versions/b-/boinc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "862d1c12a219592e79f591bbeb090c5f84736a54", + "version": "7.20.2", + "port-version": 0 + }, + { + "git-tree": "ab47def2f85314a93479d7238572c83c91ac1845", + "version": "7.20.1", + "port-version": 0 + }, + { + "git-tree": "c81da3b63845b3d0e04dfac9b8ebe3096d13176d", + "version": "7.20.0", + "port-version": 0 + }, { "git-tree": "47df312abbe66c9c58fd67b1deb72ec906421a68", "version": "7.18.1", diff --git a/external_imported/vcpkg/versions/b-/boost-accumulators.json b/external_imported/vcpkg/versions/b-/boost-accumulators.json index 288b505f6..31b5df77c 100644 --- a/external_imported/vcpkg/versions/b-/boost-accumulators.json +++ b/external_imported/vcpkg/versions/b-/boost-accumulators.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b25f312085b5e73329ad76e24d11c9c1882e2ee7", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "80a1e83cff3df70e006907ccc20851f7086f2dab", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "070cbab1861e2a57e6c39ac1a8dcf51ad9edafea", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-algorithm.json b/external_imported/vcpkg/versions/b-/boost-algorithm.json index 2ad310fa5..a89edd8fe 100644 --- a/external_imported/vcpkg/versions/b-/boost-algorithm.json +++ b/external_imported/vcpkg/versions/b-/boost-algorithm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "449cdd984b8e373b02b3b5fe727520d2bbddc64f", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "20d7a665b493f8b9816d56125e83928e41dcaa98", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "eca5eb57117afd2c43e7f00ed6908dabb254b46e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-align.json b/external_imported/vcpkg/versions/b-/boost-align.json index a4e6a9979..c18ae278f 100644 --- a/external_imported/vcpkg/versions/b-/boost-align.json +++ b/external_imported/vcpkg/versions/b-/boost-align.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2ba43f3bf67d3825a663dbb55e6210525de2eafd", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "5bc0b7d28ff47bf04454dde5d3ab3eeed5a113b2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1733cf10f4a598f29af7380a6b8226abdeeb3f75", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-any.json b/external_imported/vcpkg/versions/b-/boost-any.json index 2d0d743e5..66f1a75de 100644 --- a/external_imported/vcpkg/versions/b-/boost-any.json +++ b/external_imported/vcpkg/versions/b-/boost-any.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c702b79eb10c68b859be09c9aedbdb1533972ede", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "6382a90fffe32ec65147d579e28f05604eaeef46", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a28a3fd1ebf198563ae9e200dcf36f1fae3b1482", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-array.json b/external_imported/vcpkg/versions/b-/boost-array.json index 6f804d1f4..c67efe7ff 100644 --- a/external_imported/vcpkg/versions/b-/boost-array.json +++ b/external_imported/vcpkg/versions/b-/boost-array.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d19880de99410f68c581fc1461458e502952c6d5", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "11a6869eb0c7b2efa3e92b2c36795ef9873c6537", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8278959d326c44d846d660462556ab48361054f9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-asio.json b/external_imported/vcpkg/versions/b-/boost-asio.json index fbc9e39a3..0b6f31811 100644 --- a/external_imported/vcpkg/versions/b-/boost-asio.json +++ b/external_imported/vcpkg/versions/b-/boost-asio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2879fa47cd2ac0abbd8ad8c1b38fa28605c45bee", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "39b1b86ce2c331ab31d001308b6a71fc6fbebf5c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2fcf35cb168a6a2aa56208a83fb71bfdf88672b6", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-assert.json b/external_imported/vcpkg/versions/b-/boost-assert.json index 1d6e40c26..ab0f5c753 100644 --- a/external_imported/vcpkg/versions/b-/boost-assert.json +++ b/external_imported/vcpkg/versions/b-/boost-assert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6725be5e5074efec28c39594ca05acccc6f00389", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "2e4adae40df44f3927978bba397b60f18ad8e919", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "81b29f057d38140b3d812094999772d2d5263d4e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-assign.json b/external_imported/vcpkg/versions/b-/boost-assign.json index 0a00d2f35..35651ade6 100644 --- a/external_imported/vcpkg/versions/b-/boost-assign.json +++ b/external_imported/vcpkg/versions/b-/boost-assign.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d4ca8465c21f725287f49640fff191431b14d6d7", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "755ca06375958012e688e91d8ad79c40b20b91df", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cb2a0606569a77b0de8264bd55d015698f413dd7", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-atomic.json b/external_imported/vcpkg/versions/b-/boost-atomic.json index b9d48b300..821a61bed 100644 --- a/external_imported/vcpkg/versions/b-/boost-atomic.json +++ b/external_imported/vcpkg/versions/b-/boost-atomic.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7981a7b10701edd0230d2aac6a058c5ba02f4acc", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ba96ddc357592c3644f666fbc68d052ad3f0f397", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f516c90064f41a11fe7627ab6a8ac281455f55cc", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-beast.json b/external_imported/vcpkg/versions/b-/boost-beast.json index 6c803bf86..4cdbdff4f 100644 --- a/external_imported/vcpkg/versions/b-/boost-beast.json +++ b/external_imported/vcpkg/versions/b-/boost-beast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f6ad5168ee3dfc5e23b7a47f2919de10b4070af6", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bb0a62ab1fd80ff0dd756ad89cbc367b2f7c6df0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5cb4b3da49532ceefefdb4465c74c3490f6c40f7", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-bimap.json b/external_imported/vcpkg/versions/b-/boost-bimap.json index b4115b00d..5ab0139f0 100644 --- a/external_imported/vcpkg/versions/b-/boost-bimap.json +++ b/external_imported/vcpkg/versions/b-/boost-bimap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c94058be2a3f7dd8a6b7b4999be4ca799c415249", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "4bad70254f12ab9642e3ee96980d834a485af5e9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d376fb04582a3ca0b6d14f991ae05965c7d0961a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-bind.json b/external_imported/vcpkg/versions/b-/boost-bind.json index a994e3506..c700ac0e2 100644 --- a/external_imported/vcpkg/versions/b-/boost-bind.json +++ b/external_imported/vcpkg/versions/b-/boost-bind.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8d42f0055a3147df3268da26432a64580f9bdbea", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c27b66c8e195ce97685c409c0821f907bae83d80", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "165c77e05b1d413a600f66135276ba7e727ebc35", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-build.json b/external_imported/vcpkg/versions/b-/boost-build.json index 140b50fd3..d527f3656 100644 --- a/external_imported/vcpkg/versions/b-/boost-build.json +++ b/external_imported/vcpkg/versions/b-/boost-build.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "ec5ac2fde8a696a243092c4039f4b34b68091859", + "version": "1.80.0", + "port-version": 1 + }, + { + "git-tree": "8b95798b4e7cc7d6697ff1eecc9261ba5d884828", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a5ddae928a30fbcc9d5cb01906a7ee846b1b6c62", + "version": "1.79.0", + "port-version": 1 + }, + { + "git-tree": "ba4fbdacb5988e8f753bf2098ec257453c50a27a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cf970c17a4bf6d59deff7ce7e7eb98cec74b544a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-callable-traits.json b/external_imported/vcpkg/versions/b-/boost-callable-traits.json index ed346a5b6..d94955043 100644 --- a/external_imported/vcpkg/versions/b-/boost-callable-traits.json +++ b/external_imported/vcpkg/versions/b-/boost-callable-traits.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f830b72c86e472095ce7c2f86b56e8a4ef8b0585", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b3fb5022c86bf300e6a55e8ecef2ba41e9f6a39a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c65c1b67763ed69490e43430bc860493ccc19274", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-chrono.json b/external_imported/vcpkg/versions/b-/boost-chrono.json index 244624ebf..68d0145e6 100644 --- a/external_imported/vcpkg/versions/b-/boost-chrono.json +++ b/external_imported/vcpkg/versions/b-/boost-chrono.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "af0a6c6a5b473a08afeacfb8590bd4220129ed47", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "dd168284e43a057a5775444c07f11f99a96053c0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d08ea7bd6fb471393e10507f0b6d27d045868f3e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-circular-buffer.json b/external_imported/vcpkg/versions/b-/boost-circular-buffer.json index c05cb13cf..9c9adab48 100644 --- a/external_imported/vcpkg/versions/b-/boost-circular-buffer.json +++ b/external_imported/vcpkg/versions/b-/boost-circular-buffer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bf70dc530094e3190c4d5cc945bb452807cc150b", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c8a97f3e2854ffb2064635bada5cfac2230a7590", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "239a4eff939919bbabf11914dbb656992e4e26ae", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-compatibility.json b/external_imported/vcpkg/versions/b-/boost-compatibility.json index d3da45592..dd4a88ed0 100644 --- a/external_imported/vcpkg/versions/b-/boost-compatibility.json +++ b/external_imported/vcpkg/versions/b-/boost-compatibility.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f07e01ce42b7ea0cbecd1ee38ac2700e69a4457a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bddfe133f937df01c2a18b9fcbd078538c195715", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ee3bf146536f03c976c00fa704664f0576241f15", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-compute.json b/external_imported/vcpkg/versions/b-/boost-compute.json index 85805ba2a..1c9f3e5d6 100644 --- a/external_imported/vcpkg/versions/b-/boost-compute.json +++ b/external_imported/vcpkg/versions/b-/boost-compute.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4bc892c9f1c28371c4ff1f29b02b350e06dbc8b7", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "d4c84dc32e2d683a910deafe8df7631c36ee8195", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "02e813bc50d95bc901ba994faff7658f1ee5664b", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-concept-check.json b/external_imported/vcpkg/versions/b-/boost-concept-check.json index 738dc3b31..9a233fb4e 100644 --- a/external_imported/vcpkg/versions/b-/boost-concept-check.json +++ b/external_imported/vcpkg/versions/b-/boost-concept-check.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0beb38f9779faecd886d454778c8824f2a1b6112", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "493a1b5ae991a9c7b2643e649329de16bcd0fa48", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d92ec4f75e3ca2046f7cc6bd42e394aa642dea7b", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-config.json b/external_imported/vcpkg/versions/b-/boost-config.json index 0da4e3e00..eaf8eaabe 100644 --- a/external_imported/vcpkg/versions/b-/boost-config.json +++ b/external_imported/vcpkg/versions/b-/boost-config.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ca3f30a318dacc3dcab0250a9eeb37dc5b6b92a5", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "22c6532dcc9c24fd85febb93dc936e68c031043a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b4958f142255c3aa14f1f39d04edcc12b6262745", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-container-hash.json b/external_imported/vcpkg/versions/b-/boost-container-hash.json index c194451b1..dcd775c11 100644 --- a/external_imported/vcpkg/versions/b-/boost-container-hash.json +++ b/external_imported/vcpkg/versions/b-/boost-container-hash.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8dc3bdcb7719958b2c449f9d0c5a4a1fee740638", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "09168c62619e569c7b6b2799aa39c361a1afff22", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5c9a0efa908886517e39510cffaebe78df8bac17", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-container.json b/external_imported/vcpkg/versions/b-/boost-container.json index 60a39b3ae..d28eef064 100644 --- a/external_imported/vcpkg/versions/b-/boost-container.json +++ b/external_imported/vcpkg/versions/b-/boost-container.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bacf967cd20a1da8f12491d458bd833194b5c8ff", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c29fd09bc12ad31bd796ba90682fcbd242090cc0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "cba0ae7cefffcca3cc1a0aec45ec07a66f6cc413", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-context.json b/external_imported/vcpkg/versions/b-/boost-context.json index e09838415..89128bcf7 100644 --- a/external_imported/vcpkg/versions/b-/boost-context.json +++ b/external_imported/vcpkg/versions/b-/boost-context.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "3935b80eb6478299ca2215ec8f44bbaadb7cb097", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "24210ac19518ca74072938e9569a9e9f5b3476ba", + "version": "1.79.0", + "port-version": 1 + }, + { + "git-tree": "7abfa63f40d05e79743c416050ed97f8351d3c37", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c279fc4862dbbc9b4c685d16d1abee7200f9dff4", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-contract.json b/external_imported/vcpkg/versions/b-/boost-contract.json index 435780a54..286668178 100644 --- a/external_imported/vcpkg/versions/b-/boost-contract.json +++ b/external_imported/vcpkg/versions/b-/boost-contract.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4602cdd4b32f084e83f9c687d2aabf7aac5a7694", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a07f53ab73b8b844f20b487aa039e4e019538d47", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "9fb4b8408822e7921fe3d07ba66184df6b5f16a6", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-conversion.json b/external_imported/vcpkg/versions/b-/boost-conversion.json index 97703b69a..0f1af0869 100644 --- a/external_imported/vcpkg/versions/b-/boost-conversion.json +++ b/external_imported/vcpkg/versions/b-/boost-conversion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0eefde4b20dad197e9a868ade748b825e6ddafcd", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1e3552c53e2ef9bcfa7159f2f06079c30dfa53ac", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ed01d578d9964b2be3619cd7e96c6f65dc206275", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-convert.json b/external_imported/vcpkg/versions/b-/boost-convert.json index a85859c5f..4ccab9d97 100644 --- a/external_imported/vcpkg/versions/b-/boost-convert.json +++ b/external_imported/vcpkg/versions/b-/boost-convert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "86c8d2de7e7f583832e134096f2c2a869f16e23d", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3a6958bd02a806df5b7840c7a62908ca3d5316fe", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d1315f49ac5c357e8a427c97dee2faa3655c70f3", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-core.json b/external_imported/vcpkg/versions/b-/boost-core.json index 320246ca1..caa0c51ae 100644 --- a/external_imported/vcpkg/versions/b-/boost-core.json +++ b/external_imported/vcpkg/versions/b-/boost-core.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c883ecbdff6a25a10471499fe6baa265370d8e80", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a22eddd8a3121063f8ef94eb4e0ae64021d0369a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b6d811257b985253c87570f25a75957689b2b895", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-coroutine.json b/external_imported/vcpkg/versions/b-/boost-coroutine.json index c3215b327..c6107fddd 100644 --- a/external_imported/vcpkg/versions/b-/boost-coroutine.json +++ b/external_imported/vcpkg/versions/b-/boost-coroutine.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c5c4a955fcf3465c0e9589a57d9c9f2df02eb3a2", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b953ff17be4b4da2bb6b898c80b12c4185b3a821", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d462e16750c6769375391d1e1c084999000cb324", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-coroutine2.json b/external_imported/vcpkg/versions/b-/boost-coroutine2.json index e5073ccf0..b0765e76b 100644 --- a/external_imported/vcpkg/versions/b-/boost-coroutine2.json +++ b/external_imported/vcpkg/versions/b-/boost-coroutine2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2b92ef8da314cedfeb9c03cccb9ed74c54464937", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "8f8442e8490a2ad005762566a768ca944e754466", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d035a00380a7bcddb6c22f69c4743af4f2122a38", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-crc.json b/external_imported/vcpkg/versions/b-/boost-crc.json index 2956a402b..e89692cfc 100644 --- a/external_imported/vcpkg/versions/b-/boost-crc.json +++ b/external_imported/vcpkg/versions/b-/boost-crc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f1ffdaef7352c8861f62b6a81197f8f57433e471", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "5fd0f57c0b02c713c53ca56f341b904557fd257a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c1772d15f5d08e1f5e3a263c30869aef88a76085", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-date-time.json b/external_imported/vcpkg/versions/b-/boost-date-time.json index 1792e3793..d63d32e05 100644 --- a/external_imported/vcpkg/versions/b-/boost-date-time.json +++ b/external_imported/vcpkg/versions/b-/boost-date-time.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4d59467ccd3c5545e253f0077e97237d3e89e320", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bc3460f55739fad6ef0e548bc084bade32985683", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "76bf565e940322a7d3110edf1b18fb4bfd8a1ab0", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-describe.json b/external_imported/vcpkg/versions/b-/boost-describe.json index 46de02237..1120a2be4 100644 --- a/external_imported/vcpkg/versions/b-/boost-describe.json +++ b/external_imported/vcpkg/versions/b-/boost-describe.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "91eb316df6588d70db583e6accf94f3dc79cb78b", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f79ac02e597506f15b55a0445e9a36ed6cb22632", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e08134869cca3b2d75247c226637b24438c489c2", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-detail.json b/external_imported/vcpkg/versions/b-/boost-detail.json index 6b3a3e4e2..c47f8ead1 100644 --- a/external_imported/vcpkg/versions/b-/boost-detail.json +++ b/external_imported/vcpkg/versions/b-/boost-detail.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4e3b1298f453e933f97c2145a1539ed0763e52b1", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "65c1cfff48ea4ead86b7db6d20401fbfef4e1022", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "61c65e46d0bf619e44cf343d734dda6987f53005", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-dll.json b/external_imported/vcpkg/versions/b-/boost-dll.json index 465bbbdc6..5fff9eba1 100644 --- a/external_imported/vcpkg/versions/b-/boost-dll.json +++ b/external_imported/vcpkg/versions/b-/boost-dll.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "58b721d72a67913e4f5001269c25b3e7b8982f93", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0243143e2c2bea8e3579aadfc735b56c40ad5491", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1afc8f9b224cf9a2a1846073dffd93defdb46028", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json b/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json index 80126c8dd..375d26d7e 100644 --- a/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json +++ b/external_imported/vcpkg/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "288335907a0fe3dfaccf6bf7dc796d6a4e2570e2", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "e2ea8d91791c627d016c69aa73d36d3622ba0df0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e137dc4091824493eec9e6f9734caa71eb069874", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-endian.json b/external_imported/vcpkg/versions/b-/boost-endian.json index 7d6628447..6f0a0ff02 100644 --- a/external_imported/vcpkg/versions/b-/boost-endian.json +++ b/external_imported/vcpkg/versions/b-/boost-endian.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a7e23bb3fd93937ab37715ea481e5ed84b51f37e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "24a5162a544f251df6387a1d5bb70ba53497e4c3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "87ed62b8b7fba9caadc1ffff99abede02e0598f2", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-exception.json b/external_imported/vcpkg/versions/b-/boost-exception.json index e6dc6d950..5271482e6 100644 --- a/external_imported/vcpkg/versions/b-/boost-exception.json +++ b/external_imported/vcpkg/versions/b-/boost-exception.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "fd7bd1fcdb784fea657d9a4f068253b5d95ca333", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "6d7250e9806392fc38643fb7c069ba18fcec2350", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "02b0e67c7d9b5e26b1bccef1fba3152fe7ead595", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-fiber.json b/external_imported/vcpkg/versions/b-/boost-fiber.json index f0c0bea46..78f934141 100644 --- a/external_imported/vcpkg/versions/b-/boost-fiber.json +++ b/external_imported/vcpkg/versions/b-/boost-fiber.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "624a28b01820a368ad83f7e3bb6442706e1dfcb6", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "14418cb69ecedbf80d7fe87779fc7028db31eefc", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "7a37b52940402701703a4b91f1360b414f6afe02", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-filesystem.json b/external_imported/vcpkg/versions/b-/boost-filesystem.json index 833f3351c..004671f71 100644 --- a/external_imported/vcpkg/versions/b-/boost-filesystem.json +++ b/external_imported/vcpkg/versions/b-/boost-filesystem.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "77d8b1f9dff7eec868e4c8007c399bb123d80a97", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3ad60cdb4b5114cda754f4b15d96d72c9615b271", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f7f7b3bf671f25f6234f81de59fb5dc169ea2480", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-flyweight.json b/external_imported/vcpkg/versions/b-/boost-flyweight.json index 0b7f00a33..fb4e7612d 100644 --- a/external_imported/vcpkg/versions/b-/boost-flyweight.json +++ b/external_imported/vcpkg/versions/b-/boost-flyweight.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "65fcde6f347e7f0100ef071d6f943d5e1f05790b", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f6e8af8c3f7450a4e32ca807cabfb4197ac7a0a7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "899fef7cf017fd090f2e96146a425e7376320a4e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-foreach.json b/external_imported/vcpkg/versions/b-/boost-foreach.json index 992d11147..bba32a274 100644 --- a/external_imported/vcpkg/versions/b-/boost-foreach.json +++ b/external_imported/vcpkg/versions/b-/boost-foreach.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7b86b0bc008ecde19a6e4c83aa2365a197dc214e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "e8948df8fb3d54f6bcca0c5fee45f13406683a3e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "468a08373a9339026a955a01faf3a4bc6fe0ab11", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-format.json b/external_imported/vcpkg/versions/b-/boost-format.json index 7b6e6ac59..a1aa3e137 100644 --- a/external_imported/vcpkg/versions/b-/boost-format.json +++ b/external_imported/vcpkg/versions/b-/boost-format.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8b8465c0970d28814c1162b864c02f685e471482", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "365fbda5a5fe624367c049e4c118945c0142d0eb", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "691157617974f33e41ef5ea7954d590a8f12be5a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-function-types.json b/external_imported/vcpkg/versions/b-/boost-function-types.json index 5a33d677f..ae06c88d9 100644 --- a/external_imported/vcpkg/versions/b-/boost-function-types.json +++ b/external_imported/vcpkg/versions/b-/boost-function-types.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d09eff712efc437ebb49cc7dbf5644a641be3b31", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "53ad331d5cdedab7b40eebaf15d9f8081a5d9eed", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "94d4dd365c29ad1be2d148f3c4cf7857e3ac1edd", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-function.json b/external_imported/vcpkg/versions/b-/boost-function.json index 6f7c0e4f5..dbb9da88f 100644 --- a/external_imported/vcpkg/versions/b-/boost-function.json +++ b/external_imported/vcpkg/versions/b-/boost-function.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4a3017f165de9e889e161ab353dda4439cea8169", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7057b960d6b790eb30f51ef17d67aa958230e100", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "74d9b1e1e9951fe6f6f4eeccddf8c83ff1280462", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-functional.json b/external_imported/vcpkg/versions/b-/boost-functional.json index 5add7a0fd..1375ad655 100644 --- a/external_imported/vcpkg/versions/b-/boost-functional.json +++ b/external_imported/vcpkg/versions/b-/boost-functional.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "43e00a8e09e0b0fd501b8a7b8dacc2a189a0c587", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "d8fd2c72eb4f3c8d501a44f7a5f8ecfe608cc3b4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5c46623f2b1557b35079a69ea27aa495f8765f26", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-fusion.json b/external_imported/vcpkg/versions/b-/boost-fusion.json index 86e7f1842..52577bb2d 100644 --- a/external_imported/vcpkg/versions/b-/boost-fusion.json +++ b/external_imported/vcpkg/versions/b-/boost-fusion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4e5e11a2bdcfb620804b47dd24f09145d67892e0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "10c27fdbefb33b57367582e1a8f262db9d94d807", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a7c7b4de2e38c3436c0781ccf4b56567b8c2ae61", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-geometry.json b/external_imported/vcpkg/versions/b-/boost-geometry.json index 9fb480e11..e6c69c70d 100644 --- a/external_imported/vcpkg/versions/b-/boost-geometry.json +++ b/external_imported/vcpkg/versions/b-/boost-geometry.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "22ed5ea6012738b12286b239ddf1cc9606e3130a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f05a5d0f5a5889edecadab0ee49a1c13dfde0898", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a4c2fd98bc285d97c11c99f5f631481fb534efc4", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-gil.json b/external_imported/vcpkg/versions/b-/boost-gil.json index 49e0d509d..11d64c463 100644 --- a/external_imported/vcpkg/versions/b-/boost-gil.json +++ b/external_imported/vcpkg/versions/b-/boost-gil.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2bec2e61c5e01a16e3cd4ca47449aa15382931c6", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "fe36550466af98298217643a09ab451aa6a0b4c7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "670859cf36c60562fb5036af7d087df936234c27", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-graph-parallel.json b/external_imported/vcpkg/versions/b-/boost-graph-parallel.json index c13bca55e..07df499bc 100644 --- a/external_imported/vcpkg/versions/b-/boost-graph-parallel.json +++ b/external_imported/vcpkg/versions/b-/boost-graph-parallel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2246b1dab26eb279a95fe40b6d6f225b2469d8cf", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3a95f6dea34a2262e22d4b94404afad68c603a8b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "199f9b8209f287e7e9865e07b074d618c28db410", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-graph.json b/external_imported/vcpkg/versions/b-/boost-graph.json index d529ceb12..163bfc69f 100644 --- a/external_imported/vcpkg/versions/b-/boost-graph.json +++ b/external_imported/vcpkg/versions/b-/boost-graph.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7fd5ed599b799127c74238c346fbca9be455009", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a0281e8f5b61dbeb2daf3b3634744daf9c58cdd2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f7b342391819ed511280f8ef46b7d52a399f2648", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-hana.json b/external_imported/vcpkg/versions/b-/boost-hana.json index 4f74efb60..9a60500e3 100644 --- a/external_imported/vcpkg/versions/b-/boost-hana.json +++ b/external_imported/vcpkg/versions/b-/boost-hana.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dd068f8c4347e0ed41005a78ee39f98ecf79c441", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "2dda9ed4c338faef5a98ec4f713b71976c4de9aa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3ff9854bbad812cd23a4c79b500aa8349fbed192", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-heap.json b/external_imported/vcpkg/versions/b-/boost-heap.json index df68d02df..990f2e1d0 100644 --- a/external_imported/vcpkg/versions/b-/boost-heap.json +++ b/external_imported/vcpkg/versions/b-/boost-heap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "02f31ba7775130e875051cd5f5cbdb76066ff0bd", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3be349686d19ee7b297058dfa2d8177bf22cbe9b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "76c4ec7815b1660fca1c1efd9b9c0c2f034ba4bb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-histogram.json b/external_imported/vcpkg/versions/b-/boost-histogram.json index 1bd8b8035..d4fde1a24 100644 --- a/external_imported/vcpkg/versions/b-/boost-histogram.json +++ b/external_imported/vcpkg/versions/b-/boost-histogram.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "70a6aaca30a05b7f234b62988f1bd8f53421710a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ba0d99a55988d554d24baf0ae9b8dbd39950be11", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "223b95e57f20afec67e891aa7fc884e6ac492f6f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-hof.json b/external_imported/vcpkg/versions/b-/boost-hof.json index 48edaf052..e4133fbd5 100644 --- a/external_imported/vcpkg/versions/b-/boost-hof.json +++ b/external_imported/vcpkg/versions/b-/boost-hof.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "40ecf7b9f806bed59a911028354f0f471b5e1beb", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b4c1a946a0dc6f554cc76efa7ff4636ff4aabb08", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "899745af9cdd07134ebe4b4223eb749b7efa5be4", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-icl.json b/external_imported/vcpkg/versions/b-/boost-icl.json index 1e6a03f0d..9811b7089 100644 --- a/external_imported/vcpkg/versions/b-/boost-icl.json +++ b/external_imported/vcpkg/versions/b-/boost-icl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "061544233c810a2a3e04cca99364bb2fe3edcbb2", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "9ce9f45501ca2ac3a6ff4f2c42c69f1b104df70c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "074322ef21b89c54d87c0446716221c3c20544a8", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-integer.json b/external_imported/vcpkg/versions/b-/boost-integer.json index 289dd1934..025861dd7 100644 --- a/external_imported/vcpkg/versions/b-/boost-integer.json +++ b/external_imported/vcpkg/versions/b-/boost-integer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f980326e208e00560547b76cbb13759357e74598", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7970a7ba822ac5e6a8a9f98ba5ee3631b3ccff3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "18f2f923e2a8d4f026787eb8626def460dd2ab6a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-interprocess.json b/external_imported/vcpkg/versions/b-/boost-interprocess.json index ce9f23914..f0da0f539 100644 --- a/external_imported/vcpkg/versions/b-/boost-interprocess.json +++ b/external_imported/vcpkg/versions/b-/boost-interprocess.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c9830784da99cc5088750233a568961dfe6701c0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "274a988e2a03f43beba2efb240692e0af456e8ee", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "220049a8136b65045c04fc13aea3a259e8f4f2b0", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-interval.json b/external_imported/vcpkg/versions/b-/boost-interval.json index 1e3b05ce2..76d4fc536 100644 --- a/external_imported/vcpkg/versions/b-/boost-interval.json +++ b/external_imported/vcpkg/versions/b-/boost-interval.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cc4c8e51cac9fa083d9f181e9da090a65fe62779", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f196074b225959b27fb96794ffc54db0293efa24", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5786ba8a3bb499958bbe8ebbc58c6bb4e4c3eb91", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-intrusive.json b/external_imported/vcpkg/versions/b-/boost-intrusive.json index 4849a39d5..ed963778f 100644 --- a/external_imported/vcpkg/versions/b-/boost-intrusive.json +++ b/external_imported/vcpkg/versions/b-/boost-intrusive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "538ebc32732429b15db300664e07bab697c2e5e2", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "5162285659ad371e022c242481e20414c8b23e2b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "351ad9aa5db5bf50ab87a390a69d5df1d2b41ab7", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-io.json b/external_imported/vcpkg/versions/b-/boost-io.json index 9c85f7cd6..33cd3f617 100644 --- a/external_imported/vcpkg/versions/b-/boost-io.json +++ b/external_imported/vcpkg/versions/b-/boost-io.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cfe6645cfe18cc173a5101310bc86dbb5fc5532a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a248d3f95d95973f63b5be92c81747165ca0319c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "33cc953c79a65bcdfdd7b55a757bf3f4ac4be4bf", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-iostreams.json b/external_imported/vcpkg/versions/b-/boost-iostreams.json index 526884993..e3bf6e6ed 100644 --- a/external_imported/vcpkg/versions/b-/boost-iostreams.json +++ b/external_imported/vcpkg/versions/b-/boost-iostreams.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37de3e0e0107aaeb4eb8bc2ee29457131145bb36", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "75821705e2df069874466bb55c4b0c4561950831", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "73e04423bfb004c75708458688afeeb8a1806ba5", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-iterator.json b/external_imported/vcpkg/versions/b-/boost-iterator.json index d622cc5d1..7c2b8adba 100644 --- a/external_imported/vcpkg/versions/b-/boost-iterator.json +++ b/external_imported/vcpkg/versions/b-/boost-iterator.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d5df6fffeb95a0cdd702d8471696ca31a45f1600", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a9b329add024642bef5338c963bdfeee41bb60df", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "474aefb2b63e5ea3e6794631eab47aa3d6921573", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-json.json b/external_imported/vcpkg/versions/b-/boost-json.json index 1fc302c0c..c0ccab4c6 100644 --- a/external_imported/vcpkg/versions/b-/boost-json.json +++ b/external_imported/vcpkg/versions/b-/boost-json.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e00f0980f7fc5a06bf3c559b6a1052e068d5de96", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b19f47c6cbcc65ddb2a96bf60df6b358a6e64ad1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e8cdadcefe4c56aadc0120b9c1a86ea6504f3cea", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-lambda.json b/external_imported/vcpkg/versions/b-/boost-lambda.json index 9fa2796c6..45cd378d4 100644 --- a/external_imported/vcpkg/versions/b-/boost-lambda.json +++ b/external_imported/vcpkg/versions/b-/boost-lambda.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e96e65ee098d0846218e7df13156804051aadd23", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c2eedc92baf94690429ab150e062fe42296099d5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ad7994962fa2139e8b2e67adbf505c555a57f3c6", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-lambda2.json b/external_imported/vcpkg/versions/b-/boost-lambda2.json index 48656d120..e2507b515 100644 --- a/external_imported/vcpkg/versions/b-/boost-lambda2.json +++ b/external_imported/vcpkg/versions/b-/boost-lambda2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ea6068a8cd06ecf372e93ec9967af05735e0e64a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "2ef167f48c1b762124536fd34843f247e9af8b89", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fe85b4be83b3a88ec04a16d0704acc722502a128", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-leaf.json b/external_imported/vcpkg/versions/b-/boost-leaf.json index f6129e5e5..60d1d1641 100644 --- a/external_imported/vcpkg/versions/b-/boost-leaf.json +++ b/external_imported/vcpkg/versions/b-/boost-leaf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "151ee4285909980fe5008aaf36d65ffc636e654a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "87a96bf13e0afb5212772d1240dfc6accaf71b84", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c000f663b00cfc9a2566b67ea68d6fe5050a016a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-lexical-cast.json b/external_imported/vcpkg/versions/b-/boost-lexical-cast.json index 4d7eadfc0..a3d76a80b 100644 --- a/external_imported/vcpkg/versions/b-/boost-lexical-cast.json +++ b/external_imported/vcpkg/versions/b-/boost-lexical-cast.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a1c65d88dc4dd33ee2308e6dffa9ff580b3ad0e8", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "78f269516df3662fbb3417faba5a8983936de604", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "984ca6d42fd857c08fa915edc02bfcecb02cc343", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-local-function.json b/external_imported/vcpkg/versions/b-/boost-local-function.json index 7a3d94c51..4bc3a29d8 100644 --- a/external_imported/vcpkg/versions/b-/boost-local-function.json +++ b/external_imported/vcpkg/versions/b-/boost-local-function.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0c1a73008438d7a613f4fbb3a8d12c33276ae584", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3de1ee1d8f4c2def524ee00056e545765dada7a7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f0eb3b232475da3263d0c5a9b65a6cca3d63af1f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-locale.json b/external_imported/vcpkg/versions/b-/boost-locale.json index d8a8d53d6..d707e4393 100644 --- a/external_imported/vcpkg/versions/b-/boost-locale.json +++ b/external_imported/vcpkg/versions/b-/boost-locale.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f76509b5e99db09e81179f9168a3da090c581c0b", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1868faea7b5a4b74f6cb0dca84ef24a7f8d708d0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "66e57914d683e3e7c9945eeefd2010b5a08b4972", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-lockfree.json b/external_imported/vcpkg/versions/b-/boost-lockfree.json index fafb9f8fa..ef00ce2a4 100644 --- a/external_imported/vcpkg/versions/b-/boost-lockfree.json +++ b/external_imported/vcpkg/versions/b-/boost-lockfree.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1e9c0f8ac538167c8425f199e49c771c132d1f9", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bb27f3391311f8d7078563e4ce98f7706500f33e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8a98fed342e79efc6194594c5bdd0a6398a7bf9c", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-log.json b/external_imported/vcpkg/versions/b-/boost-log.json index a967ce40d..d50703329 100644 --- a/external_imported/vcpkg/versions/b-/boost-log.json +++ b/external_imported/vcpkg/versions/b-/boost-log.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3c2e069e10107dd06749bf7fadf7d086799ab91a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "311052ccd7332a0eb6d4a80af653a65fe390f7f4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "66bcef44cd4e7f68677db041e84df77e350624be", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-logic.json b/external_imported/vcpkg/versions/b-/boost-logic.json index 4bade7c65..e60c62888 100644 --- a/external_imported/vcpkg/versions/b-/boost-logic.json +++ b/external_imported/vcpkg/versions/b-/boost-logic.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "588f889d8da686230f6f610141d8110562504312", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "438d9d7c26d42ec2a76f0f60954b7cbcb950a79c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f5acfea5d30532cc6dccce78e0fd159a023ccb4a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-math.json b/external_imported/vcpkg/versions/b-/boost-math.json index e9a8cde6e..f4fa7610f 100644 --- a/external_imported/vcpkg/versions/b-/boost-math.json +++ b/external_imported/vcpkg/versions/b-/boost-math.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c3f7257d4b3a7b8d94e00348149051d37eb75921", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "cb4ff8e95c283f70577c94f6d552bbd2fa469b3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e2fcdb4cd154efd942606b09085ec0cb7747a764", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-metaparse.json b/external_imported/vcpkg/versions/b-/boost-metaparse.json index 9572ffea0..def3719ed 100644 --- a/external_imported/vcpkg/versions/b-/boost-metaparse.json +++ b/external_imported/vcpkg/versions/b-/boost-metaparse.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d49c84675e49cb7998be2c9efb382044f5bfcd39", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ad7ebac0f5d44f811d7d8462959b080c0f298eaa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3b3d7330ddf3fd7d1f38256098f645cafd96d08a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json b/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json index 7abc1eca9..1ca495785 100644 --- a/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json +++ b/external_imported/vcpkg/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,60 @@ { "versions": [ + { + "git-tree": "3cfe5562e40b1ef219b3d36054e1235508c41037", + "version": "1.80.0", + "port-version": 1 + }, + { + "git-tree": "3047d0e2fdc4eee0c918f418f45d5e1dfb86c0fb", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "e22ad8dde44513f2fa1a9b38c71818aaaee52120", + "version": "1.79.0", + "port-version": 8 + }, + { + "git-tree": "cca1e2f883cfd638a53964027473a00e6b571e49", + "version": "1.79.0", + "port-version": 7 + }, + { + "git-tree": "9428ba48caa81512147423f26559c7a57b37e71b", + "version": "1.79.0", + "port-version": 6 + }, + { + "git-tree": "93946fc40b519f0f9afe1b0d36985b2def25d4ab", + "version": "1.79.0", + "port-version": 5 + }, + { + "git-tree": "cd7a5259d9e086b94af5673e581427f76957ce62", + "version": "1.79.0", + "port-version": 4 + }, + { + "git-tree": "e416ef5af7f6a850fd3ee6493fb3a359cd7ac6ba", + "version": "1.79.0", + "port-version": 3 + }, + { + "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca", + "version": "1.79.0", + "port-version": 2 + }, + { + "git-tree": "dcb306fc661bfab322c75b55472e402387396099", + "version": "1.79.0", + "port-version": 1 + }, + { + "git-tree": "03b0eb80e437663830851f7891d02125694b4ee0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-move.json b/external_imported/vcpkg/versions/b-/boost-move.json index 27252e03f..44b92bb14 100644 --- a/external_imported/vcpkg/versions/b-/boost-move.json +++ b/external_imported/vcpkg/versions/b-/boost-move.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a892eef83cda1beff03d4a7dc11481b153fadfa0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "957381b3c5ac7d2b563b2563ca8a78d49f034e68", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a2b516a6391277e0c72147caf8c6677c92bff2a8", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-mp11.json b/external_imported/vcpkg/versions/b-/boost-mp11.json index d0f8ddd0e..4eb661f0c 100644 --- a/external_imported/vcpkg/versions/b-/boost-mp11.json +++ b/external_imported/vcpkg/versions/b-/boost-mp11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cf20115432a67132df2313b6ad134276595cd886", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b741f7087023927b8345779b9a30575e1dee383f", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "06e8d1438943e47b1b4282964a0d290461ba3387", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-mpi.json b/external_imported/vcpkg/versions/b-/boost-mpi.json index 83b6cdc5d..59a2a182c 100644 --- a/external_imported/vcpkg/versions/b-/boost-mpi.json +++ b/external_imported/vcpkg/versions/b-/boost-mpi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "87dd60df15aacd026d27193cc0efd1b5323dcde9", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "17190e3d8acbcc5d48001bcf01250f91ff68dbc1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "752ad29481d8c40a2a16cf1d18669a410e78d150", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-mpl.json b/external_imported/vcpkg/versions/b-/boost-mpl.json index d9d464cac..97c226e06 100644 --- a/external_imported/vcpkg/versions/b-/boost-mpl.json +++ b/external_imported/vcpkg/versions/b-/boost-mpl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c213f7c4b3d93700c4cfa30498138df314619c98", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1fa673fcec0135c3a144d90528f719b281d29043", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a8b09063ef7fce74a9bfc52625ea7bf285cf4a82", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-msm.json b/external_imported/vcpkg/versions/b-/boost-msm.json index f7bc81377..7b628e701 100644 --- a/external_imported/vcpkg/versions/b-/boost-msm.json +++ b/external_imported/vcpkg/versions/b-/boost-msm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b4b10c39ed7937f0cd9539a22f7af1bfc5a3a08", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "cb6831b52a7befc70effc89fbb0313b371f28563", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ce4a5ac8b3d7cabf044883d6ab34c4360b75792e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-multi-array.json b/external_imported/vcpkg/versions/b-/boost-multi-array.json index bb280f548..e2435601f 100644 --- a/external_imported/vcpkg/versions/b-/boost-multi-array.json +++ b/external_imported/vcpkg/versions/b-/boost-multi-array.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9f1e6f3a8453417be928e6f603986ca0937d6365", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "2a9a9941b94769dd48089ce42e4bc3eeadd5421b", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b83337494c61a0f45310b4c298399841ac301aed", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-multi-index.json b/external_imported/vcpkg/versions/b-/boost-multi-index.json index 280c9655c..b691c88da 100644 --- a/external_imported/vcpkg/versions/b-/boost-multi-index.json +++ b/external_imported/vcpkg/versions/b-/boost-multi-index.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e217e3de385a4953c622960e326d5ae354822f19", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bccc5117c54e12afbd300458b25ec698ae860db4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "7a7e300ddb860a345ca0b9889cbe5d5d11934090", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-multiprecision.json b/external_imported/vcpkg/versions/b-/boost-multiprecision.json index d69170a7c..43ed0ac23 100644 --- a/external_imported/vcpkg/versions/b-/boost-multiprecision.json +++ b/external_imported/vcpkg/versions/b-/boost-multiprecision.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5e2eb2ccd2df8fe19e09aeb8b2c23cb1142c649b", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "636ec387aa16d01e5eb3604bf4c70e90ef520cd5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2914c2dcd5cb9a604c14ca9a5e9600ac7c0ecfd9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-nowide.json b/external_imported/vcpkg/versions/b-/boost-nowide.json index 8facc05ae..5c1794f7f 100644 --- a/external_imported/vcpkg/versions/b-/boost-nowide.json +++ b/external_imported/vcpkg/versions/b-/boost-nowide.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a5bf7c703090e7a83527aef14901df5e26668240", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "8013e5dd702b7f4c9973872435060812981af2f8", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c38c862892bc328c743481ee48b3abf50e66a51f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json b/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json index 627d7d95c..1bb3f5f27 100644 --- a/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json +++ b/external_imported/vcpkg/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d472eba74f6936b736a2759ae9e0be3c96a7d4b7", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "33a349e75f738b735e678de319469c0f9009a413", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "11dcb5d23dd6b1db7138ffe608d76134ce1e4ec5", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-odeint.json b/external_imported/vcpkg/versions/b-/boost-odeint.json index 7ae02c2e9..43dfca7a2 100644 --- a/external_imported/vcpkg/versions/b-/boost-odeint.json +++ b/external_imported/vcpkg/versions/b-/boost-odeint.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f08d713ac19958a488cba507887bc2e7beea1a2e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "893dab725dc2e30afa421db9d4ad5f153da10ab3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "069823a27c74a3a7872a0faed570b16130b4698d", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-optional.json b/external_imported/vcpkg/versions/b-/boost-optional.json index df05ebfd2..378697865 100644 --- a/external_imported/vcpkg/versions/b-/boost-optional.json +++ b/external_imported/vcpkg/versions/b-/boost-optional.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f25e73c7f9e4db6d27692ece6b2db2269bbd3a72", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "9480f61fee5df6864a425964bd13ee783a7572a9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4171d6f66bb828d51bee3de777da9384232b6068", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-outcome.json b/external_imported/vcpkg/versions/b-/boost-outcome.json index dd7a8d16b..6351f6b59 100644 --- a/external_imported/vcpkg/versions/b-/boost-outcome.json +++ b/external_imported/vcpkg/versions/b-/boost-outcome.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3e67c523f8a5112b14aec2d7f931027848e9d424", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ab5e09720b095a4dedf3a6c9c01b5512c67917a2", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ea24820de39876b61aa98e1d54ac9663c0355f93", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-parameter-python.json b/external_imported/vcpkg/versions/b-/boost-parameter-python.json index fd8335ec4..83c1398ad 100644 --- a/external_imported/vcpkg/versions/b-/boost-parameter-python.json +++ b/external_imported/vcpkg/versions/b-/boost-parameter-python.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0f685a59fbc75e930b74189fa71a740ca2a4eb60", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "d5d0f28a377b7508134bef9f354168e9aa49f1bb", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5a1cbdfec8ad70998ccfb368a3e77d8658023fed", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-parameter.json b/external_imported/vcpkg/versions/b-/boost-parameter.json index cfb5561a3..51dbb5077 100644 --- a/external_imported/vcpkg/versions/b-/boost-parameter.json +++ b/external_imported/vcpkg/versions/b-/boost-parameter.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dfa271d39fd1a50822e9c72199164d383410bbe5", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "94340499eaf0d204a8000b09a4b7f58eeb12c84d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e11ea75fd7178b78b5a3751aa7db269c8ef222cb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-pfr.json b/external_imported/vcpkg/versions/b-/boost-pfr.json index 1adbe9da1..873942c7e 100644 --- a/external_imported/vcpkg/versions/b-/boost-pfr.json +++ b/external_imported/vcpkg/versions/b-/boost-pfr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5d050fa2a0189cd8ff8625e9ee6b6199b3a28785", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "48758ff038842f02fbf6f47c5f90afe1ae682a51", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1ca2c9de4c7a8553f401a9f7b9e954eb6305bc47", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-phoenix.json b/external_imported/vcpkg/versions/b-/boost-phoenix.json index e7bb37ca7..f7f86479c 100644 --- a/external_imported/vcpkg/versions/b-/boost-phoenix.json +++ b/external_imported/vcpkg/versions/b-/boost-phoenix.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c69ac60adcb765d3b35a18b2be37dd7ea21fa711", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "571d5f1a068664b1f31dddd3541b6a19bfdbec2d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1812de4001c736517ca9bd780fa4b5258dfb134c", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-poly-collection.json b/external_imported/vcpkg/versions/b-/boost-poly-collection.json index 87bbb42eb..8c0031bd6 100644 --- a/external_imported/vcpkg/versions/b-/boost-poly-collection.json +++ b/external_imported/vcpkg/versions/b-/boost-poly-collection.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4be3065ec0871a76272899ff58c1e55aa9e387c1", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "866f9a4fce24354f73363d787352bcc2ff22d917", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "3a128149f5edfbf7e5c4fcbf497b29ce587a35ad", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-polygon.json b/external_imported/vcpkg/versions/b-/boost-polygon.json index ef14dc9bf..af929a5a4 100644 --- a/external_imported/vcpkg/versions/b-/boost-polygon.json +++ b/external_imported/vcpkg/versions/b-/boost-polygon.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c77b533b461ca02f57c02480d0b49175fcd33305", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bbb7a4fbca9a45b0166893128f343ed3f9bc099a", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "67a7f31ef72a1ceff351456cc7282b6f261db187", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-pool.json b/external_imported/vcpkg/versions/b-/boost-pool.json index 0eeab3a57..94e45f745 100644 --- a/external_imported/vcpkg/versions/b-/boost-pool.json +++ b/external_imported/vcpkg/versions/b-/boost-pool.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "72126937ced48f11d0b1bd0417b55c0bbbff80d0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a75a80498bfc1134bb8d5808b5f8b457e4032908", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8c0061ca841cab5b588ebae9bd1387882eec3435", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-predef.json b/external_imported/vcpkg/versions/b-/boost-predef.json index 7e40a366a..b7b6ee15e 100644 --- a/external_imported/vcpkg/versions/b-/boost-predef.json +++ b/external_imported/vcpkg/versions/b-/boost-predef.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aba63dc45c18c5b2486a1597c57a8c8bc8c4332e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c17a7256c1f86eab749e10b451dbf53d317afaf9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1865984507efa465dea0f7d597528cfedcef0b7e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-preprocessor.json b/external_imported/vcpkg/versions/b-/boost-preprocessor.json index 5ce1911e6..43308672b 100644 --- a/external_imported/vcpkg/versions/b-/boost-preprocessor.json +++ b/external_imported/vcpkg/versions/b-/boost-preprocessor.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ecc094cbf773842dc012128b15a0a8b33655a48a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1790581b89b5cf96bd870854b2bc4b256032a9c9", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e69da51c3ec0a8086ab18dbf75da11649aed5157", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-process.json b/external_imported/vcpkg/versions/b-/boost-process.json index ea3ab61e8..8380f3a9b 100644 --- a/external_imported/vcpkg/versions/b-/boost-process.json +++ b/external_imported/vcpkg/versions/b-/boost-process.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bf4118e63efe0bc19f98f3639916e3dc565884ba", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "2a6c17a26c19ac770d39c549749a86f62b93ca36", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "669ff76873e507b50238609e17bb0208559cd224", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-program-options.json b/external_imported/vcpkg/versions/b-/boost-program-options.json index b9f291ecd..86202bb1c 100644 --- a/external_imported/vcpkg/versions/b-/boost-program-options.json +++ b/external_imported/vcpkg/versions/b-/boost-program-options.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "306ab169b6f177e71d82cb08c77a8629337a1b6a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ad5cb3defd7e6f0f2be69f7090d2f996e4d4d885", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8a0432f928213aacc0f1a51eef24201e1f120690", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json b/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json index af221a68c..27c61e7c7 100644 --- a/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json +++ b/external_imported/vcpkg/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "addcd2668a3f5f1ce1dcd5f3b548077cd9c3a16c", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "9f8124a589753446efa038489607ddd868c7e2c4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2d9edadb62d7a55975cf22e01b7ee0ce74b4301a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-property-map.json b/external_imported/vcpkg/versions/b-/boost-property-map.json index fc1ff00c0..05b03f04f 100644 --- a/external_imported/vcpkg/versions/b-/boost-property-map.json +++ b/external_imported/vcpkg/versions/b-/boost-property-map.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6a784463d4425f1b9f97d5e469a27a8223f5f0b0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "80eb3c867ca2f805d2379963d69c12f7f877bad0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4c37ef13cdc33278fba6fa5c5bab30de91ce90e2", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-property-tree.json b/external_imported/vcpkg/versions/b-/boost-property-tree.json index b2ace9a66..f0bdae218 100644 --- a/external_imported/vcpkg/versions/b-/boost-property-tree.json +++ b/external_imported/vcpkg/versions/b-/boost-property-tree.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0993baf1328cd41a1f980b4e1147a38e44b7c23d", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f05a46d069778748274ff28002994e04d3654286", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "281dadcd5a8a6843ae829c4b653f33e7d1dbe2dd", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-proto.json b/external_imported/vcpkg/versions/b-/boost-proto.json index ca8228970..0131dbe7a 100644 --- a/external_imported/vcpkg/versions/b-/boost-proto.json +++ b/external_imported/vcpkg/versions/b-/boost-proto.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "df51ae90d5540b775b1f14bf796bd7e4f4b6529e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "26184f2fdf2a6c15a79964befeba82802d7d6afd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "46fcd6f1550adf925df0d985dd5463991150a13f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-ptr-container.json b/external_imported/vcpkg/versions/b-/boost-ptr-container.json index 73a437659..53ee1a5ca 100644 --- a/external_imported/vcpkg/versions/b-/boost-ptr-container.json +++ b/external_imported/vcpkg/versions/b-/boost-ptr-container.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "81b98fdaf0c11a4b157b220a98d050fabead9e06", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "879641e4ff9cfca37db16a03f72b04afeed909c6", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "81591a280761661476868c5f064461475bd10ba2", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-python.json b/external_imported/vcpkg/versions/b-/boost-python.json index 308d3c3d3..299c10eaa 100644 --- a/external_imported/vcpkg/versions/b-/boost-python.json +++ b/external_imported/vcpkg/versions/b-/boost-python.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37c146ee0ddbf30f5372bf434bca80f97d1a653e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0d5885833470840d6af709f368a42df4c3b09df4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a4cbab3ca82048134b757a0689d4ab3a83a7b695", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-qvm.json b/external_imported/vcpkg/versions/b-/boost-qvm.json index 8596f6f2e..f81e60640 100644 --- a/external_imported/vcpkg/versions/b-/boost-qvm.json +++ b/external_imported/vcpkg/versions/b-/boost-qvm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b341b99d2ab5ebdd7722ee83fe57c5cad255a2ef", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "8f8a09f7b75cca0fe3cd7995f234ee35f985c3cf", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e2c998753d319d94c00d3b3b3365e2a116bad23f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-random.json b/external_imported/vcpkg/versions/b-/boost-random.json index 3b9f756a0..402fd1345 100644 --- a/external_imported/vcpkg/versions/b-/boost-random.json +++ b/external_imported/vcpkg/versions/b-/boost-random.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6372fd79a4e213f92ebe9e71be03fdf71b77d532", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "6c02cc8343df9ea692504b16db286eba1fc320a6", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ca9654479a3b0b92cba2e2c05fb927715b87a10c", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-range.json b/external_imported/vcpkg/versions/b-/boost-range.json index ceff56a9a..7ccfc326f 100644 --- a/external_imported/vcpkg/versions/b-/boost-range.json +++ b/external_imported/vcpkg/versions/b-/boost-range.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8c39bc84eb02172bd336ad4c310a181ce983eae5", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "fff762e26af0f46863606c7fd088491dfcc84599", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "1ec82281ed52b6d4ae225abe93a18392c846cbc9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-ratio.json b/external_imported/vcpkg/versions/b-/boost-ratio.json index f5678705e..c30f356f4 100644 --- a/external_imported/vcpkg/versions/b-/boost-ratio.json +++ b/external_imported/vcpkg/versions/b-/boost-ratio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9474d4e6541e03de3c1636305bf1dbcbc46ac971", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "3c85cac76a643d538a52553a54353fbb818b3169", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a5e0af272c7df2d7994c6d98ad1d76df6b5330f7", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-rational.json b/external_imported/vcpkg/versions/b-/boost-rational.json index b84c1db30..5359141f5 100644 --- a/external_imported/vcpkg/versions/b-/boost-rational.json +++ b/external_imported/vcpkg/versions/b-/boost-rational.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ebe5bd52b65623fca07154f8dd993ae9bf7522f", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "bd0b9e457fc969fdac6b9ee36b77a26b3c680ad5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2a2877b20057e313af02d1307832d90f764b2dc1", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-regex.json b/external_imported/vcpkg/versions/b-/boost-regex.json index 4071d5815..d15538977 100644 --- a/external_imported/vcpkg/versions/b-/boost-regex.json +++ b/external_imported/vcpkg/versions/b-/boost-regex.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8ca14abfbb7f576ae870202425068b603e48452f", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "49b26b133e2b9eb16d917930b2c697b58eff5530", + "version": "1.79.0", + "port-version": 1 + }, + { + "git-tree": "a10bdc49cf30856030ed08921a5a30f3c3f3bdb1", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "f04cda8dcb436a4cfaa008331d05ef2d0974b698", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-safe-numerics.json b/external_imported/vcpkg/versions/b-/boost-safe-numerics.json index d09bdb78b..aa24138f7 100644 --- a/external_imported/vcpkg/versions/b-/boost-safe-numerics.json +++ b/external_imported/vcpkg/versions/b-/boost-safe-numerics.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "50e0e90565017dfa188314c53df5119c8fa3e5ce", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ac39614e028fa51d8de1210c0a003ecde411e156", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d425b6103c0c8a5824e74768d16fee276a33e99c", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-scope-exit.json b/external_imported/vcpkg/versions/b-/boost-scope-exit.json index 465a08b63..afbe0ed1b 100644 --- a/external_imported/vcpkg/versions/b-/boost-scope-exit.json +++ b/external_imported/vcpkg/versions/b-/boost-scope-exit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d6f15ab55ce24e64b53a1004d5286a2a6af1ba1", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "a27fe8833a067b072476368cdcbc1ae686236578", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e3d93cccff577045dce502c87ffcb02efb259ae8", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-serialization.json b/external_imported/vcpkg/versions/b-/boost-serialization.json index 9305f3e62..0fe7345a8 100644 --- a/external_imported/vcpkg/versions/b-/boost-serialization.json +++ b/external_imported/vcpkg/versions/b-/boost-serialization.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "566a672aaf52abdc07527d293f88772b3e28e079", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "aef44ba080120ebe8f5af25a6d019781323a5206", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c51578433055196c6e74bcdf792f4092479336de", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-signals2.json b/external_imported/vcpkg/versions/b-/boost-signals2.json index bbfab113a..a3c864ef7 100644 --- a/external_imported/vcpkg/versions/b-/boost-signals2.json +++ b/external_imported/vcpkg/versions/b-/boost-signals2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7846d029daf05be0a560dad09ac64a64850a297", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f6ab0c163ef679f14f84b6510c8508a90facf986", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b3a1129bee4ba8d867758248e1b66add1a2bedb8", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-smart-ptr.json b/external_imported/vcpkg/versions/b-/boost-smart-ptr.json index 1fccd5526..885b43f58 100644 --- a/external_imported/vcpkg/versions/b-/boost-smart-ptr.json +++ b/external_imported/vcpkg/versions/b-/boost-smart-ptr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b7b255db01f37243bdc87ffabeaf493dcb9de474", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b94b3b41ab4bb281041f40d876baf221c05818ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "18806e0372da7b7f8b2d6a8ff4bd7bf074a690cd", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-sort.json b/external_imported/vcpkg/versions/b-/boost-sort.json index 37023d6b8..05abdb2b0 100644 --- a/external_imported/vcpkg/versions/b-/boost-sort.json +++ b/external_imported/vcpkg/versions/b-/boost-sort.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "be28a0d59e37787052758401bd5ab59a0f70d9ca", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "74c73a3ccafccfc9e85fe3879ea90ff7a13ebcfd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fc0176556b8aaecb87376a59e2f711a9068dab3a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-spirit.json b/external_imported/vcpkg/versions/b-/boost-spirit.json index 9debd0003..a73ce414e 100644 --- a/external_imported/vcpkg/versions/b-/boost-spirit.json +++ b/external_imported/vcpkg/versions/b-/boost-spirit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "74f1c93e41e9b732a47afc259b396c0812f266de", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "6a4bdffc6ef22bfee8942319cb5a69b2e85fe231", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "05502d056fb4e5569f87cd2a591ce5802f4020eb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-stacktrace.json b/external_imported/vcpkg/versions/b-/boost-stacktrace.json index 1df417364..b7def5cbe 100644 --- a/external_imported/vcpkg/versions/b-/boost-stacktrace.json +++ b/external_imported/vcpkg/versions/b-/boost-stacktrace.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d2168810ccbabcae3d538f8679181ae300b815ac", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0ddf64c066bcc3189d13bd7eedbaa646cdb073ff", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "e00114d87145dd426e0816ce0e5fd0ab4a587ad9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-statechart.json b/external_imported/vcpkg/versions/b-/boost-statechart.json index 42cb3b6dc..96876a642 100644 --- a/external_imported/vcpkg/versions/b-/boost-statechart.json +++ b/external_imported/vcpkg/versions/b-/boost-statechart.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "41d7af8a2e26fd1f41dae61d62cb8484ea978884", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b6d892f7ec7ba87a98fd9bd2fced0c0ca6161fcd", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ef8ccac6b5ef76c3b862e46b9f6cb37169e8b20a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-static-assert.json b/external_imported/vcpkg/versions/b-/boost-static-assert.json index 32ca4d27b..db16cbc80 100644 --- a/external_imported/vcpkg/versions/b-/boost-static-assert.json +++ b/external_imported/vcpkg/versions/b-/boost-static-assert.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "55582331cbe3fc0e46ca145196d341140511edad", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "673cf82169b2b1696d993477d47b2f94d4350a7f", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "0d1e3a21f0be997c400b7c60dc2ec1b1beccbe3c", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-static-string.json b/external_imported/vcpkg/versions/b-/boost-static-string.json index bd08640c6..f68052203 100644 --- a/external_imported/vcpkg/versions/b-/boost-static-string.json +++ b/external_imported/vcpkg/versions/b-/boost-static-string.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b58ce47fd0d910a9b436540cf87e0b06a1767fa3", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "575a5fac2b96da2ff39038a733fea5455f91caf4", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fe40bbd1d9be4c65daee4bf8f58a6b08baea4bdb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json b/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json index c0c2407c4..5cf15ad6e 100644 --- a/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json +++ b/external_imported/vcpkg/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0b82eb711e6d0b9a580b7fd149b1bd4b95d9c9d1", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1f59d2ba966f1e2c2ef5f23150c5a8dd348d98fa", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "536059a4a77be87c1825fd1523cc29e47c86541d", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-system.json b/external_imported/vcpkg/versions/b-/boost-system.json index a6aba1c1d..83746e0a7 100644 --- a/external_imported/vcpkg/versions/b-/boost-system.json +++ b/external_imported/vcpkg/versions/b-/boost-system.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "198bd87002215340f09b4269e8d80dbb7f314c7e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "e5bca2d39362ef3978473a1d184f017ed277d1e5", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "eaab2373181b829bf4cb4ee298dfc9c80e98f01f", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-test.json b/external_imported/vcpkg/versions/b-/boost-test.json index e1edf4f03..eafa3eb4c 100644 --- a/external_imported/vcpkg/versions/b-/boost-test.json +++ b/external_imported/vcpkg/versions/b-/boost-test.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7324e419ee3fa4d7871aae2cac389cb3eb2dda94", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "127affd76f8dea78857d11e147a2cd03d8e827e3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "5015382ed40be617a3ec97adb17c0c1ecf3ab2d9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-thread.json b/external_imported/vcpkg/versions/b-/boost-thread.json index 1f4e22e27..d933b3574 100644 --- a/external_imported/vcpkg/versions/b-/boost-thread.json +++ b/external_imported/vcpkg/versions/b-/boost-thread.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "010869a933ea4108c7cfb6ebc10d86ff823a1073", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "d40c962d08c08d397520ace757ef7aab055a59be", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "ef371df76c2b790aae7209d2866c467bd6d339be", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-throw-exception.json b/external_imported/vcpkg/versions/b-/boost-throw-exception.json index 7889d4fe0..c4428fee1 100644 --- a/external_imported/vcpkg/versions/b-/boost-throw-exception.json +++ b/external_imported/vcpkg/versions/b-/boost-throw-exception.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7ff821c116eab19736c1549d09245fbac968c7ec", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "1607edf60f1243503820e06b4d3e16c385aa691d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2ab1c68ab2a41696a5f36841a66178256b8d229e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-timer.json b/external_imported/vcpkg/versions/b-/boost-timer.json index 10b443bb4..b6220aea9 100644 --- a/external_imported/vcpkg/versions/b-/boost-timer.json +++ b/external_imported/vcpkg/versions/b-/boost-timer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dc5dca14265350c93bafac78b73c1305d514a9ea", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "ebd77c0ba62a3665404c4143e4208b387b57a5ca", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "bf38eaeaceb0c989b414c6570b560e28822034fb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-tokenizer.json b/external_imported/vcpkg/versions/b-/boost-tokenizer.json index ea1e28890..7403761b0 100644 --- a/external_imported/vcpkg/versions/b-/boost-tokenizer.json +++ b/external_imported/vcpkg/versions/b-/boost-tokenizer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "860575e6cabb9769a64a55d67b8734decfc0dc25", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7e5682fee6727bada3b88221bd416edaa80f6a34", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "24c6aef67afefb01d20749d7b43790efcb1dfc66", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-tti.json b/external_imported/vcpkg/versions/b-/boost-tti.json index 3e1cc883f..8fa56da92 100644 --- a/external_imported/vcpkg/versions/b-/boost-tti.json +++ b/external_imported/vcpkg/versions/b-/boost-tti.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "845aab372d2f165939e1554598fcb6d7963119e8", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "027de695e13801dcc7a947fea766bd29b687e7ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c47f152005c71db858b015f18edf72b02f7ebf27", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-tuple.json b/external_imported/vcpkg/versions/b-/boost-tuple.json index 0593f929d..7420d7726 100644 --- a/external_imported/vcpkg/versions/b-/boost-tuple.json +++ b/external_imported/vcpkg/versions/b-/boost-tuple.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e4941b65ae10c7111efc790716e7ab44108718c0", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "c3b718eea1f62e7b4918b3c4f6a4be731d4085ce", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "da0a88c5630fa116b473e02aae6651199529649e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-type-erasure.json b/external_imported/vcpkg/versions/b-/boost-type-erasure.json index 2d619ab0f..7e9a93805 100644 --- a/external_imported/vcpkg/versions/b-/boost-type-erasure.json +++ b/external_imported/vcpkg/versions/b-/boost-type-erasure.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dabde40cb34f79fba07538d0dfe27e001fdd022d", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f5797832d5179682e09ba62f0f7cf25a58cbfe61", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "787c75c5f25da496fb26723589ed3ea5c2c73a49", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-type-index.json b/external_imported/vcpkg/versions/b-/boost-type-index.json index 7dc17e637..cde0113b5 100644 --- a/external_imported/vcpkg/versions/b-/boost-type-index.json +++ b/external_imported/vcpkg/versions/b-/boost-type-index.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "139ead6a2f009c871512ff2313970a7ced6ba19a", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b4e2eff6204ba68938a99059b23d3abbd2e1dc55", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fac6a10bb329da6cd19cfde9534ef11b3edb8623", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-type-traits.json b/external_imported/vcpkg/versions/b-/boost-type-traits.json index 2e1aff84a..ee1858b0c 100644 --- a/external_imported/vcpkg/versions/b-/boost-type-traits.json +++ b/external_imported/vcpkg/versions/b-/boost-type-traits.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "64116e3dd1e586ab99b4f39786b73fc6bf433565", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7969a397a6c03205ec1c118834272183ff4201c7", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8ce0cad0c57f4acd5da2369894a0db64b918ac41", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-typeof.json b/external_imported/vcpkg/versions/b-/boost-typeof.json index 3d5361e90..753114dca 100644 --- a/external_imported/vcpkg/versions/b-/boost-typeof.json +++ b/external_imported/vcpkg/versions/b-/boost-typeof.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7157d86a4332212ca5da2d3e4bcb980f59373c1f", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "81216888498f3c8f6563b991a1d601af139da128", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "478fadf37863e72ec547e1a7620da6a28cc85c7d", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-ublas.json b/external_imported/vcpkg/versions/b-/boost-ublas.json index 6833fb11b..f5ec25031 100644 --- a/external_imported/vcpkg/versions/b-/boost-ublas.json +++ b/external_imported/vcpkg/versions/b-/boost-ublas.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1fe638c91ec64ab61220e4ece208a9d70ad9557f", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7657da84dd6a03bc4130b2c3ff215f45a5ddd8c0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4c6ffcc2498c1521634d070a99e02c695f069c2e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-uninstall.json b/external_imported/vcpkg/versions/b-/boost-uninstall.json index 4beb41f50..85f74d46a 100644 --- a/external_imported/vcpkg/versions/b-/boost-uninstall.json +++ b/external_imported/vcpkg/versions/b-/boost-uninstall.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9eb27209522fff06b9aad5e4443312888cf680ce", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "e2d05f10364104d9b7de2383bcb105a1fd3fe975", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "996078abceb6009fb2841dd97edc5246e8bd38aa", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-units.json b/external_imported/vcpkg/versions/b-/boost-units.json index c0e3151fd..fa0b027a1 100644 --- a/external_imported/vcpkg/versions/b-/boost-units.json +++ b/external_imported/vcpkg/versions/b-/boost-units.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "94d24c25122f4aee516ae8df34e60450dc7a9dad", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "33f1a2b53e7c36f387866d1e84e0dd2aa1b21c4d", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "30bc337bdcbfbfb7339e8a4dd2169df60fbae249", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-unordered.json b/external_imported/vcpkg/versions/b-/boost-unordered.json index b6148e358..98dfe9ac0 100644 --- a/external_imported/vcpkg/versions/b-/boost-unordered.json +++ b/external_imported/vcpkg/versions/b-/boost-unordered.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a64980c42d17c231e1164e6dcd7f55361cf6bbca", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b73d98ab77d4de1a3e4f12bdd84869dfc3adedc0", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c55ee280fedefd69dba819a4d768d5a5e132f9b9", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-utility.json b/external_imported/vcpkg/versions/b-/boost-utility.json index efa7b88b5..836fcfd1e 100644 --- a/external_imported/vcpkg/versions/b-/boost-utility.json +++ b/external_imported/vcpkg/versions/b-/boost-utility.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9544b25d2474879b1dc04879bf6d48ac20b8ae1d", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "8eb91c7a3ad14393219ba020d3d26c39a325c626", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "4e39c1737260328064c10b743aba90788efc467a", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-uuid.json b/external_imported/vcpkg/versions/b-/boost-uuid.json index 6775ec029..2cc4de3d8 100644 --- a/external_imported/vcpkg/versions/b-/boost-uuid.json +++ b/external_imported/vcpkg/versions/b-/boost-uuid.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "346b3215925506cde0a4d8f2558434f812572094", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "dbf4e64381a3c6279ad5f91a7c64c8f5ca9ef145", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "19c834dc170873080e1c6308233fd9041ae42cce", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-variant.json b/external_imported/vcpkg/versions/b-/boost-variant.json index cddad5a84..f78dc3fc3 100644 --- a/external_imported/vcpkg/versions/b-/boost-variant.json +++ b/external_imported/vcpkg/versions/b-/boost-variant.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "052552e2ffe5c387e6dfd6800509379143747b93", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "33b3da200705df22017f639acdc1e2eade79606e", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "a2196d2cb8c61db4cdd6285170589e079c1ff3bb", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-variant2.json b/external_imported/vcpkg/versions/b-/boost-variant2.json index dd69437d4..0d85b401e 100644 --- a/external_imported/vcpkg/versions/b-/boost-variant2.json +++ b/external_imported/vcpkg/versions/b-/boost-variant2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0bc906a591673c127a85b38092dac0ab850931e5", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b9af9e4791e65b001bbfb107eeecf819369a06b3", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "30915b5f5005d9b166f4349f493b4f7314d84c17", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json b/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json index 652b90ee8..ba0230c4a 100644 --- a/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json +++ b/external_imported/vcpkg/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "244bfc6425dfb6e1c0c8b556f6ab8786e394c246", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "0e96a2cb3400bcafd55070d18bdcab64808ada01", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "2b601d13ad505473bac3d555d9e543d981c46565", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-vmd.json b/external_imported/vcpkg/versions/b-/boost-vmd.json index dc92ffb0e..b65443025 100644 --- a/external_imported/vcpkg/versions/b-/boost-vmd.json +++ b/external_imported/vcpkg/versions/b-/boost-vmd.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f1ce668d0b408886328f3602b4ba2dcdc6e0f34", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "5d88c4a6cefe62b5d05e9fed932188a7049fe991", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "d89558e11194fd019488c8e4550bc8b7debb38d4", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-wave.json b/external_imported/vcpkg/versions/b-/boost-wave.json index aaf5de7f4..44aef0e45 100644 --- a/external_imported/vcpkg/versions/b-/boost-wave.json +++ b/external_imported/vcpkg/versions/b-/boost-wave.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3b3867b5b587bc385e9c185e669651610af7ee0e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "d8db04f2186df7eacfe00e02666510ba3f750753", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "fbf126b4e9405233ffd54018c18cf84895f59f29", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-winapi.json b/external_imported/vcpkg/versions/b-/boost-winapi.json index 154870d8b..7c2ddb205 100644 --- a/external_imported/vcpkg/versions/b-/boost-winapi.json +++ b/external_imported/vcpkg/versions/b-/boost-winapi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "510961ace0ba15ccb5018734f6638f8af539258c", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "7f82a0041bb3b4ac1f3721afe5ba4e24e27c3a3c", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "8492201c09a250964609eea910b3d37c9895d411", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-xpressive.json b/external_imported/vcpkg/versions/b-/boost-xpressive.json index 08d44ea45..d6527b7fc 100644 --- a/external_imported/vcpkg/versions/b-/boost-xpressive.json +++ b/external_imported/vcpkg/versions/b-/boost-xpressive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e226118acbf483b6f0fd12cf6037a961520140df", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "26cd8244e5c07efa76837461cd426c5f4ca25dab", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "b117a25b1705a9a21ddb41a01bc8c081121d6d95", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost-yap.json b/external_imported/vcpkg/versions/b-/boost-yap.json index 6272a7bcc..fd6a05a3f 100644 --- a/external_imported/vcpkg/versions/b-/boost-yap.json +++ b/external_imported/vcpkg/versions/b-/boost-yap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "382723f52354a14670f68b46c89c1101c0310a4e", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "b65c58d6abe35bd1300b250d8d7519a7d56292b8", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "692c496d822a9132dcf05c76bfee43bf7ab56c5e", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boost.json b/external_imported/vcpkg/versions/b-/boost.json index 8b2083ba5..86076e72b 100644 --- a/external_imported/vcpkg/versions/b-/boost.json +++ b/external_imported/vcpkg/versions/b-/boost.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f4e929db67c1d0b4c043ec1f1f1d1f1157029d99", + "version": "1.80.0", + "port-version": 0 + }, + { + "git-tree": "f742b459c69d004cd97fe8fd62e4b813224eba10", + "version": "1.79.0", + "port-version": 0 + }, { "git-tree": "c6924d40a63cbd74c48964edd069a5df1df8b615", "version": "1.78.0", diff --git a/external_imported/vcpkg/versions/b-/boringssl.json b/external_imported/vcpkg/versions/b-/boringssl.json index 5700899dc..4f560eae8 100644 --- a/external_imported/vcpkg/versions/b-/boringssl.json +++ b/external_imported/vcpkg/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d28c72d322cf2245e69075deef73c5edefee0b5", + "version-date": "2021-06-23", + "port-version": 2 + }, { "git-tree": "ca35c06a32c83f385f840831a435c69231a7852a", "version-date": "2021-06-23", diff --git a/external_imported/vcpkg/versions/b-/botan.json b/external_imported/vcpkg/versions/b-/botan.json index 70633dbd6..8dfe749ef 100644 --- a/external_imported/vcpkg/versions/b-/botan.json +++ b/external_imported/vcpkg/versions/b-/botan.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "46addf1e5297d40d351cf84d2a62d831592df1d1", + "version": "2.19.1", + "port-version": 1 + }, + { + "git-tree": "3fb61b05e32ed52193542dd9d5b86b7e2021dd99", + "version": "2.19.1", + "port-version": 0 + }, { "git-tree": "2d7fe86d0a8a13ebddda0ac759f824fb9066b644", "version": "2.18.1", diff --git a/external_imported/vcpkg/versions/b-/breakpad.json b/external_imported/vcpkg/versions/b-/breakpad.json index 8051dbd44..df04326d3 100644 --- a/external_imported/vcpkg/versions/b-/breakpad.json +++ b/external_imported/vcpkg/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b789572b559ed292fc35ad004d51d6d975b7d7f", + "version-date": "2022-07-12", + "port-version": 1 + }, { "git-tree": "1765629f89b1d8d3020f5e4baa35116b9da02c0a", "version-date": "2020-09-14", diff --git a/external_imported/vcpkg/versions/b-/brotli.json b/external_imported/vcpkg/versions/b-/brotli.json index e00f28e52..fc346bbfa 100644 --- a/external_imported/vcpkg/versions/b-/brotli.json +++ b/external_imported/vcpkg/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b182b3e0615d6f3538b5eeac680f7eb8af5abd0", + "version": "1.0.9", + "port-version": 3 + }, { "git-tree": "73d0ed2fd7816c7a4958983b0b027c85b60eac15", "version-string": "1.0.9", diff --git a/external_imported/vcpkg/versions/b-/brpc.json b/external_imported/vcpkg/versions/b-/brpc.json index a7a9687b5..32298858c 100644 --- a/external_imported/vcpkg/versions/b-/brpc.json +++ b/external_imported/vcpkg/versions/b-/brpc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2ed01cdb3f05cfc779d3162de470045bda69f985", + "version": "1.2.0", + "port-version": 1 + }, + { + "git-tree": "d75b4f1f3f1bf6072c3095fe34f29e86c19ec4d5", + "version": "1.2.0", + "port-version": 0 + }, + { + "git-tree": "c88bb19658430803981fbfa4ec45432bed88310b", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "bcff3231352f577720f51a99dbf9ecf0132ebcba", "version": "0.9.7", diff --git a/external_imported/vcpkg/versions/b-/brunocodutra-metal.json b/external_imported/vcpkg/versions/b-/brunocodutra-metal.json index 49c93e2f2..dc8d49cf9 100644 --- a/external_imported/vcpkg/versions/b-/brunocodutra-metal.json +++ b/external_imported/vcpkg/versions/b-/brunocodutra-metal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cf9fc40f35037ebc568d8da494ba1c84221327d", + "version": "2.1.4", + "port-version": 0 + }, { "git-tree": "54b5610e8e1541618650eec938a77148866716cc", "version": "2.1.3", diff --git a/external_imported/vcpkg/versions/b-/brynet.json b/external_imported/vcpkg/versions/b-/brynet.json index 1d9da2e43..858625aeb 100644 --- a/external_imported/vcpkg/versions/b-/brynet.json +++ b/external_imported/vcpkg/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eb954fee71dc1764d7261d36c185f42ee9c6378", + "version": "1.12.1", + "port-version": 0 + }, { "git-tree": "3a4cea82b4e937b478bd400d4a975dde33b3f741", "version": "1.11.2", diff --git a/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json b/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json index 15c2ec3e2..0ccb4edef 100644 --- a/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json +++ b/external_imported/vcpkg/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "dbe9095cfdb6128d117003b2495f84e50653c220", + "version": "3.3.0", + "port-version": 0 + }, + { + "git-tree": "fee21d430188c7e3c7f7d92da0cb30c48b6cafba", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "9903a88f968331b1a71254f21e8db7ddd5782df9", + "version": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "76370f19ee1a5791b57631d57ced31da022f8d3e", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "5ce890350a3e619b459eac4f676aa3e0858316b4", "version": "2.0.0", diff --git a/external_imported/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json b/external_imported/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json index 03d2c0f5d..c29277d61 100644 --- a/external_imported/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json +++ b/external_imported/vcpkg/versions/b-/buck-yeh-bux-mariadb-client.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f0ad91f620ffdc0ad8b2618c79f38aefa00accf4", + "version": "1.0.3", + "port-version": 1 + }, + { + "git-tree": "9c48d5f05cfc1910b874b0d5510ab332c108ab86", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "67f2e3a599ef1a984f01e973c71ccd5e4c0ba956", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/b-/buck-yeh-bux-sqlite.json b/external_imported/vcpkg/versions/b-/buck-yeh-bux-sqlite.json new file mode 100644 index 000000000..3b3be9e27 --- /dev/null +++ b/external_imported/vcpkg/versions/b-/buck-yeh-bux-sqlite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "70a2bfdaeafb4f4193be712ad81e0f9d16ce6294", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/b-/buck-yeh-bux.json b/external_imported/vcpkg/versions/b-/buck-yeh-bux.json index bb8b691b8..7c998bf16 100644 --- a/external_imported/vcpkg/versions/b-/buck-yeh-bux.json +++ b/external_imported/vcpkg/versions/b-/buck-yeh-bux.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f7bc53828c4e0a83a3242bb28682011495747ad2", + "version": "1.6.6", + "port-version": 1 + }, + { + "git-tree": "3d58f00b46ad32a1bfba6e5ee139aa47047e2bb6", + "version": "1.6.6", + "port-version": 0 + }, + { + "git-tree": "70c9bddf07b6b1bf2bed8f994f13d1d5703ed105", + "version": "1.6.5", + "port-version": 1 + }, + { + "git-tree": "1fd8af12a04b806faa041b8631ac34dc8c535b41", + "version": "1.6.5", + "port-version": 0 + }, { "git-tree": "54886a840d4c55d27047321af6de1a5a01ed888e", "version": "1.6.3", diff --git a/external_imported/vcpkg/versions/b-/bullet3.json b/external_imported/vcpkg/versions/b-/bullet3.json index 073216c26..96aed05e6 100644 --- a/external_imported/vcpkg/versions/b-/bullet3.json +++ b/external_imported/vcpkg/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f5ea7c8c35304edd8b2eadb5b60b7300a97b772", + "version": "3.22", + "port-version": 1 + }, { "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", "version": "3.22", diff --git a/external_imported/vcpkg/versions/b-/bustache.json b/external_imported/vcpkg/versions/b-/bustache.json index 6642c72b7..5744b051a 100644 --- a/external_imported/vcpkg/versions/b-/bustache.json +++ b/external_imported/vcpkg/versions/b-/bustache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "888d4f529ac5ecc9a12049beb50337d237f97e28", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "746808aa3bda8d2627ecc6da664cc58ebf57896e", "version-string": "1.1.0", diff --git a/external_imported/vcpkg/versions/baseline.json b/external_imported/vcpkg/versions/baseline.json index d09df1e2f..297dc1338 100644 --- a/external_imported/vcpkg/versions/baseline.json +++ b/external_imported/vcpkg/versions/baseline.json @@ -5,11 +5,15 @@ "port-version": 2 }, "7zip": { - "baseline": "21.07", + "baseline": "22.0", + "port-version": 0 + }, + "ableton": { + "baseline": "3.0.5", "port-version": 1 }, "abseil": { - "baseline": "20211102.1", + "baseline": "20220623.1", "port-version": 0 }, "absent": { @@ -17,12 +21,12 @@ "port-version": 1 }, "ace": { - "baseline": "7.0.6", - "port-version": 3 + "baseline": "7.0.8", + "port-version": 0 }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 8 + "port-version": 9 }, "ade": { "baseline": "0.1.1f", @@ -32,13 +36,17 @@ "baseline": "2020-06-26", "port-version": 0 }, + "air-ctl": { + "baseline": "1.1.2", + "port-version": 1 + }, "aixlog": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "akali": { - "baseline": "1.42", - "port-version": 3 + "baseline": "1.43", + "port-version": 1 }, "alac": { "baseline": "2017-11-03-c38887c5", @@ -60,6 +68,14 @@ "baseline": "5.2.6.0", "port-version": 2 }, + "alpaca": { + "baseline": "0.2.0", + "port-version": 0 + }, + "alpaka": { + "baseline": "0.9.0", + "port-version": 0 + }, "alsa": { "baseline": "1.2.6.1", "port-version": 0 @@ -70,7 +86,7 @@ }, "ampl-mp": { "baseline": "2020-11-11", - "port-version": 2 + "port-version": 3 }, "amqpcpp": { "baseline": "4.3.15", @@ -82,15 +98,15 @@ }, "angelscript": { "baseline": "2.35.1", - "port-version": 0 + "port-version": 1 }, "angle": { "baseline": "chromium_4472", - "port-version": 2 + "port-version": 3 }, "antlr4": { - "baseline": "4.9.3", - "port-version": 1 + "baseline": "4.10.1", + "port-version": 0 }, "any-lite": { "baseline": "0.4.0", @@ -98,11 +114,11 @@ }, "anyrpc": { "baseline": "2021-08-24", - "port-version": 0 + "port-version": 1 }, "aom": { "baseline": "3.2.0", - "port-version": 2 + "port-version": 3 }, "approval-tests-cpp": { "baseline": "10.12.2", @@ -110,15 +126,15 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 7 + "port-version": 11 }, "apr-util": { "baseline": "1.6.1", - "port-version": 7 + "port-version": 8 }, "apsi": { - "baseline": "0.7.0", - "port-version": 2 + "baseline": "0.8.2", + "port-version": 0 }, "arb": { "baseline": "2.21.1", @@ -133,11 +149,15 @@ "port-version": 1 }, "argh": { - "baseline": "2018-12-18", - "port-version": 3 + "baseline": "1.3.2", + "port-version": 0 + }, + "argon2": { + "baseline": "20190702", + "port-version": 0 }, "argparse": { - "baseline": "2.2", + "baseline": "2.8", "port-version": 0 }, "args": { @@ -157,44 +177,44 @@ "port-version": 1 }, "aricpp": { - "baseline": "1.1.1", - "port-version": 1 + "baseline": "1.1.2", + "port-version": 0 }, "armadillo": { - "baseline": "10.6.2", - "port-version": 5 + "baseline": "11.2.3", + "port-version": 0 }, "arrayfire": { "baseline": "3.8.0", - "port-version": 0 + "port-version": 2 }, "arrow": { - "baseline": "7.0.0", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 0 }, "ashes": { - "baseline": "2022-04-03", + "baseline": "2022-06-08", "port-version": 0 }, "asio": { - "baseline": "1.22.1", + "baseline": "1.24.0", "port-version": 0 }, "asio-grpc": { - "baseline": "1.5.1", + "baseline": "2.1.0", "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", - "port-version": 4 + "port-version": 5 }, "asmjit": { "baseline": "2021-10-26", "port-version": 1 }, "assimp": { - "baseline": "5.0.1", - "port-version": 5 + "baseline": "5.2.5", + "port-version": 0 }, "asynch": { "baseline": "2019-09-21", @@ -205,12 +225,12 @@ "port-version": 1 }, "atk": { - "baseline": "2.36.0", + "baseline": "2.38.0", "port-version": 2 }, "atkmm": { - "baseline": "2.36.0", - "port-version": 2 + "baseline": "2.36.1", + "port-version": 0 }, "atlmfc": { "baseline": "0", @@ -222,7 +242,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 7 + "port-version": 9 }, "audiofile": { "baseline": "1.1.0", @@ -245,8 +265,8 @@ "port-version": 1 }, "avisynthplus": { - "baseline": "3.7.0", - "port-version": 3 + "baseline": "3.7.2", + "port-version": 1 }, "avro-c": { "baseline": "1.11.0", @@ -265,8 +285,8 @@ "port-version": 2 }, "aws-c-common": { - "baseline": "0.6.9", - "port-version": 2 + "baseline": "0.6.20", + "port-version": 0 }, "aws-c-compression": { "baseline": "0.2.14", @@ -281,8 +301,8 @@ "port-version": 2 }, "aws-c-io": { - "baseline": "0.10.7", - "port-version": 2 + "baseline": "0.10.22", + "port-version": 0 }, "aws-c-mqtt": { "baseline": "0.7.6", @@ -309,24 +329,28 @@ "port-version": 1 }, "azmq": { - "baseline": "2020-03-03", - "port-version": 1 + "baseline": "1.0.3", + "port-version": 0 }, "azure-c-shared-utility": { - "baseline": "2022-01-21", - "port-version": 3 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.5.0", + "baseline": "1.7.2", + "port-version": 0 + }, + "azure-core-tracing-opentelemetry-cpp": { + "baseline": "1.0.0-beta.3", "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2022-01-21", - "port-version": 2 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", @@ -337,11 +361,11 @@ "port-version": 0 }, "azure-security-attestation-cpp": { - "baseline": "1.0.0-beta.1", + "baseline": "1.0.0", "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.0.0-beta.2", + "baseline": "4.0.0", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { @@ -349,15 +373,15 @@ "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.0.0-beta.2", + "baseline": "4.0.0", "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.4.0", + "baseline": "12.6.1", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.3", + "baseline": "12.3.0", "port-version": 0 }, "azure-storage-cpp": { @@ -377,24 +401,24 @@ "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-uhttp-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-umqtt-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "b64": { "baseline": "2.0.0.1", - "port-version": 0 + "port-version": 1 }, "basisu": { "baseline": "1.11", - "port-version": 5 + "port-version": 6 }, "bcg729": { "baseline": "1.1.1", @@ -409,8 +433,8 @@ "port-version": 5 }, "bdwgc": { - "baseline": "8.2.0", - "port-version": 3 + "baseline": "8.2.2", + "port-version": 0 }, "beast": { "baseline": "0", @@ -425,8 +449,8 @@ "port-version": 0 }, "bento4": { - "baseline": "1.5.1", - "port-version": 629 + "baseline": "1.6.0-639", + "port-version": 1 }, "berkeleydb": { "baseline": "4.8.30", @@ -437,11 +461,11 @@ "port-version": 1 }, "bext-sml": { - "baseline": "1.1.4", + "baseline": "1.1.5", "port-version": 0 }, "bext-ut": { - "baseline": "1.1.8", + "baseline": "1.1.9", "port-version": 0 }, "bext-wintls": { @@ -449,7 +473,7 @@ "port-version": 0 }, "bfgroup-lyra": { - "baseline": "1.5.1", + "baseline": "1.6", "port-version": 0 }, "bigint": { @@ -461,12 +485,12 @@ "port-version": 1 }, "bitmagic": { - "baseline": "7.5.0", + "baseline": "7.11.2", "port-version": 0 }, "bitserializer": { "baseline": "0.44", - "port-version": 0 + "port-version": 1 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -488,16 +512,20 @@ "baseline": "5.2.2", "port-version": 0 }, + "blake3": { + "baseline": "1.3.1", + "port-version": 1 + }, "blas": { "baseline": "1", "port-version": 1 }, "blaze": { - "baseline": "3.8", - "port-version": 2 + "baseline": "3.8.1", + "port-version": 0 }, "blend2d": { - "baseline": "2022-02-19", + "baseline": "2022-05-02", "port-version": 0 }, "blitz": { @@ -509,8 +537,8 @@ "port-version": 4 }, "boinc": { - "baseline": "7.18.1", - "port-version": 5 + "baseline": "7.20.2", + "port-version": 0 }, "bond": { "baseline": "9.0.3", @@ -521,139 +549,139 @@ "port-version": 0 }, "boost": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-align": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-any": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-array": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-assert": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-beast": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-build": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 1 }, "boost-callable-traits": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-config": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-container": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-container-hash": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-context": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-contract": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-conversion": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-core": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-describe": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-detail": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-di": { @@ -661,476 +689,476 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-fiber": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-filesystem": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-flyweight": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-format": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-function": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-io": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.78.0", - "port-version": 2 + "baseline": "1.80.0", + "port-version": 0 }, "boost-iterator": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-json": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lambda": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lambda2": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lockfree": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-log": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-logic": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-math": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-metaparse": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.78.0", - "port-version": 3 + "baseline": "1.80.0", + "port-version": 1 }, "boost-move": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mpl": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-process": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-map": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-map-parallel": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-python": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-qvm": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-random": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-range": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-signals2": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-statechart": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-system": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-test": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-thread": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-index": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-uninstall": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-units": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "1.78.0", - "port-version": 1 + "baseline": "1.80.0", + "port-version": 0 }, "boost-vmd": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-winapi": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.78.0", + "baseline": "1.80.0", "port-version": 0 }, "boringssl": { "baseline": "2021-06-23", - "port-version": 1 + "port-version": 2 }, "botan": { - "baseline": "2.18.1", - "port-version": 10 + "baseline": "2.19.1", + "port-version": 1 }, "box2d": { "baseline": "2.4.1", @@ -1141,8 +1169,8 @@ "port-version": 0 }, "breakpad": { - "baseline": "2020-09-14", - "port-version": 5 + "baseline": "2022-07-12", + "port-version": 1 }, "brigand": { "baseline": "1.3.0", @@ -1150,22 +1178,22 @@ }, "brotli": { "baseline": "1.0.9", - "port-version": 2 + "port-version": 3 }, "brpc": { - "baseline": "0.9.7", - "port-version": 7 + "baseline": "1.2.0", + "port-version": 1 }, "brunocodutra-metal": { - "baseline": "2.1.3", + "baseline": "2.1.4", "port-version": 0 }, "brynet": { - "baseline": "1.11.2", + "baseline": "1.12.1", "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "2.0.0", + "baseline": "3.3.0", "port-version": 0 }, "bsio": { @@ -1173,20 +1201,24 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.6.3", + "baseline": "1.6.6", "port-version": 1 }, "buck-yeh-bux-mariadb-client": { - "baseline": "1.0.1", + "baseline": "1.0.3", "port-version": 1 }, + "buck-yeh-bux-sqlite": { + "baseline": "1.0.1", + "port-version": 0 + }, "bullet3": { "baseline": "3.22", - "port-version": 0 + "port-version": 1 }, "bustache": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "butteraugli": { "baseline": "2019-05-08", @@ -1202,31 +1234,35 @@ }, "c-ares": { "baseline": "1.18.1", - "port-version": 0 + "port-version": 1 }, "c-dbg-macro": { "baseline": "2020-02-29", "port-version": 0 }, "c4core": { - "baseline": "2021-07-18", - "port-version": 1 + "baseline": "0.1.9", + "port-version": 0 }, "c89stringutils": { "baseline": "0.0.1", + "port-version": 1 + }, + "c9y": { + "baseline": "0.4.0", "port-version": 0 }, "caf": { - "baseline": "0.18.5", - "port-version": 0 + "baseline": "0.18.6", + "port-version": 1 }, "caffe2": { "baseline": "0.8.1", - "port-version": 6 + "port-version": 7 }, "cairo": { "baseline": "1.17.6", - "port-version": 1 + "port-version": 4 }, "cairomm": { "baseline": "1.16.1", @@ -1237,16 +1273,16 @@ "port-version": 0 }, "camport3": { - "baseline": "1.5.3", - "port-version": 2 + "baseline": "1.6.2", + "port-version": 0 }, "capnproto": { - "baseline": "0.9.1", - "port-version": 2 + "baseline": "0.10.2", + "port-version": 0 }, "capstone": { "baseline": "5.0.0-rc2", - "port-version": 0 + "port-version": 1 }, "cargs": { "baseline": "1.0.3", @@ -1269,52 +1305,52 @@ "port-version": 1 }, "catch2": { - "baseline": "2.13.8", - "port-version": 1 + "baseline": "3.1.0", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", "port-version": 2 }, "ccd": { - "baseline": "2.1-4", - "port-version": 3 + "baseline": "2.1", + "port-version": 4 }, "ccfits": { "baseline": "2.5", - "port-version": 8 + "port-version": 9 }, "cctag": { - "baseline": "1.0.1", - "port-version": 0 + "baseline": "1.0.2", + "port-version": 2 }, "cctz": { "baseline": "2.3", "port-version": 3 }, "celero": { - "baseline": "2.8.2", - "port-version": 1 + "baseline": "2.8.3", + "port-version": 0 }, "cello": { "baseline": "2019-07-23", "port-version": 2 }, "cereal": { - "baseline": "1.3.1", - "port-version": 0 + "baseline": "1.3.2", + "port-version": 1 }, "ceres": { - "baseline": "2.0.0", - "port-version": 6 + "baseline": "2.1.0", + "port-version": 2 }, "cfitsio": { "baseline": "3.49", "port-version": 2 }, "cgal": { - "baseline": "5.4", - "port-version": 0 + "baseline": "5.5", + "port-version": 1 }, "cgicc": { "baseline": "3.2.19", @@ -1325,12 +1361,12 @@ "port-version": 0 }, "cgltf": { - "baseline": "1.11", + "baseline": "1.13", "port-version": 0 }, "cgns": { - "baseline": "4.2.0", - "port-version": 0 + "baseline": "4.3.0", + "port-version": 1 }, "chaiscript": { "baseline": "6.1.0", @@ -1346,11 +1382,11 @@ }, "chartdir": { "baseline": "7.0.0", - "port-version": 3 + "port-version": 5 }, "check": { "baseline": "0.15.2", - "port-version": 2 + "port-version": 4 }, "chipmunk": { "baseline": "7.0.3", @@ -1366,7 +1402,7 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 3 + "port-version": 4 }, "cimg": { "baseline": "2.9.9", @@ -1378,11 +1414,11 @@ }, "civetweb": { "baseline": "1.15", - "port-version": 1 + "port-version": 2 }, "cjson": { "baseline": "1.7.15", - "port-version": 1 + "port-version": 2 }, "clamav": { "baseline": "0.103.0", @@ -1406,20 +1442,24 @@ }, "clfft": { "baseline": "2.12.2", - "port-version": 4 + "port-version": 5 }, "cli": { - "baseline": "2.0.0", - "port-version": 1 + "baseline": "2.0.2", + "port-version": 0 }, "cli11": { - "baseline": "2.1.2", - "port-version": 1 + "baseline": "2.2.0", + "port-version": 0 }, "clickhouse-cpp": { "baseline": "1.5.0", "port-version": 0 }, + "clipboardxx": { + "baseline": "2022-02-04", + "port-version": 0 + }, "clipp": { "baseline": "2019-04-30", "port-version": 1 @@ -1440,6 +1480,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "cmakerc": { + "baseline": "2021-08-27", + "port-version": 0 + }, "cmark": { "baseline": "0.30.1", "port-version": 0 @@ -1457,7 +1501,7 @@ "port-version": 1 }, "cnats": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "cnl": { @@ -1470,7 +1514,7 @@ }, "cocoyaxi": { "baseline": "2.0.3", - "port-version": 2 + "port-version": 3 }, "coin": { "baseline": "4.0.0", @@ -1493,16 +1537,16 @@ "port-version": 0 }, "comms": { - "baseline": "3.4.0", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "comms-ublox": { - "baseline": "0.20.2", + "baseline": "1.0.0", "port-version": 0 }, "commsdsl": { - "baseline": "3.6.4", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "compoundfilereader": { "baseline": "0.1.0", @@ -1510,19 +1554,23 @@ }, "concurrencpp": { "baseline": "0.1.4", - "port-version": 0 + "port-version": 1 }, "concurrentqueue": { "baseline": "1.0.3", "port-version": 0 }, + "configcat": { + "baseline": "0.1.0", + "port-version": 0 + }, "console-bridge": { - "baseline": "1.0.1", - "port-version": 2 + "baseline": "1.0.2", + "port-version": 0 }, "constexpr": { "baseline": "1.0", - "port-version": 2 + "port-version": 3 }, "constexpr-contracts": { "baseline": "2020-08-09", @@ -1532,6 +1580,10 @@ "baseline": "4.1.0", "port-version": 0 }, + "convectionkernels": { + "baseline": "2022-06-08", + "port-version": 0 + }, "coolprop": { "baseline": "6.4.1", "port-version": 1 @@ -1542,19 +1594,19 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 3 + "port-version": 4 }, "cpp-base64": { "baseline": "V2.rc.08", "port-version": 0 }, "cpp-httplib": { - "baseline": "0.10.3", + "baseline": "0.10.7", "port-version": 0 }, "cpp-ipc": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "cpp-jwt": { "baseline": "2021-10-18", @@ -1565,8 +1617,8 @@ "port-version": 6 }, "cpp-peglib": { - "baseline": "0.1.0", - "port-version": 1 + "baseline": "1.3.10", + "port-version": 0 }, "cpp-redis": { "baseline": "4.3.1", @@ -1586,11 +1638,11 @@ }, "cppcms": { "baseline": "1.2.1", - "port-version": 4 + "port-version": 6 }, "cppcodec": { "baseline": "0.2", - "port-version": 2 + "port-version": 3 }, "cppcoro": { "baseline": "2020-02-28", @@ -1601,7 +1653,7 @@ "port-version": 1 }, "cppgraphqlgen": { - "baseline": "4.1.1", + "baseline": "4.5.0", "port-version": 0 }, "cppitertools": { @@ -1618,7 +1670,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 0 + "port-version": 2 }, "cpptoml": { "baseline": "v0.1.1", @@ -1633,7 +1685,7 @@ "port-version": 2 }, "cppwinrt": { - "baseline": "windows-sdk", + "baseline": "2.0.220418.1", "port-version": 0 }, "cppxaml": { @@ -1645,19 +1697,19 @@ "port-version": 0 }, "cpr": { - "baseline": "1.8.1", + "baseline": "1.9.2", "port-version": 0 }, "cpu-features": { "baseline": "0.6.0", - "port-version": 1 + "port-version": 2 }, "cpuid": { "baseline": "0.5.1", - "port-version": 3 + "port-version": 4 }, "cpuinfo": { - "baseline": "2022-04-02", + "baseline": "2022-07-19", "port-version": 0 }, "cr": { @@ -1665,20 +1717,20 @@ "port-version": 1 }, "crashpad": { - "baseline": "2020-03-18", - "port-version": 2 + "baseline": "2022-09-05", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", - "port-version": 2 + "port-version": 3 }, "crc32c": { "baseline": "1.1.2", - "port-version": 0 + "port-version": 1 }, "crfsuite": { - "baseline": "2019-07-21", - "port-version": 3 + "baseline": "2020-08-27", + "port-version": 0 }, "croncpp": { "baseline": "2020-09-04", @@ -1689,12 +1741,12 @@ "port-version": 2 }, "crow": { - "baseline": "1.0-1", + "baseline": "1.0-5", "port-version": 0 }, "cryptopp": { "baseline": "8.6.0", - "port-version": 0 + "port-version": 1 }, "cspice": { "baseline": "67", @@ -1710,31 +1762,35 @@ }, "ctp": { "baseline": "6.6.1_P1_20210406_se", - "port-version": 2 + "port-version": 3 }, "ctre": { - "baseline": "3.4.1", + "baseline": "3.6.0", "port-version": 0 }, "cub": { "baseline": "1.16.0", "port-version": 0 }, + "cubeb": { + "baseline": "2022-07-22", + "port-version": 0 + }, "cuda": { "baseline": "10.1", - "port-version": 10 + "port-version": 11 }, "cudnn": { "baseline": "7.6.5", - "port-version": 5 + "port-version": 8 }, "cunit": { "baseline": "2.1.3", - "port-version": 7 + "port-version": 8 }, "curl": { - "baseline": "7.82.0", - "port-version": 0 + "baseline": "7.84.0", + "port-version": 2 }, "curlpp": { "baseline": "2018-06-15", @@ -1758,7 +1814,7 @@ }, "czmq": { "baseline": "4.2.1", - "port-version": 0 + "port-version": 1 }, "d3d12-memory-allocator": { "baseline": "2021-05-05", @@ -1770,15 +1826,15 @@ }, "darknet": { "baseline": "2022-03-06", - "port-version": 0 + "port-version": 1 }, "darts-clone": { "baseline": "1767ab87cffe", "port-version": 2 }, "dartsim": { - "baseline": "6.11.0", - "port-version": 3 + "baseline": "6.12.2", + "port-version": 1 }, "dataframe": { "baseline": "1.19.0", @@ -1789,19 +1845,19 @@ "port-version": 2 }, "dav1d": { - "baseline": "0.8.2", - "port-version": 3 + "baseline": "1.0.0", + "port-version": 0 }, "daw-header-libraries": { - "baseline": "1.29.7", + "baseline": "2.68.1", "port-version": 0 }, "daw-json-link": { - "baseline": "2.10.2", + "baseline": "3.0.4", "port-version": 0 }, "daw-utf-range": { - "baseline": "2.2.0", + "baseline": "2.2.2", "port-version": 0 }, "dbg-macro": { @@ -1818,11 +1874,15 @@ }, "dbow3": { "baseline": "1.0.0", + "port-version": 2 + }, + "dbus": { + "baseline": "1.13.18", "port-version": 1 }, "dcmtk": { - "baseline": "3.6.6", - "port-version": 3 + "baseline": "3.6.7", + "port-version": 2 }, "debug-assert": { "baseline": "1.3.3", @@ -1834,11 +1894,11 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 5 + "port-version": 7 }, "devicenameresolver": { - "baseline": "2016-06-26-0850d88fa6", - "port-version": 3 + "baseline": "2016-06-26", + "port-version": 4 }, "devil": { "baseline": "1.8.0", @@ -1848,16 +1908,20 @@ "baseline": "5.0.2", "port-version": 3 }, + "directx-dxc": { + "baseline": "2022-07-18", + "port-version": 0 + }, "directx-headers": { - "baseline": "1.4.9", - "port-version": 1 + "baseline": "1.606.3", + "port-version": 0 }, "directxmath": { - "baseline": "2022-01-18", + "baseline": "2022-05-18", "port-version": 0 }, "directxmesh": { - "baseline": "2022-03-24", + "baseline": "2022-07-29", "port-version": 0 }, "directxsdk": { @@ -1865,15 +1929,15 @@ "port-version": 5 }, "directxtex": { - "baseline": "2022-03-24", - "port-version": 0 + "baseline": "2022-07-29", + "port-version": 1 }, "directxtk": { - "baseline": "2022-03-24", + "baseline": "2022-07-29", "port-version": 0 }, "directxtk12": { - "baseline": "2022-03-24", + "baseline": "2022-07-29", "port-version": 0 }, "dirent": { @@ -1889,7 +1953,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-03-30", + "baseline": "2022-09-25", "port-version": 0 }, "discount": { @@ -1905,12 +1969,12 @@ "port-version": 0 }, "dlfcn-win32": { - "baseline": "1.1.1", - "port-version": 6 + "baseline": "1.3.1", + "port-version": 0 }, "dlib": { - "baseline": "19.23", - "port-version": 0 + "baseline": "19.24", + "port-version": 2 }, "dmlc": { "baseline": "2019-08-12", @@ -1921,7 +1985,7 @@ "port-version": 1 }, "doctest": { - "baseline": "2.4.8", + "baseline": "2.4.9", "port-version": 0 }, "double-conversion": { @@ -1929,23 +1993,27 @@ "port-version": 0 }, "dpdk": { - "baseline": "19.02", + "baseline": "22.07", "port-version": 1 }, + "dpp": { + "baseline": "10.0.19", + "port-version": 0 + }, "draco": { - "baseline": "1.4.3", + "baseline": "1.5.2", "port-version": 0 }, "drlibs": { - "baseline": "2022-04-03", + "baseline": "2022-09-26", "port-version": 0 }, "drogon": { - "baseline": "1.7.5", + "baseline": "1.8.0", "port-version": 0 }, "dstorage": { - "baseline": "1.0.0", + "baseline": "1.0.2", "port-version": 0 }, "dtl": { @@ -1953,7 +2021,7 @@ "port-version": 1 }, "duckx": { - "baseline": "1.0.0", + "baseline": "1.2.2", "port-version": 1 }, "duilib": { @@ -1964,17 +2032,21 @@ "baseline": "2.5.0", "port-version": 2 }, + "dv-processing": { + "baseline": "1.5.1", + "port-version": 1 + }, "dx": { "baseline": "1.0.1", "port-version": 2 }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 3 + "port-version": 4 }, "dxut": { - "baseline": "11.26", - "port-version": 1 + "baseline": "11.28", + "port-version": 0 }, "eabase": { "baseline": "2.09.12", @@ -1986,7 +2058,7 @@ }, "eastl": { "baseline": "3.18.00", - "port-version": 2 + "port-version": 3 }, "easycl": { "baseline": "0.3", @@ -2020,17 +2092,21 @@ "baseline": "1.0.7.15", "port-version": 2 }, + "edflib": { + "baseline": "1.21", + "port-version": 0 + }, "edlib": { "baseline": "1.2.7", "port-version": 1 }, "effects11": { - "baseline": "11.26", - "port-version": 2 + "baseline": "11.28", + "port-version": 0 }, "effolkronium-random": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.4.1", + "port-version": 0 }, "efsw": { "baseline": "2020-06-08", @@ -2050,10 +2126,6 @@ }, "elfutils": { "baseline": "0.186", - "port-version": 2 - }, - "embree2": { - "baseline": "2.17.7", "port-version": 4 }, "embree3": { @@ -2073,19 +2145,23 @@ "port-version": 3 }, "entt": { - "baseline": "3.9.0", - "port-version": 0 + "baseline": "3.10.1", + "port-version": 1 }, "epsilon": { "baseline": "0.9.2", - "port-version": 6 + "port-version": 7 + }, + "ereignis": { + "baseline": "1.1", + "port-version": 0 }, "esaxx": { "baseline": "ca7cb332011ec37", "port-version": 1 }, "eve": { - "baseline": "2021-10-16", + "baseline": "2022-09-20", "port-version": 0 }, "eventpp": { @@ -2094,7 +2170,7 @@ }, "evpp": { "baseline": "0.7.0", - "port-version": 5 + "port-version": 7 }, "exiv2": { "baseline": "0.27.5", @@ -2105,7 +2181,7 @@ "port-version": 1 }, "expected-lite": { - "baseline": "0.5.0", + "baseline": "0.6.2", "port-version": 0 }, "exprtk": { @@ -2116,6 +2192,10 @@ "baseline": "1.4.7", "port-version": 0 }, + "ezfoundation": { + "baseline": "21.10", + "port-version": 0 + }, "faad2": { "baseline": "2.9.1", "port-version": 5 @@ -2129,12 +2209,12 @@ "port-version": 0 }, "fakeit": { - "baseline": "2.1.0", + "baseline": "2.3.0", "port-version": 0 }, "fann": { "baseline": "2.2.0", - "port-version": 2 + "port-version": 3 }, "farmhash": { "baseline": "1.1", @@ -2145,7 +2225,7 @@ "port-version": 1 }, "fast-float": { - "baseline": "3.2.0", + "baseline": "3.5.1", "port-version": 0 }, "fastcdr": { @@ -2154,7 +2234,7 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 4 + "port-version": 5 }, "fastfeat": { "baseline": "391d5e9", @@ -2169,7 +2249,11 @@ "port-version": 1 }, "fastrtps": { - "baseline": "2.4.0", + "baseline": "2.7.0", + "port-version": 0 + }, + "fawdlstty-libfv": { + "baseline": "0.0.8", "port-version": 0 }, "fbgemm": { @@ -2178,7 +2262,7 @@ }, "fbthrift": { "baseline": "2022.03.21.00", - "port-version": 0 + "port-version": 2 }, "fcl": { "baseline": "0.7.0", @@ -2194,7 +2278,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 12 + "port-version": 18 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -2202,15 +2286,15 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 3 + "port-version": 4 }, "fftwpp": { "baseline": "2019-12-19", "port-version": 2 }, "fixed-string": { - "baseline": "0.1.0", - "port-version": 1 + "baseline": "0.1.1", + "port-version": 0 }, "fizz": { "baseline": "2022.03.21.00", @@ -2218,7 +2302,7 @@ }, "flann": { "baseline": "2019-04-07", - "port-version": 5 + "port-version": 6 }, "flash-runtime-extensions": { "baseline": "2.4", @@ -2226,15 +2310,23 @@ }, "flashlight-cpu": { "baseline": "0.3", - "port-version": 2 + "port-version": 3 }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 2 + "port-version": 4 + }, + "flat": { + "baseline": "2022-08-30", + "port-version": 0 }, "flatbuffers": { - "baseline": "2.0.0", - "port-version": 3 + "baseline": "2.0.6", + "port-version": 0 + }, + "flecs": { + "baseline": "2.4.8", + "port-version": 0 }, "flint": { "baseline": "2.8.0", @@ -2242,14 +2334,14 @@ }, "fltk": { "baseline": "1.3.8", - "port-version": 1 + "port-version": 2 }, "fluidlite": { "baseline": "2020-08-27", "port-version": 2 }, "fluidsynth": { - "baseline": "2.2.6", + "baseline": "2.2.8", "port-version": 0 }, "fmem": { @@ -2265,20 +2357,24 @@ "port-version": 4 }, "fmt": { - "baseline": "8.1.1", - "port-version": 1 + "baseline": "9.0.0", + "port-version": 0 }, "folly": { - "baseline": "2022.03.21.00", + "baseline": "2022.08.15.00", "port-version": 0 }, "font-chef": { "baseline": "1.1.0", "port-version": 0 }, + "font-util": { + "baseline": "1.3.2", + "port-version": 0 + }, "fontconfig": { "baseline": "2.14.0", - "port-version": 0 + "port-version": 4 }, "foonathan-memory": { "baseline": "2019-07-21", @@ -2301,12 +2397,12 @@ "port-version": 0 }, "fplus": { - "baseline": "0.2.14-p0", + "baseline": "0.2.18-p0", "port-version": 0 }, "freealut": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 3 }, "freeglut": { "baseline": "3.2.2", @@ -2314,38 +2410,38 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 22 + "port-version": 24 }, "freeopcua": { "baseline": "20190125", "port-version": 5 }, "freerdp": { - "baseline": "2.5.0", + "baseline": "2.7.0", "port-version": 0 }, "freetds": { - "baseline": "1.2.11", - "port-version": 2 + "baseline": "1.3.10", + "port-version": 1 }, "freetype": { - "baseline": "2.11.1", - "port-version": 1 + "baseline": "2.12.1", + "port-version": 2 }, "freetype-gl": { - "baseline": "2020-09-14", + "baseline": "2022-01-17", "port-version": 1 }, "freexl": { "baseline": "1.0.6", - "port-version": 0 + "port-version": 1 }, "fribidi": { - "baseline": "1.0.11", - "port-version": 3 + "baseline": "1.0.12", + "port-version": 0 }, "frozen": { - "baseline": "2021-04-22", + "baseline": "1.1.1", "port-version": 0 }, "frugally-deep": { @@ -2357,12 +2453,12 @@ "port-version": 1 }, "ftgl": { - "baseline": "2.4.0", - "port-version": 4 + "baseline": "2022-05-18", + "port-version": 1 }, "ftxui": { - "baseline": "2.0.0", - "port-version": 1 + "baseline": "3.0.0", + "port-version": 0 }, "function2": { "baseline": "4.2.0", @@ -2374,7 +2470,7 @@ }, "fuzzylite": { "baseline": "6.0", - "port-version": 5 + "port-version": 6 }, "fxdiv": { "baseline": "2021-02-21", @@ -2390,19 +2486,19 @@ }, "gainput": { "baseline": "1.0.0", - "port-version": 5 + "port-version": 6 }, "gamedev-framework": { - "baseline": "0.20.0", - "port-version": 2 + "baseline": "1.0.0", + "port-version": 0 }, "gamenetworkingsockets": { - "baseline": "1.4.0", + "baseline": "1.4.1", "port-version": 0 }, "gamma": { "baseline": "gamma-2018-01-27", - "port-version": 3 + "port-version": 4 }, "gasol": { "baseline": "2018-01-04", @@ -2414,27 +2510,27 @@ }, "gazebo": { "baseline": "2022-01-20", - "port-version": 0 + "port-version": 4 }, "gcem": { - "baseline": "1.13.1", - "port-version": 1 + "baseline": "1.14.1", + "port-version": 0 }, "gdal": { - "baseline": "3.4.2", + "baseline": "3.5.2", "port-version": 0 }, "gdcm": { - "baseline": "3.0.7", - "port-version": 4 + "baseline": "3.0.12", + "port-version": 0 }, "gdcm2": { "baseline": "deprecated", "port-version": 1 }, "gdk-pixbuf": { - "baseline": "2.42.2", - "port-version": 2 + "baseline": "2.42.9", + "port-version": 1 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2449,12 +2545,12 @@ "port-version": 2 }, "geographiclib": { - "baseline": "1.52", - "port-version": 2 + "baseline": "2.1.1", + "port-version": 0 }, "geos": { - "baseline": "3.10.0", - "port-version": 0 + "baseline": "3.11.0", + "port-version": 1 }, "geotrans": { "baseline": "3.8", @@ -2466,11 +2562,11 @@ }, "getopt": { "baseline": "0", - "port-version": 1 + "port-version": 2 }, "getopt-win32": { "baseline": "0.1", - "port-version": 2 + "port-version": 4 }, "gettext": { "baseline": "0.21", @@ -2500,6 +2596,10 @@ "baseline": "1.4.0", "port-version": 1 }, + "gklib": { + "baseline": "2022-07-27", + "port-version": 2 + }, "gl2ps": { "baseline": "1.4.2", "port-version": 1 @@ -2509,8 +2609,8 @@ "port-version": 4 }, "glad": { - "baseline": "0.1.34", - "port-version": 3 + "baseline": "0.1.36", + "port-version": 0 }, "glbinding": { "baseline": "3.1.0", @@ -2521,7 +2621,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.7", + "baseline": "3.3.8", "port-version": 0 }, "gli": { @@ -2529,8 +2629,8 @@ "port-version": 0 }, "glib": { - "baseline": "2.70.5", - "port-version": 0 + "baseline": "2.72.3", + "port-version": 3 }, "glibmm": { "baseline": "2.70.0", @@ -2545,7 +2645,7 @@ "port-version": 4 }, "glog": { - "baseline": "0.5.0", + "baseline": "0.6.0", "port-version": 0 }, "gloo": { @@ -2553,7 +2653,7 @@ "port-version": 0 }, "glslang": { - "baseline": "11.8.0", + "baseline": "11.11.0", "port-version": 0 }, "glui": { @@ -2570,19 +2670,19 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 9 + "port-version": 13 }, "gmsh": { "baseline": "4.9.0", "port-version": 0 }, "gobject-introspection": { - "baseline": "1.70.0", + "baseline": "1.72.0", "port-version": 1 }, "google-cloud-cpp": { - "baseline": "1.39.0", - "port-version": 1 + "baseline": "2.2.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", @@ -2598,7 +2698,7 @@ }, "gperf": { "baseline": "3.1", - "port-version": 3 + "port-version": 4 }, "gperftools": { "baseline": "2019-09-02", @@ -2608,13 +2708,17 @@ "baseline": "1.14.0", "port-version": 2 }, - "gppanel": { + "gpgmm": { + "baseline": "0.0.4", + "port-version": 0 + }, + "gppanel": { "baseline": "2020-05-20", - "port-version": 1 + "port-version": 2 }, "graphene": { "baseline": "1.10.2", - "port-version": 2 + "port-version": 3 }, "graphicsmagick": { "baseline": "1.3.37", @@ -2630,23 +2734,23 @@ }, "graphviz": { "baseline": "2.49.1", - "port-version": 3 + "port-version": 4 }, "greatest": { "baseline": "1.5.0", "port-version": 0 }, "grpc": { - "baseline": "1.44.0", + "baseline": "1.49.0", "port-version": 0 }, "grppi": { "baseline": "0.4.0", - "port-version": 1 + "port-version": 2 }, "gsl": { "baseline": "2.7.1", - "port-version": 0 + "port-version": 1 }, "gsl-lite": { "baseline": "0.40.0", @@ -2662,39 +2766,47 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 5 + "port-version": 8 }, "gtest": { - "baseline": "1.11.0", - "port-version": 5 + "baseline": "1.12.1", + "port-version": 0 }, "gtk": { - "baseline": "4.6.0", - "port-version": 0 + "baseline": "4.6.2", + "port-version": 2 }, "gtkmm": { "baseline": "4.6.0", "port-version": 0 }, "gtl": { - "baseline": "1.0.0", + "baseline": "1.1.2", "port-version": 0 }, "gts": { "baseline": "0.7.6", - "port-version": 4 + "port-version": 7 }, "guetzli": { "baseline": "2020-09-14", "port-version": 2 }, + "guile": { + "baseline": "3.0.8", + "port-version": 0 + }, "guilite": { - "baseline": "2021-07-31", + "baseline": "2022-05-05", + "port-version": 0 + }, + "gul14": { + "baseline": "2.6", "port-version": 0 }, "gumbo": { "baseline": "0.10.1", - "port-version": 4 + "port-version": 5 }, "gzip-hpp": { "baseline": "0.1.0", @@ -2709,15 +2821,23 @@ "port-version": 1 }, "halide": { - "baseline": "13.0.2", + "baseline": "14.0.0", "port-version": 0 }, "happly": { "baseline": "2021-03-19", "port-version": 0 }, + "hareflow": { + "baseline": "0.1.0", + "port-version": 0 + }, "harfbuzz": { - "baseline": "3.2.0", + "baseline": "5.0.1", + "port-version": 2 + }, + "hash-library": { + "baseline": "8", "port-version": 2 }, "hayai": { @@ -2729,8 +2849,8 @@ "port-version": 0 }, "hdf5": { - "baseline": "1.12.1", - "port-version": 4 + "baseline": "1.12.2", + "port-version": 1 }, "healpix": { "baseline": "1.12.10", @@ -2741,8 +2861,8 @@ "port-version": 0 }, "hexl": { - "baseline": "1.2.3", - "port-version": 1 + "baseline": "1.2.4", + "port-version": 0 }, "hffix": { "baseline": "1.0.0", @@ -2753,12 +2873,12 @@ "port-version": 0 }, "hidapi": { - "baseline": "0.11.2", - "port-version": 1 + "baseline": "0.12.0", + "port-version": 0 }, "highfive": { "baseline": "2.3", - "port-version": 2 + "port-version": 3 }, "highway": { "baseline": "0.14.2", @@ -2766,15 +2886,15 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 }, "hps": { "baseline": "2022-01-18", "port-version": 0 }, "hpx": { - "baseline": "1.7.1", - "port-version": 5 + "baseline": "1.8.0", + "port-version": 1 }, "http-parser": { "baseline": "2.9.4", @@ -2785,16 +2905,16 @@ "port-version": 1 }, "hunspell": { - "baseline": "1.7.0", - "port-version": 8 + "baseline": "1.7.1", + "port-version": 0 }, "hwloc": { - "baseline": "2.7.0", + "baseline": "2.7.1", "port-version": 0 }, "hyperscan": { - "baseline": "5.3.0", - "port-version": 3 + "baseline": "5.4.0", + "port-version": 0 }, "hypodermic": { "baseline": "2.5.3", @@ -2805,12 +2925,12 @@ "port-version": 0 }, "icu": { - "baseline": "70.1", + "baseline": "71.1", "port-version": 0 }, "ideviceinstaller": { "baseline": "1.1.2.23", - "port-version": 2 + "port-version": 3 }, "idevicerestore": { "baseline": "1.0.12", @@ -2826,95 +2946,95 @@ }, "ignition-cmake0": { "baseline": "0.6.2", - "port-version": 3 + "port-version": 4 }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 3 }, "ignition-common1": { "baseline": "1.1.1", - "port-version": 2 + "port-version": 3 }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 2 + "port-version": 4 }, "ignition-fuel-tools1": { "baseline": "1.2.0", - "port-version": 3 + "port-version": 4 }, "ignition-fuel-tools4": { "baseline": "4.3.0", - "port-version": 1 + "port-version": 2 }, "ignition-math4": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "ignition-math6": { "baseline": "6.6.0", - "port-version": 2 + "port-version": 3 }, "ignition-modularscripts": { - "baseline": "2020-11-23", + "baseline": "2022-05-11", "port-version": 1 }, "ignition-msgs1": { "baseline": "1.0.0", - "port-version": 4 + "port-version": 6 }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 4 + "port-version": 6 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 3 + "port-version": 5 }, "ignition-plugin1": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "ignition-transport4": { "baseline": "4.0.0", - "port-version": 5 + "port-version": 6 }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 2 + "port-version": 4 }, "ignition-transport9": { "baseline": "9.0.0", - "port-version": 3 + "port-version": 4 }, "igraph": { - "baseline": "0.9.8", + "baseline": "0.10.1", "port-version": 0 }, "iir1": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.9.1", + "port-version": 0 }, "ijg-libjpeg": { - "baseline": "9d", + "baseline": "9e", "port-version": 0 }, "ilmbase": { - "baseline": "2.3.0", - "port-version": 1 + "baseline": "3", + "port-version": 0 }, "imath": { "baseline": "3.1.5", "port-version": 0 }, "imgui": { - "baseline": "1.87", - "port-version": 0 + "baseline": "1.88", + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", - "port-version": 0 + "port-version": 1 }, "imguizmo": { "baseline": "1.83", @@ -2925,7 +3045,7 @@ "port-version": 0 }, "implot": { - "baseline": "0.13", + "baseline": "0.14", "port-version": 0 }, "indicators": { @@ -2933,20 +3053,20 @@ "port-version": 0 }, "influxdb-cxx": { - "baseline": "0.6.7", - "port-version": 1 + "baseline": "2022-09-02", + "port-version": 0 }, "infoware": { "baseline": "2021-06-16", "port-version": 1 }, "inih": { - "baseline": "51", - "port-version": 1 + "baseline": "56", + "port-version": 0 }, "iniparser": { "baseline": "2020-04-06", - "port-version": 2 + "port-version": 3 }, "inja": { "baseline": "3.3.0", @@ -2962,7 +3082,7 @@ }, "intelrdfpmathlib": { "baseline": "20U2", - "port-version": 3 + "port-version": 4 }, "io2d": { "baseline": "2020-09-14", @@ -2977,8 +3097,8 @@ "port-version": 0 }, "isal": { - "baseline": "2.25.0", - "port-version": 1 + "baseline": "2.30.0", + "port-version": 0 }, "ismrmrd": { "baseline": "1.5.0", @@ -2993,24 +3113,24 @@ "port-version": 8 }, "ixwebsocket": { - "baseline": "11.3.3", + "baseline": "11.4.3", "port-version": 0 }, "jack2": { - "baseline": "1.9.19", - "port-version": 1 + "baseline": "1.9.21", + "port-version": 0 }, "jaeger-client-cpp": { "baseline": "0.7.0", "port-version": 1 }, "jansson": { - "baseline": "2.13.1", - "port-version": 2 + "baseline": "2.14", + "port-version": 1 }, "jasper": { "baseline": "2.0.33", - "port-version": 3 + "port-version": 6 }, "jbig2dec": { "baseline": "0.19", @@ -3021,8 +3141,8 @@ "port-version": 5 }, "jemalloc": { - "baseline": "4.3.1", - "port-version": 5 + "baseline": "5.3.0", + "port-version": 1 }, "jinja2cpplight": { "baseline": "2018-05-08", @@ -3037,7 +3157,7 @@ "port-version": 1 }, "json-c": { - "baseline": "2019-09-10", + "baseline": "2022-06-26", "port-version": 2 }, "json-dto": { @@ -3061,28 +3181,28 @@ "port-version": 3 }, "jsoncons": { - "baseline": "0.168.3", - "port-version": 1 + "baseline": "0.168.7", + "port-version": 0 }, "jsoncpp": { "baseline": "1.9.5", "port-version": 0 }, "jsonnet": { - "baseline": "0.17.0", - "port-version": 0 + "baseline": "0.18.0", + "port-version": 1 }, "jwt-cpp": { - "baseline": "0.5.1", - "port-version": 1 + "baseline": "0.6.0", + "port-version": 0 }, "jxrlib": { "baseline": "2019.10.9", - "port-version": 3 + "port-version": 4 }, "kangaru": { - "baseline": "4.2.4", - "port-version": 1 + "baseline": "4.3.1", + "port-version": 0 }, "kcp": { "baseline": "1.7", @@ -3114,159 +3234,159 @@ }, "kf5archive": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5attica": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5auth": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5bookmarks": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5codecs": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 2 }, "kf5completion": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5config": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5configwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5coreaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5crash": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5dbusaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5declarative": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5diagram": { "baseline": "2.8.0", - "port-version": 0 + "port-version": 1 }, "kf5globalaccel": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 3 }, "kf5guiaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5holidays": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5iconthemes": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5itemviews": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5jobwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5kcmutils": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5kio": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5newstuff": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5notifications": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5package": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5plotting": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5service": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5sonnet": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5syntaxhighlighting": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5textwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5wallet": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5widgetsaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5windowsystem": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5xmlgui": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "4.2.1", - "port-version": 1 + "port-version": 2 }, "kinectsdk1": { "baseline": "1.8", - "port-version": 4 + "port-version": 5 }, "kinectsdk2": { "baseline": "2.0", - "port-version": 3 + "port-version": 4 }, "kissfft": { "baseline": "2021-11-14", @@ -3285,12 +3405,12 @@ "port-version": 1 }, "ktx": { - "baseline": "4.0.0", - "port-version": 2 + "baseline": "4.1.0-rc2", + "port-version": 0 }, "kubazip": { - "baseline": "0.1.19", - "port-version": 1 + "baseline": "0.2.4", + "port-version": 0 }, "kubernetes": { "baseline": "2022-01-19", @@ -3317,7 +3437,7 @@ "port-version": 0 }, "lapack-reference": { - "baseline": "3.10.0", + "baseline": "3.10.1", "port-version": 0 }, "lastools": { @@ -3338,11 +3458,11 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 2 + "port-version": 4 }, "lcms": { "baseline": "2.12", - "port-version": 3 + "port-version": 4 }, "leaf": { "baseline": "0.2.2", @@ -3357,8 +3477,8 @@ "port-version": 0 }, "lerc": { - "baseline": "2.2", - "port-version": 2 + "baseline": "4.0", + "port-version": 0 }, "lest": { "baseline": "1.35.1", @@ -3389,11 +3509,11 @@ "port-version": 4 }, "libarchive": { - "baseline": "3.5.2", - "port-version": 5 + "baseline": "3.6.1", + "port-version": 1 }, "libass": { - "baseline": "0.15.2", + "baseline": "0.16.0", "port-version": 0 }, "libassuan": { @@ -3402,11 +3522,11 @@ }, "libatomic-ops": { "baseline": "7.7.0", - "port-version": 0 + "port-version": 1 }, "libavif": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.10.1", + "port-version": 0 }, "libb2": { "baseline": "0.98.1", @@ -3418,27 +3538,31 @@ }, "libbf": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "libbson": { "baseline": "1.17.6", "port-version": 1 }, + "libcaer": { + "baseline": "2022-07-25", + "port-version": 1 + }, "libcanberra": { "baseline": "0.30", "port-version": 2 }, "libcbor": { - "baseline": "0.8.0", - "port-version": 1 + "baseline": "0.9.0", + "port-version": 0 }, "libcds": { "baseline": "2.3.3", - "port-version": 1 + "port-version": 2 }, "libcerf": { "baseline": "1.13", - "port-version": 2 + "port-version": 3 }, "libconfig": { "baseline": "1.7.3", @@ -3450,7 +3574,7 @@ }, "libcopp": { "baseline": "1.4.1", - "port-version": 1 + "port-version": 2 }, "libcpplocate": { "baseline": "2.3.0", @@ -3465,16 +3589,16 @@ "port-version": 3 }, "libcuckoo": { - "baseline": "0.3", - "port-version": 1 + "baseline": "0.3.1", + "port-version": 0 }, "libcurl-simple-https": { "baseline": "2022-02-14", "port-version": 0 }, "libdatachannel": { - "baseline": "0.16.4", - "port-version": 1 + "baseline": "0.17.10", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.13", @@ -3482,7 +3606,7 @@ }, "libdc1394": { "baseline": "2.2.6", - "port-version": 0 + "port-version": 1 }, "libde265": { "baseline": "1.0.8", @@ -3506,7 +3630,7 @@ }, "libe57": { "baseline": "1.1.332", - "port-version": 1 + "port-version": 2 }, "libe57format": { "baseline": "2.2.0", @@ -3538,15 +3662,19 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 4 + "port-version": 6 }, "libfido2": { "baseline": "1.10.0", "port-version": 1 }, "libflac": { - "baseline": "1.3.3", - "port-version": 7 + "baseline": "1.3.4", + "port-version": 1 + }, + "libfontenc": { + "baseline": "1.1.4", + "port-version": 0 }, "libfort": { "baseline": "0.4.2", @@ -3554,7 +3682,11 @@ }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 7 + "port-version": 9 + }, + "libfs": { + "baseline": "1.0.8", + "port-version": 0 }, "libftdi": { "baseline": "0.20", @@ -3565,16 +3697,16 @@ "port-version": 3 }, "libgcrypt": { - "baseline": "1.9.4", - "port-version": 2 + "baseline": "1.10.1", + "port-version": 0 }, "libgd": { - "baseline": "2.3.2", - "port-version": 1 + "baseline": "2.3.3", + "port-version": 0 }, "libgeotiff": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "libgit2": { "baseline": "1.4.2", @@ -3586,15 +3718,15 @@ }, "libgo": { "baseline": "3.1", - "port-version": 4 + "port-version": 5 }, "libgpg-error": { "baseline": "1.42", - "port-version": 3 + "port-version": 4 }, "libgpiod": { "baseline": "1.6.3", - "port-version": 0 + "port-version": 2 }, "libgpod": { "baseline": "2019-08-29", @@ -3617,36 +3749,40 @@ "port-version": 1 }, "libharu": { - "baseline": "2017-08-15", - "port-version": 10 + "baseline": "2.4.0-rc1", + "port-version": 0 }, "libhdfs3": { "baseline": "2019-11-05", "port-version": 3 }, "libheif": { - "baseline": "1.12.0", - "port-version": 3 + "baseline": "1.13.0", + "port-version": 0 }, "libhsplasma": { - "baseline": "2021.06.08", - "port-version": 1 + "baseline": "2022-05-19", + "port-version": 0 }, "libhv": { - "baseline": "1.2.4", - "port-version": 1 + "baseline": "1.2.6", + "port-version": 0 }, "libhydrogen": { - "baseline": "2021-12-02", + "baseline": "2022-06-21", "port-version": 0 }, "libical": { "baseline": "3.0.11", "port-version": 1 }, + "libice": { + "baseline": "1.0.10", + "port-version": 0 + }, "libiconv": { - "baseline": "1.16", - "port-version": 13 + "baseline": "1.17", + "port-version": 0 }, "libics": { "baseline": "1.6.5", @@ -3662,11 +3798,11 @@ }, "libigl": { "baseline": "2.3.0", - "port-version": 1 + "port-version": 2 }, "libilbc": { - "baseline": "3.0.3", - "port-version": 1 + "baseline": "3.0.4", + "port-version": 0 }, "libimobiledevice": { "baseline": "1.3.17", @@ -3674,14 +3810,14 @@ }, "libirecovery": { "baseline": "1.0.25", - "port-version": 3 + "port-version": 4 }, "libjpeg-turbo": { - "baseline": "2.1.3", - "port-version": 2 + "baseline": "2.1.4", + "port-version": 0 }, "libjuice": { - "baseline": "0.9.8", + "baseline": "1.0.4", "port-version": 0 }, "libjxl": { @@ -3698,11 +3834,11 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 9 + "port-version": 10 }, "liblbfgs": { "baseline": "1.10", - "port-version": 1 + "port-version": 2 }, "liblemon": { "baseline": "2019-06-13", @@ -3720,9 +3856,13 @@ "baseline": "1.16.0", "port-version": 0 }, + "liblsquic": { + "baseline": "3.1.1", + "port-version": 0 + }, "liblzma": { "baseline": "5.2.5", - "port-version": 5 + "port-version": 6 }, "libmad": { "baseline": "0.15.1", @@ -3733,8 +3873,8 @@ "port-version": 1 }, "libmariadb": { - "baseline": "3.1.15", - "port-version": 0 + "baseline": "3.3.1", + "port-version": 1 }, "libmaxminddb": { "baseline": "1.4.3", @@ -3748,6 +3888,10 @@ "baseline": "1.5.0", "port-version": 4 }, + "libmicrodns": { + "baseline": "0.2.0", + "port-version": 0 + }, "libmicrohttpd": { "baseline": "0.9.75", "port-version": 0 @@ -3766,14 +3910,14 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 9 + "port-version": 10 }, "libmorton": { "baseline": "0.2.8", "port-version": 0 }, "libmount": { - "baseline": "2.37.2", + "baseline": "2.38", "port-version": 0 }, "libmpeg2": { @@ -3785,7 +3929,7 @@ "port-version": 4 }, "libmt32emu": { - "baseline": "2.6.2", + "baseline": "2.7.0", "port-version": 0 }, "libmupdf": { @@ -3794,11 +3938,11 @@ }, "libmysql": { "baseline": "8.0.20", - "port-version": 6 + "port-version": 8 }, "libnice": { "baseline": "0.1.18", - "port-version": 0 + "port-version": 1 }, "libnoise": { "baseline": "1.0.0", @@ -3838,7 +3982,7 @@ }, "libopensp": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "libopusenc": { "baseline": "0.2.1", @@ -3849,8 +3993,8 @@ "port-version": 2 }, "libosmium": { - "baseline": "2.17.1", - "port-version": 1 + "baseline": "2.18.0", + "port-version": 0 }, "libosmscout": { "baseline": "1.1.1", @@ -3869,8 +4013,8 @@ "port-version": 1 }, "libpff": { - "baseline": "2018-07-14", - "port-version": 3 + "baseline": "2021-11-14", + "port-version": 0 }, "libplist": { "baseline": "1.3.6", @@ -3882,19 +4026,19 @@ }, "libpng": { "baseline": "1.6.37", - "port-version": 16 + "port-version": 19 }, "libpopt": { "baseline": "1.16", "port-version": 14 }, "libpq": { - "baseline": "14.1", + "baseline": "14.4", "port-version": 1 }, "libpqxx": { - "baseline": "7.6.0", - "port-version": 3 + "baseline": "7.7.3", + "port-version": 0 }, "libprotobuf-mutator": { "baseline": "1.0", @@ -3902,7 +4046,7 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 2 + "port-version": 5 }, "libqcow": { "baseline": "20210419", @@ -3918,7 +4062,7 @@ }, "librabbitmq": { "baseline": "0.11.0", - "port-version": 1 + "port-version": 2 }, "libraqm": { "baseline": "0.9.0", @@ -3926,11 +4070,11 @@ }, "libraw": { "baseline": "201903", - "port-version": 7 + "port-version": 10 }, "librdkafka": { - "baseline": "1.8.2", - "port-version": 2 + "baseline": "1.9.2", + "port-version": 0 }, "libressl": { "baseline": "3.4.2", @@ -3950,7 +4094,7 @@ }, "librttopo": { "baseline": "1.1.0", - "port-version": 5 + "port-version": 6 }, "libsamplerate": { "baseline": "0.2.2", @@ -3977,7 +4121,7 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.0.7", + "baseline": "3.2.0", "port-version": 0 }, "libsigcpp-3": { @@ -3985,8 +4129,12 @@ "port-version": 1 }, "libslirp": { - "baseline": "4.6.1", - "port-version": 1 + "baseline": "4.7.0", + "port-version": 0 + }, + "libsm": { + "baseline": "1.2.3", + "port-version": 0 }, "libsmb2": { "baseline": "2021-04-29", @@ -3994,7 +4142,7 @@ }, "libsndfile": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "libsnoretoast": { "baseline": "0.8.0", @@ -4002,7 +4150,7 @@ }, "libsodium": { "baseline": "1.0.18", - "port-version": 6 + "port-version": 8 }, "libsoundio": { "baseline": "2.0.0", @@ -4010,11 +4158,11 @@ }, "libspatialindex": { "baseline": "1.9.3", - "port-version": 0 + "port-version": 1 }, "libspatialite": { "baseline": "5.0.1", - "port-version": 4 + "port-version": 8 }, "libspnav": { "baseline": "0.2.3", @@ -4022,15 +4170,15 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 10 + "port-version": 12 }, "libsrt": { - "baseline": "1.4.4", + "baseline": "1.5.0", "port-version": 2 }, "libsrtp": { "baseline": "2.4.2", - "port-version": 1 + "port-version": 2 }, "libssh": { "baseline": "0.9.6", @@ -4057,7 +4205,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.20.1", + "baseline": "1.22.3", "port-version": 0 }, "libtess2": { @@ -4066,7 +4214,7 @@ }, "libtheora": { "baseline": "1.2.0alpha1-20170719", - "port-version": 3 + "port-version": 4 }, "libtins": { "baseline": "4.3", @@ -4081,7 +4229,7 @@ "port-version": 2 }, "libtorrent": { - "baseline": "2.0.5", + "baseline": "2.0.7", "port-version": 0 }, "libu2f-server": { @@ -4101,7 +4249,7 @@ "port-version": 2 }, "libunibreak": { - "baseline": "4.3", + "baseline": "5.0", "port-version": 1 }, "libunifex": { @@ -4110,15 +4258,15 @@ }, "libunistring": { "baseline": "0.9.10", - "port-version": 2 + "port-version": 3 }, "liburing": { - "baseline": "2.0", - "port-version": 3 + "baseline": "2.2", + "port-version": 1 }, "libusb": { - "baseline": "1.0.24", - "port-version": 7 + "baseline": "1.0.26", + "port-version": 1 }, "libusb-win32": { "baseline": "1.2.6.0", @@ -4133,7 +4281,7 @@ "port-version": 11 }, "libuv": { - "baseline": "1.43.0", + "baseline": "1.44.2", "port-version": 0 }, "libuvc": { @@ -4149,8 +4297,8 @@ "port-version": 2 }, "libvpx": { - "baseline": "1.10.0", - "port-version": 2 + "baseline": "1.12.0", + "port-version": 0 }, "libwandio": { "baseline": "4.2.1", @@ -4161,28 +4309,64 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.1", + "baseline": "1.2.4", "port-version": 0 }, "libwebsockets": { "baseline": "4.3.0", "port-version": 3 }, + "libx11": { + "baseline": "1.7.3.1", + "port-version": 1 + }, + "libxau": { + "baseline": "1.0.9", + "port-version": 0 + }, + "libxdamage": { + "baseline": "1.1.5", + "port-version": 0 + }, "libxdiff": { "baseline": "0.23", "port-version": 2 }, + "libxdmcp": { + "baseline": "1.1.3", + "port-version": 0 + }, + "libxext": { + "baseline": "1.3.4", + "port-version": 0 + }, + "libxfixes": { + "baseline": "6.0.0", + "port-version": 0 + }, + "libxi": { + "baseline": "1.8", + "port-version": 0 + }, + "libxkbcommon": { + "baseline": "1.4.1", + "port-version": 0 + }, + "libxkbfile": { + "baseline": "1.1.0", + "port-version": 0 + }, "libxlsxwriter": { "baseline": "1.1.4", "port-version": 0 }, "libxml2": { - "baseline": "2.9.12", - "port-version": 5 + "baseline": "2.9.14", + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", - "port-version": 1 + "port-version": 3 }, "libxmlpp": { "baseline": "5.0.0", @@ -4192,9 +4376,25 @@ "baseline": "4.4.1", "port-version": 8 }, + "libxpm": { + "baseline": "3.5.11", + "port-version": 1 + }, + "libxrandr": { + "baseline": "1.5.2", + "port-version": 0 + }, + "libxrender": { + "baseline": "0.9.10", + "port-version": 0 + }, + "libxres": { + "baseline": "1.2.1", + "port-version": 0 + }, "libxslt": { - "baseline": "1.1.34", - "port-version": 4 + "baseline": "1.1.37", + "port-version": 0 }, "libyaml": { "baseline": "0.2.5", @@ -4209,12 +4409,12 @@ "port-version": 1 }, "libzip": { - "baseline": "1.8.0", + "baseline": "1.9.2", "port-version": 0 }, "libzippp": { - "baseline": "5.0-1.8.0", - "port-version": 1 + "baseline": "5.1-1.8.0", + "port-version": 0 }, "licensepp": { "baseline": "2020-05-19", @@ -4232,16 +4432,20 @@ "baseline": "4754bee2d8eb3", "port-version": 2 }, + "linmath": { + "baseline": "2022-07-30", + "port-version": 0 + }, "lionkor-commandline": { "baseline": "2.0.0", "port-version": 0 }, "live555": { - "baseline": "2021-12-18", + "baseline": "2022-07-14", "port-version": 0 }, "llfio": { - "baseline": "2.0-20220112", + "baseline": "2022-09-18", "port-version": 0 }, "llgl": { @@ -4249,11 +4453,15 @@ "port-version": 2 }, "llvm": { - "baseline": "13.0.0", - "port-version": 3 + "baseline": "14.0.4", + "port-version": 0 }, "lmdb": { "baseline": "0.9.29", + "port-version": 2 + }, + "lockpp": { + "baseline": "1.0.2", "port-version": 0 }, "lodepng": { @@ -4273,7 +4481,7 @@ "port-version": 7 }, "log4cxx": { - "baseline": "0.12.1", + "baseline": "0.13.0.1", "port-version": 0 }, "loguru": { @@ -4286,7 +4494,7 @@ }, "lua": { "baseline": "5.4.4", - "port-version": 1 + "port-version": 2 }, "luabridge": { "baseline": "2.6", @@ -4297,16 +4505,16 @@ "port-version": 2 }, "luajit": { - "baseline": "2.0.5", - "port-version": 5 + "baseline": "2022-08-11", + "port-version": 1 }, "luasec": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "luasocket": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 1 }, "lunasvg": { "baseline": "2.3.1", @@ -4318,7 +4526,7 @@ }, "lz4": { "baseline": "1.9.3", - "port-version": 3 + "port-version": 4 }, "lzfse": { "baseline": "1.0", @@ -4333,8 +4541,8 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.7.3", - "port-version": 1 + "baseline": "0.8.1", + "port-version": 0 }, "magic-get": { "baseline": "2019-09-02", @@ -4342,7 +4550,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 9 + "port-version": 11 }, "magnum-extras": { "baseline": "2020.06", @@ -4386,27 +4594,35 @@ }, "mapnik": { "baseline": "2022-01-28", - "port-version": 1 + "port-version": 2 }, "marble": { - "baseline": "19.08.2", - "port-version": 3 + "baseline": "22.04.0", + "port-version": 1 }, "marl": { "baseline": "2022-03-02", "port-version": 0 }, + "matchit": { + "baseline": "1.0.1", + "port-version": 0 + }, + "materialx": { + "baseline": "1.38.4", + "port-version": 0 + }, "mathc": { "baseline": "2019-09-29", "port-version": 1 }, "mathgl": { "baseline": "2.5", - "port-version": 0 + "port-version": 2 }, "matio": { - "baseline": "1.5.19", - "port-version": 1 + "baseline": "1.5.23", + "port-version": 0 }, "matplotlib-cpp": { "baseline": "2020-08-27", @@ -4414,14 +4630,18 @@ }, "matplotplusplus": { "baseline": "2021-04-11", - "port-version": 5 + "port-version": 6 }, "matroska": { "baseline": "1.6.3", "port-version": 0 }, "mbedtls": { - "baseline": "2.28.0", + "baseline": "2.28.1", + "port-version": 0 + }, + "mchehab-zbar": { + "baseline": "0.23.90", "port-version": 0 }, "mcpp": { @@ -4429,12 +4649,12 @@ "port-version": 3 }, "mdns": { - "baseline": "1.4.1", + "baseline": "1.4.2", "port-version": 0 }, "mdnsresponder": { "baseline": "878.270.2", - "port-version": 1 + "port-version": 2 }, "mdspan": { "baseline": "2021-11-03", @@ -4449,20 +4669,20 @@ "port-version": 2 }, "mesa": { - "baseline": "21.2.5", - "port-version": 3 + "baseline": "22.1.7", + "port-version": 0 }, "meschach": { "baseline": "1.2b", - "port-version": 4 + "port-version": 5 }, "meshoptimizer": { "baseline": "0.16", "port-version": 0 }, "metis": { - "baseline": "5.1.0", - "port-version": 8 + "baseline": "2022-07-27", + "port-version": 0 }, "metrohash": { "baseline": "1.1.3", @@ -4474,7 +4694,7 @@ }, "mgnlibs": { "baseline": "2019-09-29", - "port-version": 1 + "port-version": 2 }, "mhook": { "baseline": "2.5.1", @@ -4490,11 +4710,11 @@ }, "milerius-sfml-imgui": { "baseline": "1.1", - "port-version": 4 + "port-version": 5 }, "mimalloc": { - "baseline": "2.0.5", - "port-version": 1 + "baseline": "2.0.6", + "port-version": 0 }, "minc": { "baseline": "2.4.03", @@ -4509,12 +4729,12 @@ "port-version": 2 }, "minimp3": { - "baseline": "2020-12-25", - "port-version": 1 + "baseline": "2021-11-30", + "port-version": 0 }, "minio-cpp": { - "baseline": "2022-01-03", - "port-version": 0 + "baseline": "0.1.1", + "port-version": 1 }, "minisat-master-keying": { "baseline": "2.3.6", @@ -4534,7 +4754,7 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 10 + "port-version": 11 }, "minizip-ng": { "baseline": "3.0.5", @@ -4553,8 +4773,8 @@ "port-version": 5 }, "mmloader": { - "baseline": "2021-12-13", - "port-version": 1 + "baseline": "1.0.1", + "port-version": 2 }, "mmx": { "baseline": "2019-09-29", @@ -4562,7 +4782,7 @@ }, "mnn": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "modp-base64": { "baseline": "2020-09-26", @@ -4574,11 +4794,11 @@ }, "mongo-cxx-driver": { "baseline": "3.6.5", - "port-version": 2 + "port-version": 3 }, "mongoose": { - "baseline": "7.5", - "port-version": 1 + "baseline": "7.6", + "port-version": 0 }, "monkeys-audio": { "baseline": "5.70", @@ -4586,7 +4806,7 @@ }, "moos-core": { "baseline": "10.4.0", - "port-version": 6 + "port-version": 7 }, "moos-essential": { "baseline": "10.0.1", @@ -4601,8 +4821,8 @@ "port-version": 1 }, "mosquitto": { - "baseline": "2.0.12", - "port-version": 3 + "baseline": "2.0.14", + "port-version": 0 }, "mozjpeg": { "baseline": "2021-09-27", @@ -4610,11 +4830,11 @@ }, "mp-units": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "mp3lame": { "baseline": "3.100", - "port-version": 7 + "port-version": 8 }, "mpark-variant": { "baseline": "1.4.0", @@ -4626,26 +4846,26 @@ }, "mpfr": { "baseline": "4.1.0", - "port-version": 4 + "port-version": 6 }, "mpg123": { - "baseline": "1.29.2", - "port-version": 2 + "baseline": "1.29.3", + "port-version": 0 }, "mpi": { "baseline": "1", - "port-version": 2 + "port-version": 3 }, "mpir": { "baseline": "2022-03-02", - "port-version": 0 + "port-version": 1 }, "mpmcqueue": { - "baseline": "2019-07-26", - "port-version": 1 + "baseline": "2021-12-01", + "port-version": 0 }, "mqtt-cpp": { - "baseline": "12.0.0", + "baseline": "13.0.0", "port-version": 0 }, "ms-angle": { @@ -4653,7 +4873,7 @@ "port-version": 1 }, "ms-gltf": { - "baseline": "r1.9.5.4", + "baseline": "2022-06-28", "port-version": 1 }, "ms-gsl": { @@ -4665,7 +4885,7 @@ "port-version": 0 }, "msdfgen": { - "baseline": "1.9.1", + "baseline": "1.9.2", "port-version": 0 }, "msgpack": { @@ -4682,11 +4902,11 @@ }, "msix": { "baseline": "1.7", - "port-version": 3 + "port-version": 4 }, "msmpi": { "baseline": "10.1.12498", - "port-version": 3 + "port-version": 4 }, "mstch": { "baseline": "1.0.2", @@ -4714,12 +4934,16 @@ }, "mygui": { "baseline": "3.4.1", - "port-version": 2 + "port-version": 3 }, - "nameof": { - "baseline": "0.10.1", + "mysql-connector-cpp": { + "baseline": "8.0.30", "port-version": 1 }, + "nameof": { + "baseline": "0.10.2", + "port-version": 0 + }, "nana": { "baseline": "1.7.4", "port-version": 2 @@ -4729,7 +4953,7 @@ "port-version": 1 }, "nanobench": { - "baseline": "4.3.6", + "baseline": "4.3.7", "port-version": 0 }, "nanodbc": { @@ -4737,12 +4961,12 @@ "port-version": 6 }, "nanoflann": { - "baseline": "1.3.2", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "nanogui": { "baseline": "2019-09-23", - "port-version": 3 + "port-version": 5 }, "nanomsg": { "baseline": "1.1.5", @@ -4764,6 +4988,10 @@ "baseline": "2019-08-20", "port-version": 2 }, + "nanosvg": { + "baseline": "2022-04-29", + "port-version": 0 + }, "nanovg": { "baseline": "2019-08-30", "port-version": 5 @@ -4780,17 +5008,21 @@ "baseline": "2.4.6", "port-version": 2 }, + "ncnn": { + "baseline": "20220729", + "port-version": 0 + }, "ncurses": { "baseline": "6.3", - "port-version": 1 + "port-version": 2 }, "neargye-semver": { "baseline": "0.3.0", "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "0.0.0-cad832c8", - "port-version": 0 + "baseline": "2022-09-08", + "port-version": 1 }, "neon2sse": { "baseline": "2021-09-16", @@ -4805,8 +5037,8 @@ "port-version": 3 }, "nethost": { - "baseline": "2019-12-21", - "port-version": 2 + "baseline": "6.0.5", + "port-version": 0 }, "nettle": { "baseline": "3.7.3", @@ -4817,12 +5049,16 @@ "port-version": 3 }, "nghttp2": { - "baseline": "1.46.0", + "baseline": "1.49.0", "port-version": 0 }, + "nghttp3": { + "baseline": "0.7.0", + "port-version": 1 + }, "ngspice": { - "baseline": "35", - "port-version": 2 + "baseline": "37", + "port-version": 0 }, "nifly": { "baseline": "1.0.0", @@ -4830,19 +5066,19 @@ }, "nifticlib": { "baseline": "2020-04-30", - "port-version": 1 + "port-version": 2 }, "nlohmann-fifo-map": { "baseline": "2018.05.07", "port-version": 2 }, "nlohmann-json": { - "baseline": "3.10.5", - "port-version": 2 + "baseline": "3.11.2", + "port-version": 0 }, "nlopt": { - "baseline": "2.7.0", - "port-version": 1 + "baseline": "2.7.1", + "port-version": 0 }, "nmap": { "baseline": "7.70", @@ -4853,7 +5089,7 @@ "port-version": 1 }, "nng": { - "baseline": "1.5.1", + "baseline": "1.5.2", "port-version": 0 }, "nngpp": { @@ -4869,19 +5105,19 @@ "port-version": 2 }, "nowide": { - "baseline": "11.1.3", + "baseline": "11.2.0", "port-version": 0 }, "nrf-ble-driver": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 2 }, "nspr": { "baseline": "4.33", - "port-version": 0 + "port-version": 2 }, "nss": { - "baseline": "3.77", + "baseline": "3.78", "port-version": 0 }, "nsync": { @@ -4893,12 +5129,12 @@ "port-version": 1 }, "nu-book-zxing-cpp": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "nuklear": { - "baseline": "2021-03-18", - "port-version": 1 + "baseline": "2022-05-12", + "port-version": 0 }, "numactl": { "baseline": "2.0.14", @@ -4909,28 +5145,28 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.0.0", + "baseline": "5.1.1", "port-version": 0 }, "nvtt": { "baseline": "2.1.2", - "port-version": 4 + "port-version": 5 }, "oatpp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-consul": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-curl": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-libressl": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-mbedtls": { "baseline": "1.3.0", @@ -4938,7 +5174,7 @@ }, "oatpp-mongo": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-openssl": { "baseline": "1.3.0", @@ -4946,19 +5182,19 @@ }, "oatpp-postgresql": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-sqlite": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-ssdp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-swagger": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-websocket": { "baseline": "1.3.0", @@ -4966,7 +5202,7 @@ }, "oatpp-zlib": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "observer-ptr-lite": { "baseline": "0.4.0", @@ -4977,8 +5213,8 @@ "port-version": 2 }, "octomap": { - "baseline": "1.9.5", - "port-version": 2 + "baseline": "1.9.6", + "port-version": 0 }, "ode": { "baseline": "0.16.1", @@ -4994,10 +5230,10 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 7 + "port-version": 10 }, "ogre-next": { - "baseline": "2.3.0", + "baseline": "2.3.1", "port-version": 0 }, "ois": { @@ -5013,8 +5249,8 @@ "port-version": 3 }, "onednn": { - "baseline": "2.4.3", - "port-version": 1 + "baseline": "2.6.1", + "port-version": 0 }, "oniguruma": { "baseline": "6.9.7.1", @@ -5041,32 +5277,32 @@ "port-version": 1 }, "openal-soft": { - "baseline": "1.21.1", + "baseline": "1.22.2", "port-version": 4 }, "openblas": { - "baseline": "0.3.19", + "baseline": "0.3.21", "port-version": 0 }, "opencascade": { - "baseline": "7.6.0", - "port-version": 0 + "baseline": "7.6.2", + "port-version": 1 }, "opencc": { - "baseline": "2020-04-26", - "port-version": 10 + "baseline": "1.1.4", + "port-version": 3 }, "opencensus-cpp": { "baseline": "2021-08-26", - "port-version": 0 + "port-version": 2 }, "opencl": { "baseline": "2.2", "port-version": 8 }, "opencolorio": { - "baseline": "2.1.1", - "port-version": 2 + "baseline": "2.1.2", + "port-version": 0 }, "opencolorio-tools": { "baseline": "1.1.1", @@ -5076,33 +5312,41 @@ "baseline": "1.4.2", "port-version": 2 }, + "openctm": { + "baseline": "1.0.3", + "port-version": 0 + }, "opencv": { - "baseline": "4.5.5", + "baseline": "4.6.0", "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 11 + "port-version": 15 }, "opencv3": { - "baseline": "3.4.16", - "port-version": 5 + "baseline": "3.4.18", + "port-version": 2 }, "opencv4": { - "baseline": "4.5.5", - "port-version": 1 + "baseline": "4.6.0", + "port-version": 5 }, "opendnp3": { "baseline": "3.1.1", "port-version": 1 }, "openexr": { - "baseline": "2.5.0", - "port-version": 3 + "baseline": "3.1.5", + "port-version": 0 + }, + "openfbx": { + "baseline": "2022-07-18", + "port-version": 0 }, "opengl": { "baseline": "2022-03-14", - "port-version": 0 + "port-version": 1 }, "opengl-registry": { "baseline": "2021-11-17", @@ -5117,11 +5361,15 @@ "port-version": 2 }, "openimageio": { - "baseline": "2.3.10.1", - "port-version": 3 + "baseline": "2.3.17.0", + "port-version": 4 }, "openjpeg": { - "baseline": "2.4.0", + "baseline": "2.5.0", + "port-version": 0 + }, + "openldap": { + "baseline": "2.5.13", "port-version": 0 }, "openmama": { @@ -5133,28 +5381,28 @@ "port-version": 3 }, "openmpi": { - "baseline": "4.1.0", - "port-version": 4 + "baseline": "4.1.3", + "port-version": 0 }, "openmvg": { "baseline": "2.0", - "port-version": 3 + "port-version": 4 }, "openmvs": { - "baseline": "1.1.1", - "port-version": 2 + "baseline": "2.0.1", + "port-version": 0 }, "openni2": { "baseline": "2.2.0.33", - "port-version": 13 + "port-version": 14 }, "openscap": { "baseline": "1.3.1", - "port-version": 1 + "port-version": 3 }, "openssl": { - "baseline": "3.0.2", - "port-version": 2 + "baseline": "3.0.5", + "port-version": 4 }, "openssl-unix": { "baseline": "1.1.1h", @@ -5173,20 +5421,20 @@ "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.2.0", - "port-version": 0 + "baseline": "1.5.0", + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "openvdb": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "openvpn3": { - "baseline": "3.4.1", - "port-version": 2 + "baseline": "3.7.0", + "port-version": 1 }, "openvr": { "baseline": "1.16.8", @@ -5210,15 +5458,15 @@ }, "opus": { "baseline": "1.3.1", - "port-version": 6 + "port-version": 8 }, "opusfile": { "baseline": "0.12", "port-version": 1 }, "orc": { - "baseline": "1.6.4", - "port-version": 2 + "baseline": "1.7.6", + "port-version": 0 }, "orocos-kdl": { "baseline": "1.4", @@ -5226,15 +5474,15 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 11 + "port-version": 17 }, "osg-qt": { "baseline": "Qt5", "port-version": 3 }, "osgearth": { - "baseline": "3.2", - "port-version": 4 + "baseline": "3.3", + "port-version": 2 }, "osi": { "baseline": "0.108.6", @@ -5242,11 +5490,11 @@ }, "otl": { "baseline": "4.0.463", - "port-version": 1 + "port-version": 2 }, "outcome": { - "baseline": "2.2.2-20211208", - "port-version": 0 + "baseline": "2.2.4", + "port-version": 1 }, "p-ranav-csv": { "baseline": "2019-07-11", @@ -5257,32 +5505,32 @@ "port-version": 2 }, "pagmo2": { - "baseline": "2.16.1", + "baseline": "2.18.0", "port-version": 0 }, "paho-mqtt": { - "baseline": "1.3.9", + "baseline": "1.3.10", "port-version": 0 }, "paho-mqttpp3": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "palsigslot": { "baseline": "1.2.1", "port-version": 0 }, "pango": { - "baseline": "1.50.6", + "baseline": "1.50.9", "port-version": 0 }, "pangolin": { "baseline": "0.6", - "port-version": 2 + "port-version": 3 }, "pangomm": { "baseline": "2.50.0", - "port-version": 1 + "port-version": 2 }, "parallel-hashmap": { "baseline": "1.34", @@ -5294,11 +5542,11 @@ }, "paraview": { "baseline": "5.9.1", - "port-version": 1 + "port-version": 2 }, "parmetis": { - "baseline": "4.0.3", - "port-version": 5 + "baseline": "2022-07-27", + "port-version": 0 }, "parquet": { "baseline": "0", @@ -5313,8 +5561,8 @@ "port-version": 6 }, "pcapplusplus": { - "baseline": "21.11", - "port-version": 1 + "baseline": "22.05", + "port-version": 0 }, "pcg": { "baseline": "2021-04-06", @@ -5326,14 +5574,14 @@ }, "pcre": { "baseline": "8.45", - "port-version": 2 + "port-version": 5 }, "pcre2": { - "baseline": "10.39", - "port-version": 2 + "baseline": "10.40", + "port-version": 0 }, "pdal": { - "baseline": "2.3.0", + "baseline": "2.4.3", "port-version": 0 }, "pdal-c": { @@ -5353,7 +5601,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.5", + "baseline": "3.2.6", "port-version": 0 }, "pegtl-2": { @@ -5362,7 +5610,7 @@ }, "pffft": { "baseline": "2021-10-09", - "port-version": 0 + "port-version": 1 }, "pfring": { "baseline": "2019-10-17", @@ -5378,11 +5626,11 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 6 + "port-version": 7 }, "physx": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 4 }, "picojson": { "baseline": "1.3.0", @@ -5396,21 +5644,25 @@ "baseline": "2019-07-11", "port-version": 2 }, + "pipewire": { + "baseline": "0.3.52", + "port-version": 1 + }, "pistache": { "baseline": "2021-03-31", "port-version": 3 }, "pixel": { "baseline": "2022-03-15", - "port-version": 0 + "port-version": 1 }, "pixman": { "baseline": "0.40.0", - "port-version": 2 + "port-version": 4 }, "pkgconf": { "baseline": "1.8.0", - "port-version": 2 + "port-version": 3 }, "platform-folders": { "baseline": "4.1.0", @@ -5445,8 +5697,8 @@ "port-version": 6 }, "plog": { - "baseline": "1.1.5", - "port-version": 1 + "baseline": "1.1.8", + "port-version": 0 }, "plplot": { "baseline": "5.13.0", @@ -5457,8 +5709,8 @@ "port-version": 2 }, "pmdk": { - "baseline": "1.11.0", - "port-version": 1 + "baseline": "1.12.0", + "port-version": 0 }, "pngpp": { "baseline": "0.2.10", @@ -5469,11 +5721,11 @@ "port-version": 3 }, "poco": { - "baseline": "1.11.1", + "baseline": "1.11.2", "port-version": 0 }, "podofo": { - "baseline": "0.9.7", + "baseline": "0.9.8", "port-version": 0 }, "poissonrecon": { @@ -5494,15 +5746,15 @@ }, "polymorphic-value": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "ponder": { "baseline": "3.0.0", "port-version": 4 }, "poppler": { - "baseline": "22.3.0", - "port-version": 1 + "baseline": "22.8.0", + "port-version": 0 }, "popsift": { "baseline": "0.9", @@ -5510,7 +5762,7 @@ }, "portable-snippets": { "baseline": "2019-09-20", - "port-version": 1 + "port-version": 2 }, "portaudio": { "baseline": "19.7", @@ -5545,7 +5797,7 @@ "port-version": 1 }, "proj": { - "baseline": "9.0.0", + "baseline": "9.1.0", "port-version": 0 }, "proj4": { @@ -5553,7 +5805,7 @@ "port-version": 1 }, "prometheus-cpp": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "promise-cpp": { @@ -5561,7 +5813,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.19.4", + "baseline": "3.21.6", "port-version": 0 }, "protobuf-c": { @@ -5569,16 +5821,20 @@ "port-version": 0 }, "protopuf": { - "baseline": "2.1.0", - "port-version": 1 + "baseline": "2.2.0", + "port-version": 0 }, "protozero": { - "baseline": "1.7.0", - "port-version": 1 + "baseline": "1.7.1", + "port-version": 0 + }, + "proxy": { + "baseline": "1.0.1", + "port-version": 0 }, "proxygen": { - "baseline": "2022.03.21.00", - "port-version": 1 + "baseline": "2022.07.11.00", + "port-version": 0 }, "psimd": { "baseline": "2021-02-21", @@ -5592,41 +5848,45 @@ "baseline": "3.0.0", "port-version": 1 }, + "pthread-stubs": { + "baseline": "0.4", + "port-version": 0 + }, "pthreadpool": { "baseline": "2020-04-10", - "port-version": 1 + "port-version": 2 }, "pthreads": { "baseline": "3.0.0", - "port-version": 10 + "port-version": 11 }, "ptyqt": { "baseline": "0.6.5", "port-version": 0 }, "pugixml": { - "baseline": "1.11.4", + "baseline": "1.12.1", "port-version": 1 }, "pybind11": { - "baseline": "2.9.2", - "port-version": 0 + "baseline": "2.10.0", + "port-version": 1 }, "pystring": { "baseline": "1.1.3", - "port-version": 4 + "port-version": 5 }, "python2": { "baseline": "2.7.18", - "port-version": 4 + "port-version": 5 }, "python3": { - "baseline": "3.10.2", - "port-version": 1 + "baseline": "3.10.5", + "port-version": 2 }, "qca": { "baseline": "2.3.4", - "port-version": 2 + "port-version": 3 }, "qcustomplot": { "baseline": "2.0.1", @@ -5642,86 +5902,86 @@ }, "qnnpack": { "baseline": "2021-02-26", - "port-version": 2 + "port-version": 3 }, "qpid-proton": { - "baseline": "0.32.0", - "port-version": 4 + "baseline": "0.37.0", + "port-version": 3 }, "qscintilla": { "baseline": "2.12.0", "port-version": 1 }, "qt": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "3.8.0", + "baseline": "3.8.2", "port-version": 0 }, "qt5": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.6", + "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.3", - "port-version": 2 + "baseline": "5.15.6", + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-location": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-modularscripts": { @@ -5729,111 +5989,111 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 1 }, "qt5-webglplugin": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.3", - "port-version": 1 + "baseline": "5.15.6", + "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.3", + "baseline": "5.15.6", "port-version": 0 }, "qt5compat": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qt6betablock": { @@ -5841,159 +6101,159 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtbase": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtcharts": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtkeychain": { "baseline": "0.13.2", - "port-version": 1 + "port-version": 3 }, "qtkeychain-qt6": { "baseline": "0.13.2", - "port-version": 0 + "port-version": 1 }, "qtlocation": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtpositioning": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.2.0", + "baseline": "deprecated", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qttools": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.4", + "baseline": "6.3.2", "port-version": 0 }, "quadtree": { @@ -6001,7 +6261,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.25", + "baseline": "1.27", "port-version": 0 }, "quaternions": { @@ -6009,7 +6269,7 @@ "port-version": 1 }, "quazip": { - "baseline": "1.1", + "baseline": "1.3", "port-version": 1 }, "quickfast": { @@ -6021,12 +6281,12 @@ "port-version": 7 }, "quill": { - "baseline": "1.6.3", - "port-version": 4 + "baseline": "2.1.0", + "port-version": 0 }, "quirc": { "baseline": "1.1", - "port-version": 2 + "port-version": 3 }, "qwt": { "baseline": "6.2.0", @@ -6044,6 +6304,10 @@ "baseline": "6.10", "port-version": 4 }, + "random123": { + "baseline": "1.14.0", + "port-version": 0 + }, "randomstr": { "baseline": "2022-02-03", "port-version": 0 @@ -6053,7 +6317,7 @@ "port-version": 0 }, "range-v3": { - "baseline": "2021-11-02", + "baseline": "0.12.0", "port-version": 0 }, "range-v3-vs2015": { @@ -6065,12 +6329,12 @@ "port-version": 0 }, "rapidcsv": { - "baseline": "8.53", + "baseline": "8.64", "port-version": 0 }, "rapidjson": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "2022-06-28", + "port-version": 3 }, "rapidxml": { "baseline": "1.13", @@ -6085,16 +6349,16 @@ "port-version": 1 }, "raylib": { - "baseline": "4.0.0", - "port-version": 3 + "baseline": "4.2.0", + "port-version": 0 }, "rbdl": { - "baseline": "2.6.0", - "port-version": 2 + "baseline": "3.2.0", + "port-version": 4 }, "rbdl-orb": { - "baseline": "3.1.2", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 2 }, "re2": { "baseline": "2021-11-01", @@ -6114,38 +6378,38 @@ }, "readline-unix": { "baseline": "8.1", - "port-version": 1 + "port-version": 2 }, "readline-win32": { "baseline": "5.0", - "port-version": 4 + "port-version": 5 }, "readosm": { "baseline": "1.1.0a", - "port-version": 2 + "port-version": 3 }, "realsense2": { - "baseline": "2.50.0", - "port-version": 1 + "baseline": "2.51.1", + "port-version": 0 }, "recast": { "baseline": "1.5.1", - "port-version": 4 + "port-version": 5 }, "redis-plus-plus": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { - "baseline": "0.12.2", - "port-version": 0 + "baseline": "0.12.3", + "port-version": 1 }, "refprop-headers": { "baseline": "2019-04-14", "port-version": 1 }, "rendergraph": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "replxx": { @@ -6173,7 +6437,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.14", + "baseline": "0.6.17", "port-version": 0 }, "rexo": { @@ -6181,8 +6445,8 @@ "port-version": 0 }, "rhash": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.4.2", + "port-version": 1 }, "rhasheq": { "baseline": "0.0.1", @@ -6196,20 +6460,24 @@ "baseline": "0.6.0", "port-version": 0 }, + "rioki-glow": { + "baseline": "0.2.0", + "port-version": 0 + }, "rmlui": { - "baseline": "4.3", + "baseline": "4.4", "port-version": 0 }, "roaring": { - "baseline": "2019-03-05", - "port-version": 3 + "baseline": "0.7.1", + "port-version": 0 }, "robin-hood-hashing": { "baseline": "3.11.5", "port-version": 0 }, "robin-map": { - "baseline": "0.6.3", + "baseline": "1.0.1", "port-version": 1 }, "rocksdb": { @@ -6228,9 +6496,13 @@ "baseline": "0.0.7", "port-version": 1 }, + "rsig": { + "baseline": "0.1.1", + "port-version": 0 + }, "rsm-binary-io": { - "baseline": "2.0.4", - "port-version": 1 + "baseline": "2.0.5", + "port-version": 0 }, "rsm-bsa": { "baseline": "4.0.3", @@ -6246,7 +6518,7 @@ }, "rtabmap": { "baseline": "0.20.13", - "port-version": 3 + "port-version": 4 }, "rtaudio": { "baseline": "2021-11-16", @@ -6257,16 +6529,20 @@ "port-version": 3 }, "rtmidi": { - "baseline": "4.0.0", - "port-version": 4 + "baseline": "5.0.0", + "port-version": 2 }, "rttr": { "baseline": "0.9.6", - "port-version": 3 + "port-version": 4 + }, + "rubberband": { + "baseline": "2.0.2", + "port-version": 0 }, "rxcpp": { - "baseline": "4.1.0", - "port-version": 2 + "baseline": "4.1.1", + "port-version": 0 }, "rxqt": { "baseline": "bb2138c", @@ -6274,11 +6550,11 @@ }, "rxspencer": { "baseline": "3.9.0", - "port-version": 1 + "port-version": 2 }, "ryml": { - "baseline": "2021-07-24", - "port-version": 1 + "baseline": "0.4.1", + "port-version": 0 }, "ryu": { "baseline": "2.0", @@ -6297,7 +6573,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre21", + "baseline": "0.9.0-rc1", "port-version": 0 }, "sais": { @@ -6312,6 +6588,10 @@ "baseline": "3.6.2", "port-version": 0 }, + "saucer": { + "baseline": "1.0.1", + "port-version": 2 + }, "sbp": { "baseline": "3.4.10", "port-version": 1 @@ -6321,8 +6601,8 @@ "port-version": 1 }, "sciplot": { - "baseline": "0.2.2", - "port-version": 0 + "baseline": "0.3.1", + "port-version": 1 }, "sciter": { "baseline": "0", @@ -6353,20 +6633,20 @@ "port-version": 6 }, "sdformat9": { - "baseline": "9.4.0", - "port-version": 5 + "baseline": "9.8.0", + "port-version": 0 }, "sdl1": { "baseline": "1.2.15", - "port-version": 15 + "port-version": 17 }, "sdl1-net": { "baseline": "1.2.8", "port-version": 4 }, "sdl2": { - "baseline": "2.0.20", - "port-version": 1 + "baseline": "2.24.0", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", @@ -6374,31 +6654,31 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 4 + "port-version": 7 }, "sdl2-mixer": { - "baseline": "2.0.4", - "port-version": 16 + "baseline": "2.6.1", + "port-version": 1 }, "sdl2-net": { "baseline": "2.0.1", "port-version": 9 }, "sdl2-ttf": { - "baseline": "2.0.15", - "port-version": 5 + "baseline": "2.20.0", + "port-version": 0 }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 2 + "port-version": 5 }, "seal": { "baseline": "3.7.2", - "port-version": 2 + "port-version": 3 }, "secp256k1": { - "baseline": "2017-19-10", - "port-version": 4 + "baseline": "2022-07-11", + "port-version": 1 }, "selene": { "baseline": "0.3.1", @@ -6409,7 +6689,11 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.4.15", + "baseline": "0.5.0", + "port-version": 0 + }, + "septag-dmon": { + "baseline": "2022-02-08", "port-version": 0 }, "septag-sx": { @@ -6434,11 +6718,11 @@ }, "sfgui": { "baseline": "0.4.0", - "port-version": 4 + "port-version": 5 }, "sfml": { "baseline": "2.5.1", - "port-version": 12 + "port-version": 14 }, "sfsexp": { "baseline": "1.3.1", @@ -6446,16 +6730,24 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 2 + "port-version": 3 }, "shaderwriter": { - "baseline": "2.2.0", + "baseline": "2.4.0", "port-version": 0 }, "shapelib": { "baseline": "1.5.0", "port-version": 3 }, + "shiftmedia-libgcrypt": { + "baseline": "1.10.1", + "port-version": 0 + }, + "shiftmedia-libgnutls": { + "baseline": "3.7.6", + "port-version": 0 + }, "shiva": { "baseline": "1.0", "port-version": 5 @@ -6477,19 +6769,19 @@ "port-version": 4 }, "simage": { - "baseline": "1.8.1", - "port-version": 4 + "baseline": "1.8.2", + "port-version": 1 }, "simbody": { "baseline": "2022-01-04", - "port-version": 1 + "port-version": 2 }, "simde": { "baseline": "0.7.2", "port-version": 0 }, "simdjson": { - "baseline": "1.0.2", + "baseline": "2.2.2", "port-version": 0 }, "simdutf": { @@ -6513,8 +6805,8 @@ "port-version": 0 }, "skia": { - "baseline": "2020-05-18", - "port-version": 8 + "baseline": "0.36.0", + "port-version": 0 }, "skyr-url": { "baseline": "1.13.0", @@ -6542,7 +6834,7 @@ }, "snappy": { "baseline": "1.1.9", - "port-version": 1 + "port-version": 3 }, "sndfile": { "baseline": "0", @@ -6553,11 +6845,11 @@ "port-version": 1 }, "so5extra": { - "baseline": "1.5.0", + "baseline": "1.5.2", "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.3", + "baseline": "5.7.4.2", "port-version": 0 }, "soci": { @@ -6565,12 +6857,12 @@ "port-version": 0 }, "socket-io-client": { - "baseline": "3.1.0", + "baseline": "2022-08-19", "port-version": 0 }, "sockpp": { "baseline": "0.7.1", - "port-version": 0 + "port-version": 1 }, "soem": { "baseline": "1.4.0", @@ -6581,20 +6873,20 @@ "port-version": 1 }, "soil2": { - "baseline": "2021-05-01", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "sokol": { "baseline": "2019-09-09", "port-version": 1 }, "sol2": { - "baseline": "3.2.2", - "port-version": 2 + "baseline": "3.3.0", + "port-version": 0 }, "solid3": { "baseline": "3.5.8", - "port-version": 1 + "port-version": 2 }, "sophus": { "baseline": "2021-09-14", @@ -6614,7 +6906,7 @@ }, "soxr": { "baseline": "0.1.3", - "port-version": 6 + "port-version": 7 }, "spaceland": { "baseline": "7.8.2", @@ -6649,24 +6941,24 @@ "port-version": 1 }, "spdk-isal": { - "baseline": "20181006", - "port-version": 2 + "baseline": "2018-10-06", + "port-version": 3 }, "spdlog": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "spectra": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "speex": { - "baseline": "1.2.0", - "port-version": 11 + "baseline": "1.2.1", + "port-version": 1 }, "speexdsp": { - "baseline": "1.2.0", - "port-version": 7 + "baseline": "1.2.1", + "port-version": 0 }, "spirit-po": { "baseline": "1.1.2", @@ -6677,7 +6969,7 @@ "port-version": 2 }, "spirv-headers": { - "baseline": "1.3.204.1", + "baseline": "1.3.216.0", "port-version": 0 }, "spirv-reflect": { @@ -6685,11 +6977,11 @@ "port-version": 0 }, "spirv-tools": { - "baseline": "2022.1", + "baseline": "2022.2", "port-version": 0 }, "spix": { - "baseline": "0.3", + "baseline": "0.4", "port-version": 0 }, "sprout": { @@ -6701,7 +6993,7 @@ "port-version": 1 }, "sqlcipher": { - "baseline": "4.5.1", + "baseline": "4.5.2", "port-version": 0 }, "sqlite-modern-cpp": { @@ -6713,24 +7005,24 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.37.2", - "port-version": 1 + "baseline": "3.39.2", + "port-version": 0 }, "sqlitecpp": { "baseline": "3.1.1", - "port-version": 1 + "port-version": 2 }, "sqlpp11": { - "baseline": "0.60", + "baseline": "0.61", "port-version": 1 }, "sqlpp11-connector-mysql": { - "baseline": "0.29", - "port-version": 2 + "baseline": "0.61", + "port-version": 0 }, "sqlpp11-connector-sqlite3": { - "baseline": "0.30", - "port-version": 1 + "baseline": "0.61", + "port-version": 0 }, "squirrel": { "baseline": "2021-09-17", @@ -6741,7 +7033,7 @@ "port-version": 0 }, "srell": { - "baseline": "3.001", + "baseline": "3.010", "port-version": 0 }, "srpc": { @@ -6753,17 +7045,25 @@ "port-version": 1 }, "status-code": { - "baseline": "1.0.0-20211208", - "port-version": 1 + "baseline": "2022-09-08", + "port-version": 0 }, "status-value-lite": { "baseline": "1.1.0", "port-version": 1 }, "stb": { - "baseline": "2020-09-14", + "baseline": "2021-09-10", "port-version": 1 }, + "stduuid": { + "baseline": "1.2.2", + "port-version": 0 + }, + "stftpitchshift": { + "baseline": "1.4.1", + "port-version": 0 + }, "stlab": { "baseline": "1.6.2", "port-version": 1 @@ -6777,13 +7077,17 @@ "port-version": 1 }, "string-theory": { - "baseline": "3.5", + "baseline": "3.6", "port-version": 0 }, "string-view-lite": { "baseline": "1.6.0", "port-version": 0 }, + "stronk": { + "baseline": "0.2.0", + "port-version": 0 + }, "strtk": { "baseline": "2020-09-14", "port-version": 1 @@ -6794,23 +7098,23 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 4 + "port-version": 5 }, "suitesparse": { "baseline": "5.8.0", "port-version": 1 }, "sundials": { - "baseline": "5.8.0", + "baseline": "6.2.0", "port-version": 0 }, "superlu": { "baseline": "2020-01-07", - "port-version": 5 + "port-version": 6 }, "symengine": { - "baseline": "0.7.0", - "port-version": 2 + "baseline": "0.9.0", + "port-version": 0 }, "systemc": { "baseline": "2.3.3", @@ -6818,7 +7122,7 @@ }, "szip": { "baseline": "2.1.1", - "port-version": 7 + "port-version": 9 }, "tabulate": { "baseline": "2019-01-06", @@ -6830,7 +7134,7 @@ }, "taglib": { "baseline": "1.12.0", - "port-version": 2 + "port-version": 3 }, "taocpp-json": { "baseline": "2020-09-14", @@ -6841,12 +7145,12 @@ "port-version": 1 }, "taskflow": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "tbb": { - "baseline": "2020_U3", - "port-version": 8 + "baseline": "2021.5.0", + "port-version": 0 }, "tcb-span": { "baseline": "2021-12-15", @@ -6857,12 +7161,12 @@ "port-version": 5 }, "tclap": { - "baseline": "1.2.2", - "port-version": 4 + "baseline": "1.2.5", + "port-version": 0 }, "teemo": { - "baseline": "2.6", - "port-version": 1 + "baseline": "2.7", + "port-version": 0 }, "telnetpp": { "baseline": "2.1.2", @@ -6881,16 +7185,16 @@ "port-version": 2 }, "tensorpipe": { - "baseline": "2021-04-26", + "baseline": "2022-03-16", "port-version": 1 }, "termcolor": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "tesseract": { - "baseline": "4.1.1", - "port-version": 10 + "baseline": "5.2.0", + "port-version": 2 }, "tfhe": { "baseline": "1.0.1", @@ -6906,11 +7210,11 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 3 + "port-version": 4 }, "theia": { "baseline": "0.8", - "port-version": 6 + "port-version": 7 }, "think-cell-range": { "baseline": "498839d", @@ -6918,23 +7222,23 @@ }, "thor": { "baseline": "2.0", - "port-version": 4 + "port-version": 6 }, "threadpool": { "baseline": "0.2.5", "port-version": 2 }, "thrift": { - "baseline": "0.13.0", - "port-version": 2 + "baseline": "0.16.0", + "port-version": 0 }, "tidy-html5": { - "baseline": "5.7.28", - "port-version": 5 + "baseline": "5.8.0", + "port-version": 0 }, "tiff": { - "baseline": "4.3.0", - "port-version": 6 + "baseline": "4.4.0", + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", @@ -6969,8 +7273,8 @@ "port-version": 1 }, "tinydir": { - "baseline": "1.2.4", - "port-version": 1 + "baseline": "1.2.5", + "port-version": 0 }, "tinyexif": { "baseline": "2022-02-15", @@ -6997,16 +7301,16 @@ "port-version": 4 }, "tinyobjloader": { - "baseline": "2.0.0-rc2", - "port-version": 2 + "baseline": "2.0.0-rc9", + "port-version": 0 }, "tinyply": { "baseline": "2020-05-22", "port-version": 2 }, "tinyspline": { - "baseline": "0.3.0", - "port-version": 1 + "baseline": "0.4.0", + "port-version": 0 }, "tinythread": { "baseline": "1.1", @@ -7017,8 +7321,8 @@ "port-version": 2 }, "tinyutf8": { - "baseline": "4.0.2", - "port-version": 1 + "baseline": "4.4.3", + "port-version": 0 }, "tinyxml": { "baseline": "2.6.2", @@ -7026,7 +7330,7 @@ }, "tinyxml2": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "tl-expected": { "baseline": "1.0.0", @@ -7054,22 +7358,22 @@ }, "tmx": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "tmxlite": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "tmxparser": { "baseline": "2.1.0", "port-version": 6 }, "toml11": { - "baseline": "3.7.0", + "baseline": "3.7.1", "port-version": 0 }, "tomlplusplus": { - "baseline": "3.0.1", + "baseline": "3.1.0", "port-version": 0 }, "tool-meson": { @@ -7081,7 +7385,7 @@ "port-version": 3 }, "tracy": { - "baseline": "0.8.0", + "baseline": "0.8.2", "port-version": 0 }, "transwarp": { @@ -7089,12 +7393,16 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.5", + "baseline": "1.5.6", "port-version": 0 }, "tre": { "baseline": "0.8.0", - "port-version": 3 + "port-version": 4 + }, + "tree-sitter": { + "baseline": "0.20.6", + "port-version": 0 }, "treehh": { "baseline": "3.16", @@ -7110,7 +7418,7 @@ }, "triton": { "baseline": "0.9", - "port-version": 2 + "port-version": 4 }, "trompeloeil": { "baseline": "41", @@ -7134,7 +7442,7 @@ }, "turbobase64": { "baseline": "2020-01-12", - "port-version": 2 + "port-version": 3 }, "tvision": { "baseline": "2021-08-10", @@ -7177,7 +7485,7 @@ "port-version": 3 }, "unixodbc": { - "baseline": "2.3.9", + "baseline": "2.3.11", "port-version": 1 }, "unqlite": { @@ -7185,20 +7493,20 @@ "port-version": 0 }, "unrar": { - "baseline": "5.8.1", - "port-version": 3 + "baseline": "6.1.7", + "port-version": 0 }, "upb": { - "baseline": "2021-10-19", + "baseline": "2022-06-21", "port-version": 0 }, "urdfdom": { - "baseline": "1.0.4", - "port-version": 5 + "baseline": "3.1.0", + "port-version": 0 }, "urdfdom-headers": { - "baseline": "1.0.5", - "port-version": 2 + "baseline": "1.1.0", + "port-version": 0 }, "urho3d": { "baseline": "2021-03-01", @@ -7214,11 +7522,11 @@ }, "usd": { "baseline": "20.08", - "port-version": 2 + "port-version": 3 }, "usockets": { "baseline": "0.8.1", - "port-version": 0 + "port-version": 2 }, "usrsctp": { "baseline": "0.9.5.0", @@ -7229,12 +7537,12 @@ "port-version": 0 }, "utf8proc": { - "baseline": "2.6.1", - "port-version": 0 + "baseline": "2.7.0", + "port-version": 1 }, "utfcpp": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "utfz": { "baseline": "1.2", @@ -7249,15 +7557,15 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2022-03-24", - "port-version": 0 + "baseline": "2022-07-30", + "port-version": 1 }, "uvw": { - "baseline": "2.7.0", - "port-version": 1 + "baseline": "2.12.1", + "port-version": 2 }, "uwebsockets": { - "baseline": "20.11.0", + "baseline": "20.14.0", "port-version": 0 }, "v-hacd": { @@ -7266,7 +7574,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 3 + "port-version": 4 }, "valijson": { "baseline": "0.6", @@ -7278,30 +7586,34 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 2 + "port-version": 4 }, "variant-lite": { "baseline": "2.0.0", "port-version": 0 }, "vc": { - "baseline": "1.4.2", - "port-version": 2 + "baseline": "1.4.3", + "port-version": 0 }, "vcglib": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "2022.02", + "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-04-07", + "baseline": "2022-08-18", "port-version": 0 }, "vcpkg-cmake-config": { "baseline": "2022-02-06", - "port-version": 0 + "port-version": 1 + }, + "vcpkg-cmake-get-vars": { + "baseline": "2022-05-10", + "port-version": 1 }, "vcpkg-get-python-packages": { - "baseline": "2022-02-12", + "baseline": "2022-06-30", "port-version": 0 }, "vcpkg-gfortran": { @@ -7310,14 +7622,18 @@ }, "vcpkg-gn": { "baseline": "2021-11-16", - "port-version": 1 + "port-version": 2 }, "vcpkg-pkgconfig-get-modules": { "baseline": "2022-02-10", - "port-version": 0 + "port-version": 1 }, "vcpkg-qmake": { - "baseline": "2022-02-14", + "baseline": "2022-05-10", + "port-version": 1 + }, + "vcpkg-tool-gn": { + "baseline": "2022-04-16", "port-version": 0 }, "vcpkg-tool-gyp-nss": { @@ -7329,13 +7645,17 @@ "port-version": 0 }, "vcpkg-tool-meson": { - "baseline": "0.60.2", - "port-version": 2 + "baseline": "0.63", + "port-version": 0 }, "vcpkg-tool-mozbuild": { "baseline": "3.3", "port-version": 0 }, + "vcpkg-tool-ninja": { + "baseline": "2022-03-31", + "port-version": 1 + }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 @@ -7345,8 +7665,8 @@ "port-version": 0 }, "vectorclass": { - "baseline": "2.00.01", - "port-version": 2 + "baseline": "2.02.00", + "port-version": 0 }, "visit-struct": { "baseline": "1.0", @@ -7356,17 +7676,21 @@ "baseline": "0.5", "port-version": 0 }, + "vkfft": { + "baseline": "1.2.17", + "port-version": 0 + }, "vlfeat": { "baseline": "2020-07-10", "port-version": 1 }, "vlpp": { "baseline": "0.11.0.0", - "port-version": 2 + "port-version": 3 }, "volk": { "baseline": "1.3.204", - "port-version": 0 + "port-version": 1 }, "vs-yasm": { "baseline": "0.5.0", @@ -7374,7 +7698,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 10 + "port-version": 11 }, "vtk-dicom": { "baseline": "0.8.12", @@ -7382,14 +7706,14 @@ }, "vtk-m": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "vulkan": { "baseline": "1.1.82.1", "port-version": 2 }, "vulkan-headers": { - "baseline": "1.2.203", + "baseline": "1.3.224", "port-version": 0 }, "vulkan-hpp": { @@ -7417,13 +7741,25 @@ "port-version": 0 }, "wavpack": { - "baseline": "5.4.0", - "port-version": 1 + "baseline": "5.5.0", + "port-version": 0 + }, + "wayland": { + "baseline": "1.19.0", + "port-version": 0 + }, + "wayland-protocols": { + "baseline": "1.23", + "port-version": 0 }, "websocketpp": { "baseline": "0.8.2", "port-version": 2 }, + "webview2": { + "baseline": "1.0.1210.39", + "port-version": 0 + }, "wepoll": { "baseline": "1.5.8", "port-version": 1 @@ -7457,12 +7793,12 @@ "port-version": 0 }, "winreg": { - "baseline": "5.1.0", + "baseline": "6.1.0", "port-version": 0 }, "winsock2": { "baseline": "0.0", - "port-version": 4 + "port-version": 5 }, "winsparkle": { "baseline": "0.7.0", @@ -7476,61 +7812,93 @@ "baseline": "1.0.2", "port-version": 3 }, + "wolfmqtt": { + "baseline": "1.14.1", + "port-version": 0 + }, + "wolfssl": { + "baseline": "5.5.0", + "port-version": 0 + }, + "wolftpm": { + "baseline": "2.6.0", + "port-version": 0 + }, "wordnet": { "baseline": "3.0", "port-version": 1 }, "workflow": { "baseline": "0.9.7", - "port-version": 0 + "port-version": 1 }, "wpilib": { - "baseline": "2020.3.2", - "port-version": 2 + "baseline": "2020-03-02", + "port-version": 3 }, "wren": { - "baseline": "2019-07-01", - "port-version": 1 + "baseline": "0.4.0", + "port-version": 0 }, "wt": { - "baseline": "4.6.1", + "baseline": "4.7.1", "port-version": 0 }, "wtl": { "baseline": "10.0.10320", - "port-version": 2 + "port-version": 4 }, "wxchartdir": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "2.0.0", + "port-version": 0 + }, + "wxcharts": { + "baseline": "2022-07-05", + "port-version": 0 }, "wxwidgets": { - "baseline": "3.1.5", - "port-version": 8 + "baseline": "3.2.1", + "port-version": 0 }, "x-plane": { "baseline": "3.0.3", "port-version": 1 }, "x264": { - "baseline": "164-5db6aa6cab1b146", - "port-version": 4 + "baseline": "0.164.3095", + "port-version": 1 }, "x265": { "baseline": "3.4", - "port-version": 5 + "port-version": 7 }, "xalan-c": { "baseline": "1.12", "port-version": 1 }, "xaudio2redist": { - "baseline": "1.2.8", - "port-version": 2 + "baseline": "1.2.9", + "port-version": 0 }, "xbyak": { - "baseline": "6.00", - "port-version": 1 + "baseline": "6.60", + "port-version": 0 + }, + "xcb": { + "baseline": "1.14", + "port-version": 0 + }, + "xcb-proto": { + "baseline": "1.14.1", + "port-version": 0 + }, + "xcb-render-util": { + "baseline": "0.3.9", + "port-version": 0 + }, + "xcb-util-m4": { + "baseline": "2022-01-24", + "port-version": 0 }, "xerces-c": { "baseline": "3.2.3", @@ -7546,20 +7914,24 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 3 + "port-version": 4 }, "xlsxio": { "baseline": "2021-03-24", - "port-version": 0 + "port-version": 1 }, "xmlsec": { - "baseline": "1.2.33", + "baseline": "1.2.34", "port-version": 0 }, "xnnpack": { "baseline": "2021-05-17", "port-version": 2 }, + "xorg-macros": { + "baseline": "1.19.3", + "port-version": 0 + }, "xorstr": { "baseline": "2021-10-23", "port-version": 0 @@ -7568,12 +7940,16 @@ "baseline": "0.8.1", "port-version": 1 }, + "xproto": { + "baseline": "2021.5", + "port-version": 0 + }, "xqilla": { "baseline": "2.3.4", "port-version": 1 }, "xsimd": { - "baseline": "8.0.3", + "baseline": "8.1.0", "port-version": 0 }, "xtensor": { @@ -7581,8 +7957,8 @@ "port-version": 0 }, "xtensor-blas": { - "baseline": "0.17.2", - "port-version": 2 + "baseline": "0.20.0", + "port-version": 0 }, "xtensor-fftw": { "baseline": "2019-11-30", @@ -7596,6 +7972,10 @@ "baseline": "0.7.2", "port-version": 0 }, + "xtrans": { + "baseline": "1.4.0", + "port-version": 0 + }, "xxhash": { "baseline": "0.8.1", "port-version": 1 @@ -7609,7 +7989,7 @@ "port-version": 1 }, "yara": { - "baseline": "4.2.0", + "baseline": "4.2.3", "port-version": 0 }, "yas": { @@ -7618,7 +7998,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 3 + "port-version": 5 }, "yasm-tool": { "baseline": "2021-12-14", @@ -7634,27 +8014,35 @@ }, "yoga": { "baseline": "1.19.0", - "port-version": 0 + "port-version": 1 }, "yomm2": { "baseline": "1.1.2", "port-version": 0 }, "yyjson": { - "baseline": "0.3.0", + "baseline": "0.5.1", "port-version": 0 }, "z3": { - "baseline": "4.8.14", + "baseline": "4.11.0", + "port-version": 0 + }, + "z4kn4fein-semver": { + "baseline": "0.2.1", "port-version": 0 }, "z85": { "baseline": "1.0", "port-version": 1 }, + "zeroc-ice": { + "baseline": "3.7.7", + "port-version": 2 + }, "zeromq": { "baseline": "4.3.4", - "port-version": 5 + "port-version": 6 }, "zfp": { "baseline": "0.5.5", @@ -7666,27 +8054,27 @@ }, "zlib": { "baseline": "1.2.12", - "port-version": 0 + "port-version": 2 }, "zlib-ng": { - "baseline": "2.0.5", - "port-version": 0 + "baseline": "2.0.6", + "port-version": 1 }, "zookeeper": { - "baseline": "3.5.5", - "port-version": 2 + "baseline": "3.5.6", + "port-version": 0 }, "zopfli": { "baseline": "1.0.3", - "port-version": 1 + "port-version": 2 }, "zpp-bits": { - "baseline": "4.3.3", + "baseline": "4.4.4", "port-version": 0 }, "zserge-webview": { - "baseline": "2019-04-27", - "port-version": 3 + "baseline": "2022-09-07", + "port-version": 0 }, "zstd": { "baseline": "1.5.2", @@ -7702,7 +8090,7 @@ }, "zug": { "baseline": "2021-04-23", - "port-version": 0 + "port-version": 1 }, "zydis": { "baseline": "3.2.1", @@ -7714,7 +8102,7 @@ }, "zziplib": { "baseline": "0.13.72", - "port-version": 0 + "port-version": 1 } } } diff --git a/external_imported/vcpkg/versions/c-/c-ares.json b/external_imported/vcpkg/versions/c-/c-ares.json index 85b6c17c0..e6098a33b 100644 --- a/external_imported/vcpkg/versions/c-/c-ares.json +++ b/external_imported/vcpkg/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15542c1c419b7874a8d3229cdf6366361e376a57", + "version-semver": "1.18.1", + "port-version": 1 + }, { "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99", "version-semver": "1.18.1", diff --git a/external_imported/vcpkg/versions/c-/c4core.json b/external_imported/vcpkg/versions/c-/c4core.json index 4fcef7c1d..ee68963c6 100644 --- a/external_imported/vcpkg/versions/c-/c4core.json +++ b/external_imported/vcpkg/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db4217bd25647d340de3233e8f2fd59d250e16d8", + "version": "0.1.9", + "port-version": 0 + }, { "git-tree": "c1ef064ec4033e2fca5504b4eb44338453050f7f", "version-date": "2021-07-18", diff --git a/external_imported/vcpkg/versions/c-/c89stringutils.json b/external_imported/vcpkg/versions/c-/c89stringutils.json index 7d7aa3a41..826d84dec 100644 --- a/external_imported/vcpkg/versions/c-/c89stringutils.json +++ b/external_imported/vcpkg/versions/c-/c89stringutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c282e10d69a020f581a2bd7b8d8ead1e29d9a2", + "version": "0.0.1", + "port-version": 1 + }, { "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", "version": "0.0.1", diff --git a/external_imported/vcpkg/versions/c-/c9y.json b/external_imported/vcpkg/versions/c-/c9y.json new file mode 100644 index 000000000..5a4f3d990 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/c9y.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "7664032e69d86b58605c20e353af75d9961d10d8", + "version-semver": "0.4.0", + "port-version": 0 + }, + { + "git-tree": "5964f7fa10d83aa2d1a01ec7c64bd9b64f25f6a6", + "version-semver": "0.3.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/caf.json b/external_imported/vcpkg/versions/c-/caf.json index 7e81e9e8f..b2ef7f0a4 100644 --- a/external_imported/vcpkg/versions/c-/caf.json +++ b/external_imported/vcpkg/versions/c-/caf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1", + "version": "0.18.6", + "port-version": 1 + }, + { + "git-tree": "be83968f892180d5ee2f1943cf9cac3782e9111e", + "version": "0.18.6", + "port-version": 0 + }, { "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237", "version": "0.18.5", diff --git a/external_imported/vcpkg/versions/c-/caffe2.json b/external_imported/vcpkg/versions/c-/caffe2.json index 67fc8fea4..56847dd9e 100644 --- a/external_imported/vcpkg/versions/c-/caffe2.json +++ b/external_imported/vcpkg/versions/c-/caffe2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f1ccbf682aad8aacd3d74e8880becad6eb8d91", + "version": "0.8.1", + "port-version": 7 + }, { "git-tree": "ca32eb4601a1c35daa69e526f0af30efeb599c8c", "version": "0.8.1", diff --git a/external_imported/vcpkg/versions/c-/cairo.json b/external_imported/vcpkg/versions/c-/cairo.json index bedb50249..0e83f32c8 100644 --- a/external_imported/vcpkg/versions/c-/cairo.json +++ b/external_imported/vcpkg/versions/c-/cairo.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "eac156360b2a89a655152bafd92c3e285adc473e", + "version": "1.17.6", + "port-version": 4 + }, + { + "git-tree": "c339d543f41d311c7d4282ca1efa4e400eb30b73", + "version": "1.17.6", + "port-version": 3 + }, + { + "git-tree": "63bc79e8f9980f2b780bb296d96bfc3221dba137", + "version": "1.17.6", + "port-version": 2 + }, { "git-tree": "f43fb974219928aea5f95efc7c61f27b49051a28", "version": "1.17.6", diff --git a/external_imported/vcpkg/versions/c-/camport3.json b/external_imported/vcpkg/versions/c-/camport3.json index 3ad3ae220..09375b26a 100644 --- a/external_imported/vcpkg/versions/c-/camport3.json +++ b/external_imported/vcpkg/versions/c-/camport3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8fd1afea0703ffb17838422fd2aef895ab8c828", + "version": "1.6.2", + "port-version": 0 + }, { "git-tree": "ed31882bd5119a95ef69ba8323e0f4575ee5dc6d", "version-string": "1.5.3", diff --git a/external_imported/vcpkg/versions/c-/capnproto.json b/external_imported/vcpkg/versions/c-/capnproto.json index 7916de0c0..e92b4d311 100644 --- a/external_imported/vcpkg/versions/c-/capnproto.json +++ b/external_imported/vcpkg/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39b6753b801bbb3981ed2622a92c9b1642e11fde", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "17b054432f141c746019130d2b689d4fd4919938", "version": "0.9.1", diff --git a/external_imported/vcpkg/versions/c-/capstone.json b/external_imported/vcpkg/versions/c-/capstone.json index 008cc376f..acdfcd871 100644 --- a/external_imported/vcpkg/versions/c-/capstone.json +++ b/external_imported/vcpkg/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f31ba3baba34c74dea464d864cca666c8793b1e7", + "version": "5.0.0-rc2", + "port-version": 1 + }, { "git-tree": "f7b26d8f672f30156cad79a647525b8dd8c9781b", "version": "5.0.0-rc2", diff --git a/external_imported/vcpkg/versions/c-/catch2.json b/external_imported/vcpkg/versions/c-/catch2.json index 27944f37d..2128ee1aa 100644 --- a/external_imported/vcpkg/versions/c-/catch2.json +++ b/external_imported/vcpkg/versions/c-/catch2.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "414a5ef901a6f05c85b4f19ff2d0d216933a65b1", + "version-semver": "3.1.0", + "port-version": 0 + }, + { + "git-tree": "1c528318ebe10c945563bf9942c8b2141253bf87", + "version-semver": "3.0.1", + "port-version": 2 + }, + { + "git-tree": "8de83e7d7f07a831293d15e747aa7a980a220ff7", + "version-semver": "3.0.1", + "port-version": 1 + }, + { + "git-tree": "c0c872e7175f3ca20a15f5c8cc0d0c23e59e1ad1", + "version-semver": "3.0.1", + "port-version": 0 + }, + { + "git-tree": "ed81e9ef2d6ef2020605ec6ba1092a2ab631305a", + "version-semver": "2.13.9", + "port-version": 1 + }, + { + "git-tree": "6cc0b5f2cef9c98ad5c3152ebfbe85f1b9baceed", + "version-semver": "2.13.9", + "port-version": 0 + }, { "git-tree": "c243585b5ba220e6aebcdb59dc59867afff7af6e", "version-semver": "2.13.8", diff --git a/external_imported/vcpkg/versions/c-/ccd.json b/external_imported/vcpkg/versions/c-/ccd.json index 9e383a9c1..a0ded1891 100644 --- a/external_imported/vcpkg/versions/c-/ccd.json +++ b/external_imported/vcpkg/versions/c-/ccd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6cd46396151b69680100934c824c290c7057379", + "version": "2.1", + "port-version": 4 + }, { "git-tree": "8e6fc55567d05873ba6f78c3c33363a0fd9a1549", "version-string": "2.1-4", diff --git a/external_imported/vcpkg/versions/c-/ccfits.json b/external_imported/vcpkg/versions/c-/ccfits.json index 7bf0a662a..466b8ade8 100644 --- a/external_imported/vcpkg/versions/c-/ccfits.json +++ b/external_imported/vcpkg/versions/c-/ccfits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659ca5a77df9383a31166079a5f08ce70400d4ab", + "version": "2.5", + "port-version": 9 + }, { "git-tree": "ebcb81196a7e63b3b7c4b78f67ebc4e5f20c97c3", "version": "2.5", diff --git a/external_imported/vcpkg/versions/c-/cctag.json b/external_imported/vcpkg/versions/c-/cctag.json index fd2de346b..90bb7c0bf 100644 --- a/external_imported/vcpkg/versions/c-/cctag.json +++ b/external_imported/vcpkg/versions/c-/cctag.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e9166dee873ce930a3c5e12b544dc47583343221", + "version-semver": "1.0.2", + "port-version": 2 + }, + { + "git-tree": "979f28c0cc646b1a4c057ee810772a6b8964b65a", + "version-semver": "1.0.2", + "port-version": 1 + }, + { + "git-tree": "41cef2a0749658a793585a55c57cb701e0845427", + "version-semver": "1.0.2", + "port-version": 0 + }, { "git-tree": "ffcc7bde96142c2bc54827e3a2280accc592452e", "version-semver": "1.0.1", diff --git a/external_imported/vcpkg/versions/c-/celero.json b/external_imported/vcpkg/versions/c-/celero.json index ccc9cac51..11097e0de 100644 --- a/external_imported/vcpkg/versions/c-/celero.json +++ b/external_imported/vcpkg/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9beee7ba313a9770888b114a8146bc1a983577e", + "version": "2.8.3", + "port-version": 0 + }, { "git-tree": "58fca5af8a14714f953c3d8a4653e90ac8d11e2f", "version-string": "2.8.2", diff --git a/external_imported/vcpkg/versions/c-/cereal.json b/external_imported/vcpkg/versions/c-/cereal.json index 46847d295..9ceeed2dd 100644 --- a/external_imported/vcpkg/versions/c-/cereal.json +++ b/external_imported/vcpkg/versions/c-/cereal.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "075869fcf5302c6dd11d564286d0dfa1d2d4d7a1", + "version": "1.3.2", + "port-version": 1 + }, + { + "git-tree": "fdaabbb005403148dd7e53f5158199f6b1b297f2", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "e292069bec2c118568ea23a3db965037a9e38790", "version": "1.3.1", diff --git a/external_imported/vcpkg/versions/c-/ceres.json b/external_imported/vcpkg/versions/c-/ceres.json index 30107ef84..ded354d85 100644 --- a/external_imported/vcpkg/versions/c-/ceres.json +++ b/external_imported/vcpkg/versions/c-/ceres.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4baf16216d2d50574964ba5795a501bb89193042", + "version": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1", + "version": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "d3ebf81bee31323b13ad3353b6dbf9944b03abe3", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "af54888fc010404793ba51c862147575c09a988b", "version-semver": "2.0.0", diff --git a/external_imported/vcpkg/versions/c-/cgal.json b/external_imported/vcpkg/versions/c-/cgal.json index 13b6b7272..1a3e4c311 100644 --- a/external_imported/vcpkg/versions/c-/cgal.json +++ b/external_imported/vcpkg/versions/c-/cgal.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "2ef909832bf3d0f379a471e143e8eb5c9aa938cd", + "version": "5.5", + "port-version": 1 + }, + { + "git-tree": "7cbf69841400a6d51bc3db55b35524a22efcafd1", + "version": "5.5", + "port-version": 0 + }, + { + "git-tree": "848c2d53e283533691f59e2d7faee6ffd9bbe2f2", + "version": "5.4.2", + "port-version": 0 + }, + { + "git-tree": "de8aef00f45ff890d5b4ce4aae56afbc559a5fea", + "version": "5.4.1", + "port-version": 1 + }, + { + "git-tree": "898c2a987fc0104e3c8ba17afde418672e3b0019", + "version": "5.4.1", + "port-version": 0 + }, + { + "git-tree": "9b768fd944908a816ec83a1ff7cb37249aea808e", + "version": "5.4", + "port-version": 1 + }, { "git-tree": "0acdd574cd028b7ca4acd762f01938492c6d4719", "version": "5.4", diff --git a/external_imported/vcpkg/versions/c-/cgltf.json b/external_imported/vcpkg/versions/c-/cgltf.json index 2e9f77ff6..35f699a5e 100644 --- a/external_imported/vcpkg/versions/c-/cgltf.json +++ b/external_imported/vcpkg/versions/c-/cgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2baab070728dce2d5193a80e1deb7c41caa041f1", + "version": "1.13", + "port-version": 0 + }, { "git-tree": "2b793ed9e4345b733ec3897b1fbed4e152b5fc4a", "version": "1.11", diff --git a/external_imported/vcpkg/versions/c-/cgns.json b/external_imported/vcpkg/versions/c-/cgns.json index bc33d2bd9..0542c3bed 100644 --- a/external_imported/vcpkg/versions/c-/cgns.json +++ b/external_imported/vcpkg/versions/c-/cgns.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1733a3011caebf67ccbe1d48ea08c92e87d186e0", + "version-semver": "4.3.0", + "port-version": 1 + }, + { + "git-tree": "0d2c412303ae38864d8ff36777cc22bfc404b9b6", + "version-semver": "4.3.0", + "port-version": 0 + }, { "git-tree": "9d33908ce58fbfa6e823c937716e57d84d1cb2a5", "version-semver": "4.2.0", diff --git a/external_imported/vcpkg/versions/c-/chartdir.json b/external_imported/vcpkg/versions/c-/chartdir.json index e2b949dd9..d55116f14 100644 --- a/external_imported/vcpkg/versions/c-/chartdir.json +++ b/external_imported/vcpkg/versions/c-/chartdir.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "004cfa7f9fabe534a808428ba7b6c6e3844153b9", + "version": "7.0.0", + "port-version": 5 + }, + { + "git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f", + "version": "7.0.0", + "port-version": 4 + }, { "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162", "version": "7.0.0", diff --git a/external_imported/vcpkg/versions/c-/check.json b/external_imported/vcpkg/versions/c-/check.json index c8884ded5..d66579d74 100644 --- a/external_imported/vcpkg/versions/c-/check.json +++ b/external_imported/vcpkg/versions/c-/check.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", + "version": "0.15.2", + "port-version": 4 + }, + { + "git-tree": "f9804577939493b7f7934d98adc953624e0020c4", + "version": "0.15.2", + "port-version": 3 + }, { "git-tree": "f88273666d201fd843e12ba5d98d4ed8a10bd576", "version-string": "0.15.2", diff --git a/external_imported/vcpkg/versions/c-/chromium-base.json b/external_imported/vcpkg/versions/c-/chromium-base.json index 74ed18962..c539ab612 100644 --- a/external_imported/vcpkg/versions/c-/chromium-base.json +++ b/external_imported/vcpkg/versions/c-/chromium-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dbf253ab140a0d754230e2cffa7b4f94686a9e9", + "version": "86.0.4199.1", + "port-version": 4 + }, { "git-tree": "36e6dbafdea0e90a8717907171efa375d2580d8b", "version-string": "86.0.4199.1", diff --git a/external_imported/vcpkg/versions/c-/civetweb.json b/external_imported/vcpkg/versions/c-/civetweb.json index d3c124855..07285a0c4 100644 --- a/external_imported/vcpkg/versions/c-/civetweb.json +++ b/external_imported/vcpkg/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c4ed510288187d465737a301891b1101d6c373", + "version": "1.15", + "port-version": 2 + }, { "git-tree": "0e09fcaf964728e71394be1fc43d018fcde2e355", "version": "1.15", diff --git a/external_imported/vcpkg/versions/c-/cjson.json b/external_imported/vcpkg/versions/c-/cjson.json index d8f68b8d1..f2f67dd1a 100644 --- a/external_imported/vcpkg/versions/c-/cjson.json +++ b/external_imported/vcpkg/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "025e76be26389108c3e0cf79e5ed1ea589c7b90e", + "version": "1.7.15", + "port-version": 2 + }, { "git-tree": "cb79fc0bdbc6754cf6c267d97e2825655929351b", "version": "1.7.15", diff --git a/external_imported/vcpkg/versions/c-/clfft.json b/external_imported/vcpkg/versions/c-/clfft.json index d1c9665e0..33be21690 100644 --- a/external_imported/vcpkg/versions/c-/clfft.json +++ b/external_imported/vcpkg/versions/c-/clfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04", + "version": "2.12.2", + "port-version": 5 + }, { "git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4", "version": "2.12.2", diff --git a/external_imported/vcpkg/versions/c-/cli.json b/external_imported/vcpkg/versions/c-/cli.json index 4da89892f..3e0b9f990 100644 --- a/external_imported/vcpkg/versions/c-/cli.json +++ b/external_imported/vcpkg/versions/c-/cli.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "72fd89f268dc5d3318561366f54ee6aed341669f", + "version": "2.0.2", + "port-version": 0 + }, + { + "git-tree": "25a075116903bfd73e5a1e4f63638955c1a52732", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "2c5da108b7e41bd3da82fe9b670a308d664b3a0e", "version-semver": "2.0.0", diff --git a/external_imported/vcpkg/versions/c-/cli11.json b/external_imported/vcpkg/versions/c-/cli11.json index 37e4f6597..43e9aaac1 100644 --- a/external_imported/vcpkg/versions/c-/cli11.json +++ b/external_imported/vcpkg/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25d9ba9e7e80ff980fef1b9bf369d51f5b1cfc59", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "a2fa0d3108042d872a50565d15c79d5611bdf0b6", "version": "2.1.2", diff --git a/external_imported/vcpkg/versions/c-/clipboardxx.json b/external_imported/vcpkg/versions/c-/clipboardxx.json new file mode 100644 index 000000000..56ebcd2ea --- /dev/null +++ b/external_imported/vcpkg/versions/c-/clipboardxx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "081dccf5f7ac08990ef5814f6e2b99d1c2d9a385", + "version-date": "2022-02-04", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/cmakerc.json b/external_imported/vcpkg/versions/c-/cmakerc.json new file mode 100644 index 000000000..fc2a9fb61 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cmakerc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "740fd9bb83e79eba29ccd69546d2b3105d719d5d", + "version-date": "2021-08-27", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/cnats.json b/external_imported/vcpkg/versions/c-/cnats.json index 60faf07f0..d3693cfa0 100644 --- a/external_imported/vcpkg/versions/c-/cnats.json +++ b/external_imported/vcpkg/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4045ec63d36d672939a5bd17e2733acaf759a14", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "ab962ebd7a13f87db7aea528cd4d5725b4fde292", "version": "3.2.0", diff --git a/external_imported/vcpkg/versions/c-/cocoyaxi.json b/external_imported/vcpkg/versions/c-/cocoyaxi.json index 55eaafec0..9239da721 100644 --- a/external_imported/vcpkg/versions/c-/cocoyaxi.json +++ b/external_imported/vcpkg/versions/c-/cocoyaxi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a71b5c50ae0dfa1791b446e7af707cdb080f36d5", + "version-semver": "2.0.3", + "port-version": 3 + }, { "git-tree": "991d1f948e96ec46e60f5d6925a825d63599eb44", "version-semver": "2.0.3", diff --git a/external_imported/vcpkg/versions/c-/color-console.json b/external_imported/vcpkg/versions/c-/color-console.json index 7aab6764a..cbeded048 100644 --- a/external_imported/vcpkg/versions/c-/color-console.json +++ b/external_imported/vcpkg/versions/c-/color-console.json @@ -4,11 +4,6 @@ "git-tree": "bdd7720df549670e50ef636219b7d093f7cc8bc6", "version-date": "2022-03-20", "port-version": 0 - }, - { - "git-tree": "9a371b999eb2e8c7d72d50267fbcad9c9b3967b1", - "version-semver": "1.0.0", - "port-version": 0 } ] } diff --git a/external_imported/vcpkg/versions/c-/comms-ublox.json b/external_imported/vcpkg/versions/c-/comms-ublox.json index bde81cf2d..804defc12 100644 --- a/external_imported/vcpkg/versions/c-/comms-ublox.json +++ b/external_imported/vcpkg/versions/c-/comms-ublox.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a129592b8ecf08fed15abaeab8b8c229ef16d045", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a", "version-semver": "0.20.2", diff --git a/external_imported/vcpkg/versions/c-/comms.json b/external_imported/vcpkg/versions/c-/comms.json index 358460579..17b694220 100644 --- a/external_imported/vcpkg/versions/c-/comms.json +++ b/external_imported/vcpkg/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a9bdbc7d61f9494ad2853f702a19699dae74a70", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466", "version-semver": "3.4.0", diff --git a/external_imported/vcpkg/versions/c-/commsdsl.json b/external_imported/vcpkg/versions/c-/commsdsl.json index 44b2e2593..966f37169 100644 --- a/external_imported/vcpkg/versions/c-/commsdsl.json +++ b/external_imported/vcpkg/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a363dfeed76ba38fa1d1b3007b06223c347e0063", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced", "version-semver": "3.6.4", diff --git a/external_imported/vcpkg/versions/c-/concurrencpp.json b/external_imported/vcpkg/versions/c-/concurrencpp.json index 9f314987f..a940f9f9e 100644 --- a/external_imported/vcpkg/versions/c-/concurrencpp.json +++ b/external_imported/vcpkg/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecae9e070ec807384d676e49c413118174487f6a", + "version": "0.1.4", + "port-version": 1 + }, { "git-tree": "180b2c3ae47ddd4832fd3d6f8359728a6eda1094", "version": "0.1.4", diff --git a/external_imported/vcpkg/versions/c-/configcat.json b/external_imported/vcpkg/versions/c-/configcat.json new file mode 100644 index 000000000..3c86cf258 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/configcat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d163eba9cf1e8cdc7585806666d8f83330c50678", + "version": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/console-bridge.json b/external_imported/vcpkg/versions/c-/console-bridge.json index ff15871ce..92630d691 100644 --- a/external_imported/vcpkg/versions/c-/console-bridge.json +++ b/external_imported/vcpkg/versions/c-/console-bridge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5f1141775543ea0491358a281840ce2bcc100be", + "version-semver": "1.0.2", + "port-version": 0 + }, { "git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c", "version-string": "1.0.1", diff --git a/external_imported/vcpkg/versions/c-/constexpr.json b/external_imported/vcpkg/versions/c-/constexpr.json index 09ba13ef2..d5b38750f 100644 --- a/external_imported/vcpkg/versions/c-/constexpr.json +++ b/external_imported/vcpkg/versions/c-/constexpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d2008ccf999119285610e0a76ed0c46c59632b", + "version": "1.0", + "port-version": 3 + }, { "git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704", "version-string": "1.0", diff --git a/external_imported/vcpkg/versions/c-/convectionkernels.json b/external_imported/vcpkg/versions/c-/convectionkernels.json new file mode 100644 index 000000000..3595b1b80 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/convectionkernels.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cf21fe054d62c4602edd8566bb5d2f92b1bc1734", + "version-date": "2022-06-08", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/corrade.json b/external_imported/vcpkg/versions/c-/corrade.json index 6a1a88a1a..f32bd03b9 100644 --- a/external_imported/vcpkg/versions/c-/corrade.json +++ b/external_imported/vcpkg/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ad9b127c41c0538051a0c81e2cb9206a2587dd", + "version-string": "2020.06", + "port-version": 4 + }, { "git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87", "version-string": "2020.06", diff --git a/external_imported/vcpkg/versions/c-/cpp-httplib.json b/external_imported/vcpkg/versions/c-/cpp-httplib.json index 3f00794b6..cd1162b97 100644 --- a/external_imported/vcpkg/versions/c-/cpp-httplib.json +++ b/external_imported/vcpkg/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48c366ec15c570dbd1968b288649d2c33ce6ca08", + "version": "0.10.7", + "port-version": 0 + }, { "git-tree": "55de9c78120ee08fc96d9a6badab8e1d137ab36a", "version": "0.10.3", diff --git a/external_imported/vcpkg/versions/c-/cpp-ipc.json b/external_imported/vcpkg/versions/c-/cpp-ipc.json index edac286d3..53f75c34f 100644 --- a/external_imported/vcpkg/versions/c-/cpp-ipc.json +++ b/external_imported/vcpkg/versions/c-/cpp-ipc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e86c1547d0be3d2acbe7cebdb799f24359c29e85", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "86a57c4fce501c6a9bcde5728ea6787b7425176a", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/c-/cpp-peglib.json b/external_imported/vcpkg/versions/c-/cpp-peglib.json index a88f89b8a..9d631ff42 100644 --- a/external_imported/vcpkg/versions/c-/cpp-peglib.json +++ b/external_imported/vcpkg/versions/c-/cpp-peglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "883e76f3473565fdd800411dfa980eae2e19a131", + "version": "1.3.10", + "port-version": 0 + }, { "git-tree": "4c276ee41b27be78ffa392f24e371e9893b43c93", "version-string": "0.1.0", diff --git a/external_imported/vcpkg/versions/c-/cppcms.json b/external_imported/vcpkg/versions/c-/cppcms.json index b476ab542..ca34ce025 100644 --- a/external_imported/vcpkg/versions/c-/cppcms.json +++ b/external_imported/vcpkg/versions/c-/cppcms.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e2fff22eecee1fc50eee291ea49bed2717704031", + "version": "1.2.1", + "port-version": 6 + }, + { + "git-tree": "33ff6dbb307c2baceec0a21f05e098c0d15a8f88", + "version": "1.2.1", + "port-version": 5 + }, { "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", "version-string": "1.2.1", diff --git a/external_imported/vcpkg/versions/c-/cppcodec.json b/external_imported/vcpkg/versions/c-/cppcodec.json index bfdbbaccc..196cd3b0f 100644 --- a/external_imported/vcpkg/versions/c-/cppcodec.json +++ b/external_imported/vcpkg/versions/c-/cppcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2b218c7d3aef05b777ea2537d59b6d1aa2bbf4e", + "version": "0.2", + "port-version": 3 + }, { "git-tree": "cb6b230ec592ba7bc54d85013007f501971f03fa", "version-string": "0.2", diff --git a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json index fff667860..4d56a8c7e 100644 --- a/external_imported/vcpkg/versions/c-/cppgraphqlgen.json +++ b/external_imported/vcpkg/versions/c-/cppgraphqlgen.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "301c3f2b22160ddfc752b69253cc3745ef4320f8", + "version": "4.5.0", + "port-version": 0 + }, + { + "git-tree": "52eaf92f61791cfb08e2a8848ccbf1c02748f064", + "version": "4.4.1", + "port-version": 0 + }, + { + "git-tree": "7c3acfd5254a4ae0680cc3f96eef630bcaab7b36", + "version": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "c8d2246a2df1d89e380901d0027220ca7a91531d", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "95b14163e5e6caf3ae1795167c8ea9503c7a8153", "version-semver": "4.1.1", diff --git a/external_imported/vcpkg/versions/c-/cpprestsdk.json b/external_imported/vcpkg/versions/c-/cpprestsdk.json index 5372196d4..1cc399353 100644 --- a/external_imported/vcpkg/versions/c-/cpprestsdk.json +++ b/external_imported/vcpkg/versions/c-/cpprestsdk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e1fb46f5d043e3a354bfbc6f77df5df3b321f74b", + "version": "2.10.18", + "port-version": 2 + }, + { + "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", + "version": "2.10.18", + "port-version": 1 + }, { "git-tree": "a4c5e50b9a83b6f9142256d1142b371da93db065", "version-string": "2.10.18", diff --git a/external_imported/vcpkg/versions/c-/cppwinrt.json b/external_imported/vcpkg/versions/c-/cppwinrt.json index da64d4824..bdff431eb 100644 --- a/external_imported/vcpkg/versions/c-/cppwinrt.json +++ b/external_imported/vcpkg/versions/c-/cppwinrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18d6860cc0a36639fe348d27ab4cb763dfc0e879", + "version": "2.0.220418.1", + "port-version": 0 + }, { "git-tree": "191643fbd9c127658cf1724216a3b393951bd68e", "version-string": "windows-sdk", diff --git a/external_imported/vcpkg/versions/c-/cpr.json b/external_imported/vcpkg/versions/c-/cpr.json index 823f87fb6..5d4792c1a 100644 --- a/external_imported/vcpkg/versions/c-/cpr.json +++ b/external_imported/vcpkg/versions/c-/cpr.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "43794d1334bdf904800cc65ef0982ad4fc33d1e4", + "version-semver": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "85bce5170656abc1bf594034c85f406d996776b1", + "version-semver": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "8ad107acca744655eb0b5aa05c5e6fc1c5516347", + "version-semver": "1.9.0", + "port-version": 0 + }, + { + "git-tree": "0699dd50434f04eeccbcd30ed9a3973c3143052b", + "version-semver": "1.8.3", + "port-version": 0 + }, { "git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7", "version-semver": "1.8.1", diff --git a/external_imported/vcpkg/versions/c-/cpu-features.json b/external_imported/vcpkg/versions/c-/cpu-features.json index 4a9fbc9fc..0268469c8 100644 --- a/external_imported/vcpkg/versions/c-/cpu-features.json +++ b/external_imported/vcpkg/versions/c-/cpu-features.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608368f9c6d85d0278ae92687024e8bd31aecbe4", + "version": "0.6.0", + "port-version": 2 + }, { "git-tree": "7df362e53cec246374da4f3d192bb1d4bb71b2b9", "version": "0.6.0", diff --git a/external_imported/vcpkg/versions/c-/cpuid.json b/external_imported/vcpkg/versions/c-/cpuid.json index 097f9d93f..358477a2e 100644 --- a/external_imported/vcpkg/versions/c-/cpuid.json +++ b/external_imported/vcpkg/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffa19cf0fffa902983c32201f6f7b9cd36222c23", + "version": "0.5.1", + "port-version": 4 + }, { "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8", "version": "0.5.1", diff --git a/external_imported/vcpkg/versions/c-/cpuinfo.json b/external_imported/vcpkg/versions/c-/cpuinfo.json index fef8a68d0..0215d34e3 100644 --- a/external_imported/vcpkg/versions/c-/cpuinfo.json +++ b/external_imported/vcpkg/versions/c-/cpuinfo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5ee1eff9fe6cfa584b697e71ce7081a69ef2c51d", + "version-date": "2022-07-19", + "port-version": 0 + }, + { + "git-tree": "11ac581a5c1307b2039cf9db3933c2aeffb7a923", + "version-date": "2022-04-02", + "port-version": 1 + }, { "git-tree": "69febccb10ae5b789dd6c5af2b85740617fc34f4", "version-date": "2022-04-02", diff --git a/external_imported/vcpkg/versions/c-/crashpad.json b/external_imported/vcpkg/versions/c-/crashpad.json index 6a57a6161..ac717ea89 100644 --- a/external_imported/vcpkg/versions/c-/crashpad.json +++ b/external_imported/vcpkg/versions/c-/crashpad.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "6d39be1cd402a6147c057802a84ffdc1715d6384", + "version-date": "2022-09-05", + "port-version": 0 + }, + { + "git-tree": "e1338388a039df55d6812726dd2e638684a19509", + "version-date": "2022-04-16", + "port-version": 3 + }, + { + "git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b", + "version-date": "2022-04-16", + "port-version": 2 + }, + { + "git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159", + "version-date": "2022-04-16", + "port-version": 1 + }, + { + "git-tree": "448abcac90e97d8b5ee03843775dd7fcba971979", + "version-date": "2022-04-16", + "port-version": 0 + }, { "git-tree": "88ee612aa949155b1e363bb710578811d3283033", "version-date": "2020-03-18", diff --git a/external_imported/vcpkg/versions/c-/crashrpt.json b/external_imported/vcpkg/versions/c-/crashrpt.json index 55c72bc51..7b198b0bc 100644 --- a/external_imported/vcpkg/versions/c-/crashrpt.json +++ b/external_imported/vcpkg/versions/c-/crashrpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb5e94d69da827d776c42545cdda4ca0e5565629", + "version": "1.4.3", + "port-version": 3 + }, { "git-tree": "896d96ee0613edabd92048142803845fa11baa68", "version": "1.4.3", diff --git a/external_imported/vcpkg/versions/c-/crc32c.json b/external_imported/vcpkg/versions/c-/crc32c.json index 3b1f56ad4..1b603575e 100644 --- a/external_imported/vcpkg/versions/c-/crc32c.json +++ b/external_imported/vcpkg/versions/c-/crc32c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9704ed68003973bdffcd5224f720b97c424d1fa5", + "version": "1.1.2", + "port-version": 1 + }, { "git-tree": "dcfaa85ef9b67b94cf51378922832fff7cf43333", "version": "1.1.2", diff --git a/external_imported/vcpkg/versions/c-/crfsuite.json b/external_imported/vcpkg/versions/c-/crfsuite.json index 045806899..f81e1ca2c 100644 --- a/external_imported/vcpkg/versions/c-/crfsuite.json +++ b/external_imported/vcpkg/versions/c-/crfsuite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f290a396def84e4a24ca49e29d17d7218b8e410", + "version-date": "2020-08-27", + "port-version": 0 + }, { "git-tree": "b74e8dd91be02cf5bbbd6f6387d66468fe579e8e", "version-date": "2019-07-21", diff --git a/external_imported/vcpkg/versions/c-/crow.json b/external_imported/vcpkg/versions/c-/crow.json index 703a78aca..4ba7ce8da 100644 --- a/external_imported/vcpkg/versions/c-/crow.json +++ b/external_imported/vcpkg/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9dab5ab4d56d0174fbf2c661e2fab60a1d4e95c", + "version": "1.0-5", + "port-version": 0 + }, { "git-tree": "e21a4fb8fd849bfe3ee8d77dbdb3a4953dd08d55", "version": "1.0-1", diff --git a/external_imported/vcpkg/versions/c-/cryptopp.json b/external_imported/vcpkg/versions/c-/cryptopp.json index 879c3d14c..1baa4cdc8 100644 --- a/external_imported/vcpkg/versions/c-/cryptopp.json +++ b/external_imported/vcpkg/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d23fcfb280c3508aabac1d7e0f83440dcb8627f", + "version": "8.6.0", + "port-version": 1 + }, { "git-tree": "0d47535ac1767600626347e025079450a909c6ba", "version": "8.6.0", diff --git a/external_imported/vcpkg/versions/c-/ctp.json b/external_imported/vcpkg/versions/c-/ctp.json index 3382ae094..90896c07c 100644 --- a/external_imported/vcpkg/versions/c-/ctp.json +++ b/external_imported/vcpkg/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11ff3d437cca5956d99f8690143f12a0ebd5e839", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 3 + }, { "git-tree": "7160f9a456cfd057dee1cb0a92f92a4f16876fe8", "version-string": "6.6.1_P1_20210406_se", diff --git a/external_imported/vcpkg/versions/c-/ctre.json b/external_imported/vcpkg/versions/c-/ctre.json index a5f5f9160..185d72384 100644 --- a/external_imported/vcpkg/versions/c-/ctre.json +++ b/external_imported/vcpkg/versions/c-/ctre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b8b42356b574541c92ad5509ced7b325361f8b8", + "version-semver": "3.6.0", + "port-version": 0 + }, { "git-tree": "fd57f6d1ec68aaa67e90f3382cce5668c5ecff5a", "version-semver": "3.4.1", diff --git a/external_imported/vcpkg/versions/c-/cubeb.json b/external_imported/vcpkg/versions/c-/cubeb.json new file mode 100644 index 000000000..1c096d127 --- /dev/null +++ b/external_imported/vcpkg/versions/c-/cubeb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7d7979530500923609dae0ce99dc4a63fea13056", + "version-date": "2022-07-22", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/c-/cuda.json b/external_imported/vcpkg/versions/c-/cuda.json index 878a0c33f..05fbc1296 100644 --- a/external_imported/vcpkg/versions/c-/cuda.json +++ b/external_imported/vcpkg/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d190177076c48287897d233ae2fa8c241f28f40", + "version": "10.1", + "port-version": 11 + }, { "git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c", "version": "10.1", @@ -20,11 +25,6 @@ "version-string": "10.1", "port-version": 7 }, - { - "git-tree": "cd48424964a6d19d032e14e84dbd41c5cdcb05ef", - "version-string": "10.1", - "port-version": 6 - }, { "git-tree": "0022275f9aa9e2d70f6a35d7e28fb27ab21fd13e", "version-string": "10.1", diff --git a/external_imported/vcpkg/versions/c-/cudnn.json b/external_imported/vcpkg/versions/c-/cudnn.json index 9fa8f53a3..1acfa99d4 100644 --- a/external_imported/vcpkg/versions/c-/cudnn.json +++ b/external_imported/vcpkg/versions/c-/cudnn.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b29eb71b5187d6f0991ede2a56e2fda57e6cb520", + "version": "7.6.5", + "port-version": 8 + }, + { + "git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588", + "version": "7.6.5", + "port-version": 7 + }, + { + "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653", + "version": "7.6.5", + "port-version": 6 + }, { "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e", "version": "7.6.5", diff --git a/external_imported/vcpkg/versions/c-/cunit.json b/external_imported/vcpkg/versions/c-/cunit.json index 7b15a6d37..454a2cb40 100644 --- a/external_imported/vcpkg/versions/c-/cunit.json +++ b/external_imported/vcpkg/versions/c-/cunit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c467d95806ab2016c73520e249b5d82645fda3c", + "version": "2.1.3", + "port-version": 8 + }, { "git-tree": "b108b8daeb1695db997a7ebc1b341e27d4d84ce7", "version-string": "2.1.3", diff --git a/external_imported/vcpkg/versions/c-/curl.json b/external_imported/vcpkg/versions/c-/curl.json index 8828352aa..b86c7f717 100644 --- a/external_imported/vcpkg/versions/c-/curl.json +++ b/external_imported/vcpkg/versions/c-/curl.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "588fa4742c417db9d7c0f89e652b618296388d1e", + "version": "7.84.0", + "port-version": 2 + }, + { + "git-tree": "4d64a4ac7f080159be045ccbf0a7fa81ef859cfa", + "version": "7.84.0", + "port-version": 1 + }, + { + "git-tree": "984e0a92df662f6022989c2b5889e7d9f1c133d5", + "version": "7.84.0", + "port-version": 0 + }, + { + "git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0", + "version": "7.83.1", + "port-version": 2 + }, + { + "git-tree": "69e1aaae731455f5ed18b7eea4da75ee10bd073a", + "version": "7.83.1", + "port-version": 1 + }, + { + "git-tree": "6f536c70dc927199fe430fde4e93f8d66d53b6f6", + "version": "7.83.1", + "port-version": 0 + }, + { + "git-tree": "d72a11c8c3990818ba5987cc1ceee799046de9be", + "version": "7.83.0", + "port-version": 0 + }, { "git-tree": "203696f71dd43fa55a1b1104570135bebf869819", "version": "7.82.0", diff --git a/external_imported/vcpkg/versions/c-/czmq.json b/external_imported/vcpkg/versions/c-/czmq.json index 45cace946..982b8f19e 100644 --- a/external_imported/vcpkg/versions/c-/czmq.json +++ b/external_imported/vcpkg/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd4ccb9b894541d10e393139468aaac97419b0f2", + "version-semver": "4.2.1", + "port-version": 1 + }, { "git-tree": "e05dc72cf3b616b1fd6629ea3dc20d08ed8d8055", "version-semver": "4.2.1", diff --git a/external_imported/vcpkg/versions/d-/darknet.json b/external_imported/vcpkg/versions/d-/darknet.json index 644996618..99920f74d 100644 --- a/external_imported/vcpkg/versions/d-/darknet.json +++ b/external_imported/vcpkg/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e4e40d483fe8ff2bade4fe1b10996cf71f3089b", + "version-date": "2022-03-06", + "port-version": 1 + }, { "git-tree": "b9b918e6e0af651d83b284cd0f423b6b49951aef", "version-date": "2022-03-06", diff --git a/external_imported/vcpkg/versions/d-/dartsim.json b/external_imported/vcpkg/versions/d-/dartsim.json index bea457455..478eef48b 100644 --- a/external_imported/vcpkg/versions/d-/dartsim.json +++ b/external_imported/vcpkg/versions/d-/dartsim.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "746ffa24744bf10e2ce9b04332c8dcde2222ba39", + "version": "6.12.2", + "port-version": 1 + }, + { + "git-tree": "887126d7800fe033a8e70bfa369e0b990434c921", + "version": "6.12.2", + "port-version": 0 + }, { "git-tree": "8b816d852610f6ef105eedc49bcbe6ae4881f759", "version": "6.11.0", diff --git a/external_imported/vcpkg/versions/d-/dav1d.json b/external_imported/vcpkg/versions/d-/dav1d.json index 064c5d579..50638d171 100644 --- a/external_imported/vcpkg/versions/d-/dav1d.json +++ b/external_imported/vcpkg/versions/d-/dav1d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "728ebed76cd4e2ed1d00fa0adeb04e3bd335ccb6", + "version": "1.0.0", + "port-version": 0 + }, + { + "git-tree": "0c06788e881e79f8c6a169f0f666baf2dc04faa6", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "d92dfe48dbd557d90d9c216bc5a5a4b9435939c1", "version-semver": "0.8.2", diff --git a/external_imported/vcpkg/versions/d-/daw-header-libraries.json b/external_imported/vcpkg/versions/d-/daw-header-libraries.json index 14d5e66af..b9b911686 100644 --- a/external_imported/vcpkg/versions/d-/daw-header-libraries.json +++ b/external_imported/vcpkg/versions/d-/daw-header-libraries.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c183461d315649b9c1fbbb8f2701767d68a38820", + "version": "2.68.1", + "port-version": 0 + }, + { + "git-tree": "14d1e3a6c6a143089ec1590f343144aa2c6790d9", + "version": "2.46.2", + "port-version": 0 + }, + { + "git-tree": "a57c2a8a8ba7fb8017df838e23547eb1933e26b9", + "version": "2.46.0", + "port-version": 0 + }, { "git-tree": "29ed87ad6aee595ac4a0972c09a1ddf34d13a857", "version-semver": "1.29.7", diff --git a/external_imported/vcpkg/versions/d-/daw-json-link.json b/external_imported/vcpkg/versions/d-/daw-json-link.json index fdf392f94..84775c81e 100644 --- a/external_imported/vcpkg/versions/d-/daw-json-link.json +++ b/external_imported/vcpkg/versions/d-/daw-json-link.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "512359aae4c09860c5ec50624d01ba0d0f21d2a2", + "version": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "8bcb9a264b390f98488474d1172379e2494f509b", + "version": "3.0.0", + "port-version": 0 + }, + { + "git-tree": "9020ee8ee80ac4543a61adb46a83b6b49f6562d4", + "version": "2.14.0", + "port-version": 0 + }, { "git-tree": "1c7cf1d126f7f7c1bb3759ff5bcf30c585b90d94", "version-semver": "2.10.2", diff --git a/external_imported/vcpkg/versions/d-/daw-utf-range.json b/external_imported/vcpkg/versions/d-/daw-utf-range.json index afebad6ee..d91448a9e 100644 --- a/external_imported/vcpkg/versions/d-/daw-utf-range.json +++ b/external_imported/vcpkg/versions/d-/daw-utf-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de67e1228f3effe508a68cf6080c6ba6e3343fb0", + "version": "2.2.2", + "port-version": 0 + }, { "git-tree": "aae578a84f804d65b63483335d1b74325906cb01", "version-semver": "2.2.0", diff --git a/external_imported/vcpkg/versions/d-/dbow3.json b/external_imported/vcpkg/versions/d-/dbow3.json index 12758d201..9747e1f56 100644 --- a/external_imported/vcpkg/versions/d-/dbow3.json +++ b/external_imported/vcpkg/versions/d-/dbow3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0942151a7555bcac51e84d94474111ca96ff5974", + "version": "1.0.0", + "port-version": 2 + }, { "git-tree": "d0cbeaf64e4827fa69b0c07f21c6d0d689305559", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/d-/dbus.json b/external_imported/vcpkg/versions/d-/dbus.json new file mode 100644 index 000000000..957653d5e --- /dev/null +++ b/external_imported/vcpkg/versions/d-/dbus.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "18e1551271c49540ec2170dcd0d770395717c7c3", + "version": "1.13.18", + "port-version": 1 + }, + { + "git-tree": "dc3215916b8e610dcf6c0777b5ae7a04ed78873b", + "version": "1.13.18", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/dcmtk.json b/external_imported/vcpkg/versions/d-/dcmtk.json index a75be2932..3a116fbda 100644 --- a/external_imported/vcpkg/versions/d-/dcmtk.json +++ b/external_imported/vcpkg/versions/d-/dcmtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "cbfc85b6b840eb68b947c8b9bd69988c938198d3", + "version": "3.6.7", + "port-version": 2 + }, + { + "git-tree": "c08360f31aa07d9514b52b3c98ca6c5ae6e17bb2", + "version": "3.6.7", + "port-version": 1 + }, + { + "git-tree": "df20e5c0215de121a9137a9047fabbde17bab8f7", + "version": "3.6.7", + "port-version": 0 + }, { "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", "version": "3.6.6", diff --git a/external_imported/vcpkg/versions/d-/detours.json b/external_imported/vcpkg/versions/d-/detours.json index b868ac038..4af109787 100644 --- a/external_imported/vcpkg/versions/d-/detours.json +++ b/external_imported/vcpkg/versions/d-/detours.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6a73bd010a9e693e683b647ce04855efca88f4d5", + "version": "4.0.1", + "port-version": 7 + }, + { + "git-tree": "7c418a44692bd9eb06163e66ea779dfd57b84e07", + "version": "4.0.1", + "port-version": 6 + }, { "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da", "version": "4.0.1", diff --git a/external_imported/vcpkg/versions/d-/devicenameresolver.json b/external_imported/vcpkg/versions/d-/devicenameresolver.json index fe2447d1b..3f28e102b 100644 --- a/external_imported/vcpkg/versions/d-/devicenameresolver.json +++ b/external_imported/vcpkg/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb4e35f532b95841344719e4ab90027a2796d5d4", + "version-date": "2016-06-26", + "port-version": 4 + }, { "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", "version-string": "2016-06-26-0850d88fa6", diff --git a/external_imported/vcpkg/versions/d-/directx-dxc.json b/external_imported/vcpkg/versions/d-/directx-dxc.json new file mode 100644 index 000000000..5af87edbb --- /dev/null +++ b/external_imported/vcpkg/versions/d-/directx-dxc.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "3a28201604813ea41d43456d40bdbea61af0db69", + "version-date": "2022-07-18", + "port-version": 0 + }, + { + "git-tree": "6f2dfd1c848d67e0f36d83b8a6e7078b96d82df1", + "version-date": "2021-12-08", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/directx-headers.json b/external_imported/vcpkg/versions/d-/directx-headers.json index 7f8bb1812..45be4d28e 100644 --- a/external_imported/vcpkg/versions/d-/directx-headers.json +++ b/external_imported/vcpkg/versions/d-/directx-headers.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "561f4b44e30ab8806b2983ebdabeaeeebabb48e0", + "version": "1.606.3", + "port-version": 0 + }, + { + "git-tree": "f6271f7dc1af5888b39b0443ff7ecc9d01f1db94", + "version": "1.602.0", + "port-version": 0 + }, { "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", "version": "1.4.9", diff --git a/external_imported/vcpkg/versions/d-/directxmath.json b/external_imported/vcpkg/versions/d-/directxmath.json index 0bd805c40..dff4c619a 100644 --- a/external_imported/vcpkg/versions/d-/directxmath.json +++ b/external_imported/vcpkg/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "383135431007008f6d04e2cfbe55988b06054f15", + "version-date": "2022-05-18", + "port-version": 0 + }, { "git-tree": "ebf69755284c5ea16a26b4dbfa4534af962c96a0", "version-date": "2022-01-18", diff --git a/external_imported/vcpkg/versions/d-/directxmesh.json b/external_imported/vcpkg/versions/d-/directxmesh.json index 6204eb5a3..43901d14b 100644 --- a/external_imported/vcpkg/versions/d-/directxmesh.json +++ b/external_imported/vcpkg/versions/d-/directxmesh.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8a526999086b61e5dc7c587245ae5982ec93c0e5", + "version-date": "2022-07-29", + "port-version": 0 + }, + { + "git-tree": "bf2c810ddbc4a551cb5fb561092bb6fe67ed986f", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "799bc935afc5a0b5d8d50037f28807512fc7c38e", "version-date": "2022-03-24", diff --git a/external_imported/vcpkg/versions/d-/directxsdk.json b/external_imported/vcpkg/versions/d-/directxsdk.json index 8beece35a..b2361108a 100644 --- a/external_imported/vcpkg/versions/d-/directxsdk.json +++ b/external_imported/vcpkg/versions/d-/directxsdk.json @@ -25,11 +25,6 @@ "version-string": "jun10", "port-version": 1 }, - { - "git-tree": "b3a7a8a22c780726a74fb673c31454ef83e9ea79", - "version-string": "jun10b", - "port-version": 0 - }, { "git-tree": "dc3241d51d057a92ef8db501c80a749a46ed4461", "version-string": "jun10", diff --git a/external_imported/vcpkg/versions/d-/directxtex.json b/external_imported/vcpkg/versions/d-/directxtex.json index a3b3dc8cd..1d9532070 100644 --- a/external_imported/vcpkg/versions/d-/directxtex.json +++ b/external_imported/vcpkg/versions/d-/directxtex.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b72dbe4138eac6fea28e42828e2fc2a7ed99259b", + "version-date": "2022-07-29", + "port-version": 1 + }, + { + "git-tree": "e383685c947595287b5fbc51436378981c248793", + "version-date": "2022-07-29", + "port-version": 0 + }, + { + "git-tree": "269e245ad8428d3a09059bc195bae935613478af", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "15870041c7dc7d9db536c8770c6334f96af9f92c", "version-date": "2022-03-24", diff --git a/external_imported/vcpkg/versions/d-/directxtk.json b/external_imported/vcpkg/versions/d-/directxtk.json index 12018a7aa..001515285 100644 --- a/external_imported/vcpkg/versions/d-/directxtk.json +++ b/external_imported/vcpkg/versions/d-/directxtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "88703e36f97fb7bb6ea188832dc8b114a32e5a3f", + "version-date": "2022-07-29", + "port-version": 0 + }, + { + "git-tree": "3cdf135528218c71f3aaf4f2ca69d7bc57b160a4", + "version-date": "2022-06-15", + "port-version": 0 + }, + { + "git-tree": "e8707f957389d4329f61d4af69a47766fea2d6b9", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "d6e54dc5cc77469ecc88f949b6c149cb01f5a335", "version-date": "2022-03-24", diff --git a/external_imported/vcpkg/versions/d-/directxtk12.json b/external_imported/vcpkg/versions/d-/directxtk12.json index 6f3eac0f7..22c8a5dac 100644 --- a/external_imported/vcpkg/versions/d-/directxtk12.json +++ b/external_imported/vcpkg/versions/d-/directxtk12.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "0c42e95e0d216b600b858046a75d0bc80c0cb410", + "version-date": "2022-07-29", + "port-version": 0 + }, + { + "git-tree": "406076922dc0aec8b45b0024e00b0718fd6eb65f", + "version-date": "2022-07-19", + "port-version": 0 + }, + { + "git-tree": "12033a288a049744a73de4d48c55210ba7201310", + "version-date": "2022-06-15", + "port-version": 0 + }, + { + "git-tree": "e513b241157a3eada954cdb4c2d353ed4dac27e3", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "c89638b81272f98ae99cfb782c1269ad7b1836a5", "version-date": "2022-03-24", diff --git a/external_imported/vcpkg/versions/d-/discordcoreapi.json b/external_imported/vcpkg/versions/d-/discordcoreapi.json index b895d0164..3e092b871 100644 --- a/external_imported/vcpkg/versions/d-/discordcoreapi.json +++ b/external_imported/vcpkg/versions/d-/discordcoreapi.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "0d2e0511274658095bc45584a95d7964017f0f9a", + "version-date": "2022-09-25", + "port-version": 0 + }, + { + "git-tree": "d3519d6dd1dc6918b16f9c9679c23a12ae673456", + "version-date": "2022-08-07", + "port-version": 0 + }, + { + "git-tree": "81b6a00219f65e2ccabcf1330b132f1c2fdbc361", + "version-date": "2022-07-05", + "port-version": 0 + }, + { + "git-tree": "3d2d47eba4f4f28696fbc652359684d4018fab53", + "version-date": "2022-06-18", + "port-version": 0 + }, + { + "git-tree": "c672bbd1eb0e22b11d0f3c20202a603c3a4634ed", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "dd790721f9b6d332bbcdae69e83a716720eedc1a", + "version-date": "2022-04-17", + "port-version": 0 + }, + { + "git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556", + "version-date": "2022-03-30", + "port-version": 1 + }, { "git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec", "version-date": "2022-03-30", diff --git a/external_imported/vcpkg/versions/d-/dlfcn-win32.json b/external_imported/vcpkg/versions/d-/dlfcn-win32.json index f3208fac6..b42354339 100644 --- a/external_imported/vcpkg/versions/d-/dlfcn-win32.json +++ b/external_imported/vcpkg/versions/d-/dlfcn-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eefd0e5c4b4d59e8bfb88842e9562115cb77d078", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "6ae0dd5fc5f29e2299690404410ce7129ec5c035", "version": "1.1.1", diff --git a/external_imported/vcpkg/versions/d-/dlib.json b/external_imported/vcpkg/versions/d-/dlib.json index a1af91a22..3ab172ef7 100644 --- a/external_imported/vcpkg/versions/d-/dlib.json +++ b/external_imported/vcpkg/versions/d-/dlib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "9eaa35254408c210c84c3bfebb8e8651bab075e0", + "version": "19.24", + "port-version": 2 + }, + { + "git-tree": "975dbde01f120a124488aae7930005b4b0409e58", + "version": "19.24", + "port-version": 1 + }, + { + "git-tree": "69c4335588e3785a09f580a40c128bf4d1bc5339", + "version": "19.24", + "port-version": 0 + }, { "git-tree": "825d6117ba43320dd5969535320b8be3144ea9de", "version": "19.23", diff --git a/external_imported/vcpkg/versions/d-/doctest.json b/external_imported/vcpkg/versions/d-/doctest.json index f2afaf04b..6049f6a60 100644 --- a/external_imported/vcpkg/versions/d-/doctest.json +++ b/external_imported/vcpkg/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f1ded501cbcf08445218ca0c5bee9df28188df9", + "version": "2.4.9", + "port-version": 0 + }, { "git-tree": "74d6364092a4086dd36a0d54a3d16e3cc24fe478", "version": "2.4.8", diff --git a/external_imported/vcpkg/versions/d-/dpdk.json b/external_imported/vcpkg/versions/d-/dpdk.json index 913bf2912..fee3adc60 100644 --- a/external_imported/vcpkg/versions/d-/dpdk.json +++ b/external_imported/vcpkg/versions/d-/dpdk.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "7a813d878c38c9649c599c5b9d35572399655fbf", + "version-string": "22.07", + "port-version": 1 + }, + { + "git-tree": "f09ca3077d7bc3f4ceaf558cdb9518ab94cbbe18", + "version-string": "22.07", + "port-version": 0 + }, + { + "git-tree": "b097f29e77f314135bad880b342548826bb99108", + "version-string": "22.03", + "port-version": 3 + }, + { + "git-tree": "f6b3f2c2e194013731669b4b6996026bd5611c15", + "version-string": "22.03", + "port-version": 2 + }, + { + "git-tree": "215be1cdd87b890d105bc8c5cb3e2e5d9a054038", + "version-string": "22.03", + "port-version": 1 + }, + { + "git-tree": "17a389722a444ba5834d74a86717b6ee963be519", + "version-string": "22.03", + "port-version": 0 + }, { "git-tree": "c259e16015f4cedca26e9fa3cb1aaafa3b3e4955", "version-string": "19.02", diff --git a/external_imported/vcpkg/versions/d-/dpp.json b/external_imported/vcpkg/versions/d-/dpp.json new file mode 100644 index 000000000..3cca2b75d --- /dev/null +++ b/external_imported/vcpkg/versions/d-/dpp.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "d0f56da8e2b3026a15bbf3856d1c601a635065e6", + "version": "10.0.19", + "port-version": 0 + }, + { + "git-tree": "7e80b88acd9bc75ce2b9bcaeae729f758ca2fcde", + "version": "10.0.18", + "port-version": 0 + }, + { + "git-tree": "aee1785670d15751e08e0fee3426faf2d8559ee9", + "version": "10.0.17", + "port-version": 0 + }, + { + "git-tree": "bf6a0accfbdf7a2a5f639ed5c32247e2a81b7b48", + "version": "10.0.16", + "port-version": 0 + }, + { + "git-tree": "fe4fafd238e318a6ddf7d5c4db59da499328fdae", + "version": "10.0.15", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/draco.json b/external_imported/vcpkg/versions/d-/draco.json index e3b1eb6d0..3c06f2460 100644 --- a/external_imported/vcpkg/versions/d-/draco.json +++ b/external_imported/vcpkg/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", "version": "1.4.3", diff --git a/external_imported/vcpkg/versions/d-/drlibs.json b/external_imported/vcpkg/versions/d-/drlibs.json index 79c361f3d..4862bb458 100644 --- a/external_imported/vcpkg/versions/d-/drlibs.json +++ b/external_imported/vcpkg/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b4bfd32103ed7afb27e12281caf95c81930c955", + "version-date": "2022-09-26", + "port-version": 0 + }, { "git-tree": "4fbb06000e3d4c3699920debbc828cc279362d91", "version-date": "2022-04-03", diff --git a/external_imported/vcpkg/versions/d-/drogon.json b/external_imported/vcpkg/versions/d-/drogon.json index 7e0e9d97f..fd90e6ffc 100644 --- a/external_imported/vcpkg/versions/d-/drogon.json +++ b/external_imported/vcpkg/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27ee8227ae9871ffc307380b209f9dbe04de8801", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba", "version-semver": "1.7.5", diff --git a/external_imported/vcpkg/versions/d-/dstorage.json b/external_imported/vcpkg/versions/d-/dstorage.json index cc27ca922..d2e8dfa9d 100644 --- a/external_imported/vcpkg/versions/d-/dstorage.json +++ b/external_imported/vcpkg/versions/d-/dstorage.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6672c5472d42f2ba2e3fe0a0e8acf3d00879c129", + "version": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/d-/duckx.json b/external_imported/vcpkg/versions/d-/duckx.json index fdd584ea7..40f642721 100644 --- a/external_imported/vcpkg/versions/d-/duckx.json +++ b/external_imported/vcpkg/versions/d-/duckx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bed3914236def15bab45f3969a169005a25d3f1d", + "version": "1.2.2", + "port-version": 1 + }, + { + "git-tree": "6637b59789032a1ef84a1c6324bc7b672e346152", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "2f862e06f527a656f8bbe1133a0ba212833f6951", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/d-/dv-processing.json b/external_imported/vcpkg/versions/d-/dv-processing.json new file mode 100644 index 000000000..ba576787a --- /dev/null +++ b/external_imported/vcpkg/versions/d-/dv-processing.json @@ -0,0 +1,29 @@ +{ + "versions": [ + { + "git-tree": "1d2e7b2c11eaa6b13ce5b08447411a885adc2036", + "version": "1.5.1", + "port-version": 1 + }, + { + "git-tree": "5fb27b7a8c1ee9bd01035958e7b3b3a487a89dd8", + "version": "1.5.1", + "port-version": 0 + }, + { + "git-tree": "e45cf567d2617df07999f47cff84636f513a0c1c", + "version": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "d46e8c68fbd834385ac3fa859b35e72cb5bc8648", + "version": "1.4.0", + "port-version": 1 + }, + { + "git-tree": "757cc58887fefa1c48349b91bfaab2e3947b65d9", + "version": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json index 81208748a..8da67907f 100644 --- a/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json +++ b/external_imported/vcpkg/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14db52bb5daba8ba8e0a93b0e41ffa676935923a", + "version": "9.29.952.8", + "port-version": 4 + }, { "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", "version": "9.29.952.8", diff --git a/external_imported/vcpkg/versions/d-/dxut.json b/external_imported/vcpkg/versions/d-/dxut.json index 3ce7912d8..1a3dc49f7 100644 --- a/external_imported/vcpkg/versions/d-/dxut.json +++ b/external_imported/vcpkg/versions/d-/dxut.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6b3dc36eb04da0286e4e2c5515a07cf7dbda4c03", + "version": "11.28", + "port-version": 0 + }, + { + "git-tree": "5b6c7ea3b64d6446296a16c7ad5f8ebdeb2e9915", + "version": "11.27", + "port-version": 0 + }, { "git-tree": "b8f2fd1c9674e75aee3d139934b3980a47b3d0eb", "version": "11.26", diff --git a/external_imported/vcpkg/versions/e-/eastl.json b/external_imported/vcpkg/versions/e-/eastl.json index a62180cf8..e851e47cf 100644 --- a/external_imported/vcpkg/versions/e-/eastl.json +++ b/external_imported/vcpkg/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e7b533fac097c3aa75f7b46630ea62f10980f87", + "version-string": "3.18.00", + "port-version": 3 + }, { "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", "version-string": "3.18.00", diff --git a/external_imported/vcpkg/versions/e-/edflib.json b/external_imported/vcpkg/versions/e-/edflib.json new file mode 100644 index 000000000..03caf49f1 --- /dev/null +++ b/external_imported/vcpkg/versions/e-/edflib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690", + "version": "1.21", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/e-/effects11.json b/external_imported/vcpkg/versions/e-/effects11.json index 8389d0744..5c465e3d6 100644 --- a/external_imported/vcpkg/versions/e-/effects11.json +++ b/external_imported/vcpkg/versions/e-/effects11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d625012c718899dec9245d795413c2e86b52906d", + "version": "11.28", + "port-version": 0 + }, + { + "git-tree": "8a08f12302be72c15cea701a71122e62f4b7df5a", + "version": "11.27", + "port-version": 0 + }, { "git-tree": "c2c6305e1ca4352d853c035f29d1d7daa3e47444", "version": "11.26", diff --git a/external_imported/vcpkg/versions/e-/effolkronium-random.json b/external_imported/vcpkg/versions/e-/effolkronium-random.json index c2d4671ae..fd709ffc2 100644 --- a/external_imported/vcpkg/versions/e-/effolkronium-random.json +++ b/external_imported/vcpkg/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ffd6600668e6304e7e60f9ef447855efc89a0a0", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "0083b3439b06f6c6e2b5fbd48260cd5b54692bad", "version": "1.4.0", diff --git a/external_imported/vcpkg/versions/e-/elfutils.json b/external_imported/vcpkg/versions/e-/elfutils.json index 2bd68e50f..9a3a75518 100644 --- a/external_imported/vcpkg/versions/e-/elfutils.json +++ b/external_imported/vcpkg/versions/e-/elfutils.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6f16a19e22e33e89ff809c74983035b93a50038e", + "version": "0.186", + "port-version": 4 + }, + { + "git-tree": "8f78ad2c6d0fe406f09a163e5fb74a9b000c815c", + "version": "0.186", + "port-version": 3 + }, { "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", "version": "0.186", diff --git a/external_imported/vcpkg/versions/e-/entt.json b/external_imported/vcpkg/versions/e-/entt.json index ab23301a9..5fce9683b 100644 --- a/external_imported/vcpkg/versions/e-/entt.json +++ b/external_imported/vcpkg/versions/e-/entt.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "ac258cd82d39f21b9a55ec179f02517f29802cdb", + "version": "3.10.1", + "port-version": 1 + }, + { + "git-tree": "f2c6e6ca727e3e843f0eb07544c81305175dc973", + "version": "3.10.1", + "port-version": 0 + }, + { + "git-tree": "965c440d8611528f1069a2a494f11da420110408", + "version": "3.10.0", + "port-version": 0 + }, + { + "git-tree": "a871a9d0c7187960052099119854369e854c3e50", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "74ad1980650c2f8ecb6369b8b981711f96f7bd08", "version": "3.9.0", diff --git a/external_imported/vcpkg/versions/e-/epsilon.json b/external_imported/vcpkg/versions/e-/epsilon.json index ab89b1e6a..39b536af2 100644 --- a/external_imported/vcpkg/versions/e-/epsilon.json +++ b/external_imported/vcpkg/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "800dbc074727df7eded3e5707b828be676bb5943", + "version": "0.9.2", + "port-version": 7 + }, { "git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90", "version-string": "0.9.2", diff --git a/external_imported/vcpkg/versions/e-/ereignis.json b/external_imported/vcpkg/versions/e-/ereignis.json new file mode 100644 index 000000000..f5ec1c4e6 --- /dev/null +++ b/external_imported/vcpkg/versions/e-/ereignis.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9fae65f1e52927feaf919019a722da7f20982e4c", + "version": "1.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/e-/eve.json b/external_imported/vcpkg/versions/e-/eve.json index 8b4b6b2b3..e26519b3e 100644 --- a/external_imported/vcpkg/versions/e-/eve.json +++ b/external_imported/vcpkg/versions/e-/eve.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3b6a47336d9cf0e99ea0dffc7c0c41bb04dfff5a", + "version-date": "2022-09-20", + "port-version": 0 + }, + { + "git-tree": "017b4485d7d6330770a47783a7e8f9fe7216c454", + "version-date": "2022-03-15", + "port-version": 0 + }, { "git-tree": "95251169868c628e8099f89d14671ef946fd918d", "version-date": "2021-10-16", diff --git a/external_imported/vcpkg/versions/e-/evpp.json b/external_imported/vcpkg/versions/e-/evpp.json index 7291e6311..5b08574da 100644 --- a/external_imported/vcpkg/versions/e-/evpp.json +++ b/external_imported/vcpkg/versions/e-/evpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "419e928841663bb077cd215aa89bd022d850640c", + "version": "0.7.0", + "port-version": 7 + }, + { + "git-tree": "7bcbd80099c9f1551101e9abc91ba7ad4849dd05", + "version": "0.7.0", + "port-version": 6 + }, { "git-tree": "b312644fb2498483feb3114cef2c8afaa44f45ed", "version-string": "0.7.0", diff --git a/external_imported/vcpkg/versions/e-/expected-lite.json b/external_imported/vcpkg/versions/e-/expected-lite.json index 2cd69539c..54293e66d 100644 --- a/external_imported/vcpkg/versions/e-/expected-lite.json +++ b/external_imported/vcpkg/versions/e-/expected-lite.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9c8f107476fb8d2afc13ab7b743b31d1e07ea5cd", + "version": "0.6.2", + "port-version": 0 + }, + { + "git-tree": "2b0c1f8e0fb5c88c9e3a98018d767c0e99997d94", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "a1e36e579144b5ebf1231aac06fbfc89c300351f", "version": "0.5.0", diff --git a/external_imported/vcpkg/versions/e-/ezfoundation.json b/external_imported/vcpkg/versions/e-/ezfoundation.json new file mode 100644 index 000000000..6c4c72ed8 --- /dev/null +++ b/external_imported/vcpkg/versions/e-/ezfoundation.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9db831cf3166d08f581365fccce852ae9aeb8b69", + "version": "21.10", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/fakeit.json b/external_imported/vcpkg/versions/f-/fakeit.json index 328716091..473350b62 100644 --- a/external_imported/vcpkg/versions/f-/fakeit.json +++ b/external_imported/vcpkg/versions/f-/fakeit.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a167ae0c79d73a0c9802b41992c668a41209a390", + "version": "2.3.0", + "port-version": 0 + }, + { + "git-tree": "2af5c0e3dc6e0f5d2ae288b50f6f8167e830ff69", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "e69fbaa4aed8ea6adf901929dd369ead884b9977", "version": "2.1.0", diff --git a/external_imported/vcpkg/versions/f-/fann.json b/external_imported/vcpkg/versions/f-/fann.json index f49c67fc9..e005396d3 100644 --- a/external_imported/vcpkg/versions/f-/fann.json +++ b/external_imported/vcpkg/versions/f-/fann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830", + "version": "2.2.0", + "port-version": 3 + }, { "git-tree": "9bff6da1b7043e1ab6e344c549a285b7101763e2", "version": "2.2.0", diff --git a/external_imported/vcpkg/versions/f-/fast-float.json b/external_imported/vcpkg/versions/f-/fast-float.json index 4097e5be9..38b638032 100644 --- a/external_imported/vcpkg/versions/f-/fast-float.json +++ b/external_imported/vcpkg/versions/f-/fast-float.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "166b1343d7e66bb8e6d29ba612620ae55f5a615e", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "ff47650c46181763025a2149a7753a56c5c1c83c", "version": "3.2.0", diff --git a/external_imported/vcpkg/versions/f-/fastcgi.json b/external_imported/vcpkg/versions/f-/fastcgi.json index 3f2460989..bd9559547 100644 --- a/external_imported/vcpkg/versions/f-/fastcgi.json +++ b/external_imported/vcpkg/versions/f-/fastcgi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aebdd65d1551d946470d43413d5265d409df3e7", + "version-date": "2020-09-11", + "port-version": 5 + }, { "git-tree": "8a8f47edb8fc80608665c48ace9195e2334c3b6e", "version-date": "2020-09-11", diff --git a/external_imported/vcpkg/versions/f-/fastrtps.json b/external_imported/vcpkg/versions/f-/fastrtps.json index c8285d3e1..8b7d8d081 100644 --- a/external_imported/vcpkg/versions/f-/fastrtps.json +++ b/external_imported/vcpkg/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a1b9df69d8a4219b390a65056d837dc6c0f385c", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "54873b953029cdd41ffee26b13af0c661de41462", "version": "2.4.0", diff --git a/external_imported/vcpkg/versions/f-/fawdlstty-libfv.json b/external_imported/vcpkg/versions/f-/fawdlstty-libfv.json new file mode 100644 index 000000000..9420ff483 --- /dev/null +++ b/external_imported/vcpkg/versions/f-/fawdlstty-libfv.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "d91c20aee1a33a221803e6e89147f751e3b78549", + "version": "0.0.8", + "port-version": 0 + }, + { + "git-tree": "f763fa0612d3a1416497c810a16cdcac36936822", + "version": "0.0.6", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/fbthrift.json b/external_imported/vcpkg/versions/f-/fbthrift.json index 2418aeecd..49f8193e4 100644 --- a/external_imported/vcpkg/versions/f-/fbthrift.json +++ b/external_imported/vcpkg/versions/f-/fbthrift.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60135cc9f7a4bf698b67d275e1ad66a542d9acb4", + "version-string": "2022.03.21.00", + "port-version": 2 + }, + { + "git-tree": "ed9295b0cad6c25b409e6e400148bb91017f3678", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c", "version-string": "2022.03.21.00", diff --git a/external_imported/vcpkg/versions/f-/ffmpeg.json b/external_imported/vcpkg/versions/f-/ffmpeg.json index cf2dda6d9..24b4de633 100644 --- a/external_imported/vcpkg/versions/f-/ffmpeg.json +++ b/external_imported/vcpkg/versions/f-/ffmpeg.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "65fe58cd3c36c19b6ad4b104b9ff57c506009e9a", + "version": "4.4.1", + "port-version": 18 + }, + { + "git-tree": "197609d70edc506c0257721d873b1eb3b93ba4b8", + "version": "4.4.1", + "port-version": 17 + }, + { + "git-tree": "0aee15f22c29078cc18d6324f3f622ef6e94deba", + "version": "4.4.1", + "port-version": 16 + }, + { + "git-tree": "d42747aed3213bf6d62a4a986fb915bdfd854a08", + "version": "4.4.1", + "port-version": 15 + }, + { + "git-tree": "bd232549fb2bcffed0dcfac1e7e6a54f5a91b5cc", + "version": "4.4.1", + "port-version": 14 + }, + { + "git-tree": "ad64f5ffe64b5fcd97e2e6d98273b70d498d6af0", + "version": "4.4.1", + "port-version": 13 + }, { "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b", "version": "4.4.1", diff --git a/external_imported/vcpkg/versions/f-/fftw3.json b/external_imported/vcpkg/versions/f-/fftw3.json index 27f1fec62..fe03ab2db 100644 --- a/external_imported/vcpkg/versions/f-/fftw3.json +++ b/external_imported/vcpkg/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ab09732ff55a9c0ff0fadd66623f38773338649", + "version": "3.3.10", + "port-version": 4 + }, { "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3", "version": "3.3.10", diff --git a/external_imported/vcpkg/versions/f-/fixed-string.json b/external_imported/vcpkg/versions/f-/fixed-string.json index 9cf1230d9..2ba86ed06 100644 --- a/external_imported/vcpkg/versions/f-/fixed-string.json +++ b/external_imported/vcpkg/versions/f-/fixed-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd3abbab052dee3c26babb29ed11725fbc82bcde", + "version": "0.1.1", + "port-version": 0 + }, { "git-tree": "e24d1c3d1692a06fa69dc12b65e4240a92db31bf", "version-string": "0.1.0", diff --git a/external_imported/vcpkg/versions/f-/flann.json b/external_imported/vcpkg/versions/f-/flann.json index 71d955c8c..d951e22e0 100644 --- a/external_imported/vcpkg/versions/f-/flann.json +++ b/external_imported/vcpkg/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "300415ad416640a5b4a4f0895a3250b306726181", + "version-date": "2019-04-07", + "port-version": 6 + }, { "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", "version-date": "2019-04-07", diff --git a/external_imported/vcpkg/versions/f-/flashlight-cpu.json b/external_imported/vcpkg/versions/f-/flashlight-cpu.json index af315e2b9..9f6e60deb 100644 --- a/external_imported/vcpkg/versions/f-/flashlight-cpu.json +++ b/external_imported/vcpkg/versions/f-/flashlight-cpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3", + "version": "0.3", + "port-version": 3 + }, { "git-tree": "b37aa1e8b06ce24319b6969ed0fa87664e4ec308", "version": "0.3", diff --git a/external_imported/vcpkg/versions/f-/flashlight-cuda.json b/external_imported/vcpkg/versions/f-/flashlight-cuda.json index 0844f0264..3c6f29741 100644 --- a/external_imported/vcpkg/versions/f-/flashlight-cuda.json +++ b/external_imported/vcpkg/versions/f-/flashlight-cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "afbc9bcce8e115033ecd9d1c64c2b4375c556e67", "version": "0.3", diff --git a/external_imported/vcpkg/versions/f-/flat.json b/external_imported/vcpkg/versions/f-/flat.json new file mode 100644 index 000000000..7c710f9a0 --- /dev/null +++ b/external_imported/vcpkg/versions/f-/flat.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c433fd060ea2d62e51b5301cec47da8c1a922acb", + "version-date": "2022-08-30", + "port-version": 0 + }, + { + "git-tree": "0e7a31d2afadc58f808facb7381a039d5f72eb36", + "version-date": "2022-06-10", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/flatbuffers.json b/external_imported/vcpkg/versions/f-/flatbuffers.json index 6e2a73e54..0f2e1a5d7 100644 --- a/external_imported/vcpkg/versions/f-/flatbuffers.json +++ b/external_imported/vcpkg/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "288dddf9e3a03a41f09b5f61547bf8d6b7b888c3", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "8713fce3bc50837e44d958ddc745471619c511c4", "version": "2.0.0", diff --git a/external_imported/vcpkg/versions/f-/flecs.json b/external_imported/vcpkg/versions/f-/flecs.json new file mode 100644 index 000000000..11314d32a --- /dev/null +++ b/external_imported/vcpkg/versions/f-/flecs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c39673b97267a414e46e47f526b48ca9c6b3b246", + "version": "2.4.8", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/fltk.json b/external_imported/vcpkg/versions/f-/fltk.json index 07d0695ee..96d9824a3 100644 --- a/external_imported/vcpkg/versions/f-/fltk.json +++ b/external_imported/vcpkg/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67f9090df208862fcd949bfae2214dd5fb0a3157", + "version": "1.3.8", + "port-version": 2 + }, { "git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8", "version": "1.3.8", diff --git a/external_imported/vcpkg/versions/f-/fluidsynth.json b/external_imported/vcpkg/versions/f-/fluidsynth.json index 8b85a542f..ab783ec5b 100644 --- a/external_imported/vcpkg/versions/f-/fluidsynth.json +++ b/external_imported/vcpkg/versions/f-/fluidsynth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c9629205f0ca376ee2139ec80c48229f5723eecf", + "version": "2.2.8", + "port-version": 0 + }, + { + "git-tree": "ad0fa73283950f13ecfff01deb0688c30a57c330", + "version": "2.2.6", + "port-version": 2 + }, + { + "git-tree": "e5c0f85546fe88c0e9aaf67734a929f2b717b1ef", + "version": "2.2.6", + "port-version": 1 + }, { "git-tree": "7740f8dfb97fa273a9f9ed740ade48f9953ff393", "version": "2.2.6", diff --git a/external_imported/vcpkg/versions/f-/fmt.json b/external_imported/vcpkg/versions/f-/fmt.json index c016f90d1..c03fc52dd 100644 --- a/external_imported/vcpkg/versions/f-/fmt.json +++ b/external_imported/vcpkg/versions/f-/fmt.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9268e89cdadcbb0a54357f47b343004200970a02", + "version": "9.0.0", + "port-version": 0 + }, + { + "git-tree": "1f0a5cf3aa202e9833dcc5d3fa36688ecf295ca4", + "version": "8.1.1", + "port-version": 2 + }, { "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", "version": "8.1.1", diff --git a/external_imported/vcpkg/versions/f-/folly.json b/external_imported/vcpkg/versions/f-/folly.json index ab08aaad8..5226756b3 100644 --- a/external_imported/vcpkg/versions/f-/folly.json +++ b/external_imported/vcpkg/versions/f-/folly.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f046523ca3488aa4e35d11656fcb15acb5b0f4f3", + "version-string": "2022.08.15.00", + "port-version": 0 + }, + { + "git-tree": "fcb721c422a09f612a5a83519d0c163c8cc83257", + "version-string": "2022.07.11.00", + "port-version": 0 + }, + { + "git-tree": "9d2f0850a514d305b6b3b56833185aaf7f6154e1", + "version-string": "2022.03.21.00", + "port-version": 2 + }, + { + "git-tree": "c1b11303819bf16b4cde18fdc8e6511b7bb34ed7", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "bb704ec83012c1ef40ba934b0d5f3ae45471e4bd", "version-string": "2022.03.21.00", diff --git a/external_imported/vcpkg/versions/f-/font-util.json b/external_imported/vcpkg/versions/f-/font-util.json new file mode 100644 index 000000000..645967e70 --- /dev/null +++ b/external_imported/vcpkg/versions/f-/font-util.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "752c6b7df7c1181d4c27b64da1c20c03137ed3c6", + "version": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/f-/fontconfig.json b/external_imported/vcpkg/versions/f-/fontconfig.json index 70a3570d9..8f6d47905 100644 --- a/external_imported/vcpkg/versions/f-/fontconfig.json +++ b/external_imported/vcpkg/versions/f-/fontconfig.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "51b89b5deffdfb0ca92218871623ab22738d2178", + "version": "2.14.0", + "port-version": 4 + }, + { + "git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4", + "version": "2.14.0", + "port-version": 3 + }, + { + "git-tree": "5c02d2ba027c9f390729a7e0899e63c853450dfb", + "version": "2.14.0", + "port-version": 2 + }, + { + "git-tree": "b1b1de99dba230f78c88bb9d73329bed77227ad4", + "version": "2.14.0", + "port-version": 1 + }, { "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", "version": "2.14.0", diff --git a/external_imported/vcpkg/versions/f-/fplus.json b/external_imported/vcpkg/versions/f-/fplus.json index fa4422235..13b59b456 100644 --- a/external_imported/vcpkg/versions/f-/fplus.json +++ b/external_imported/vcpkg/versions/f-/fplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e982e423baaf3d7728a2122368494d1c57c8e55e", + "version": "0.2.18-p0", + "port-version": 0 + }, { "git-tree": "d76810dad7926ef832d9f75966f99a763ed40cfb", "version-semver": "0.2.14-p0", diff --git a/external_imported/vcpkg/versions/f-/freealut.json b/external_imported/vcpkg/versions/f-/freealut.json index 6bc300bb7..e8da86da4 100644 --- a/external_imported/vcpkg/versions/f-/freealut.json +++ b/external_imported/vcpkg/versions/f-/freealut.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "969ad25e70aeab73962cb7bea1df1ea30644ad20", + "version": "1.1.0", + "port-version": 3 + }, + { + "git-tree": "bb6f48903b677ac0c8560a068e53f7a028b2a5d4", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/f-/freeimage.json b/external_imported/vcpkg/versions/f-/freeimage.json index 8c6c1586b..70accbea1 100644 --- a/external_imported/vcpkg/versions/f-/freeimage.json +++ b/external_imported/vcpkg/versions/f-/freeimage.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b72eaa94f12facf42b2180bf49ff9121d9477eaa", + "version": "3.18.0", + "port-version": 24 + }, + { + "git-tree": "748b7f37d074522ba08e6c4d6e6cf3afb3107da6", + "version": "3.18.0", + "port-version": 23 + }, { "git-tree": "9bad6f331c05331144e8bad4a2ef63d4c594cd5a", "version": "3.18.0", diff --git a/external_imported/vcpkg/versions/f-/freerdp.json b/external_imported/vcpkg/versions/f-/freerdp.json index 9864e5a11..7df8ae33f 100644 --- a/external_imported/vcpkg/versions/f-/freerdp.json +++ b/external_imported/vcpkg/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "585cf904d3a8fe43723d72d8c20175a780e17a64", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "8f786583b737855616d84a5177491deaf7d367a0", "version": "2.5.0", diff --git a/external_imported/vcpkg/versions/f-/freetds.json b/external_imported/vcpkg/versions/f-/freetds.json index 19513003f..0deb3189e 100644 --- a/external_imported/vcpkg/versions/f-/freetds.json +++ b/external_imported/vcpkg/versions/f-/freetds.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7d2a8c09978586d81a52529c94a96dd2f1208ebe", + "version": "1.3.10", + "port-version": 1 + }, + { + "git-tree": "c388be84a1c4bb7156aaf173f1ee348d500db8ad", + "version": "1.3.10", + "port-version": 0 + }, { "git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb", "version": "1.2.11", diff --git a/external_imported/vcpkg/versions/f-/freetype-gl.json b/external_imported/vcpkg/versions/f-/freetype-gl.json index 8031162af..0e74040b0 100644 --- a/external_imported/vcpkg/versions/f-/freetype-gl.json +++ b/external_imported/vcpkg/versions/f-/freetype-gl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c966935c663878c91381818cae1b87590be48191", + "version-date": "2022-01-17", + "port-version": 1 + }, + { + "git-tree": "4184aadfa1242cc37b6a3c77d9893bafd3d54d3f", + "version-date": "2022-01-17", + "port-version": 0 + }, { "git-tree": "e290ae7965dd6b7d333df5aa3a9a56df1bd8e24c", "version-string": "2020-09-14", diff --git a/external_imported/vcpkg/versions/f-/freetype.json b/external_imported/vcpkg/versions/f-/freetype.json index 50198e1b2..1c7ad157c 100644 --- a/external_imported/vcpkg/versions/f-/freetype.json +++ b/external_imported/vcpkg/versions/f-/freetype.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f1d6772ea2cb8cd74146b263b5dab534a10dd641", + "version": "2.12.1", + "port-version": 2 + }, + { + "git-tree": "f62a602dce6f188e2e4324b46995b2c79a97759a", + "version": "2.12.1", + "port-version": 1 + }, + { + "git-tree": "bf7afc9d9fa4aba9747dfc7902c60ea7cfa09e72", + "version": "2.12.1", + "port-version": 0 + }, { "git-tree": "ab8f5879ab23ffa292c80169f750b7edd6c2b4f1", "version-semver": "2.11.1", diff --git a/external_imported/vcpkg/versions/f-/freexl.json b/external_imported/vcpkg/versions/f-/freexl.json index 05ef3a3a0..4f24d7422 100644 --- a/external_imported/vcpkg/versions/f-/freexl.json +++ b/external_imported/vcpkg/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2b9775bc6c9594fc2f67ace1e80f54def8efe9", + "version": "1.0.6", + "port-version": 1 + }, { "git-tree": "d9635355d8831e1f9628ecbb8935a8e89813ff51", "version-string": "1.0.6", diff --git a/external_imported/vcpkg/versions/f-/fribidi.json b/external_imported/vcpkg/versions/f-/fribidi.json index b291a9777..c164cdf54 100644 --- a/external_imported/vcpkg/versions/f-/fribidi.json +++ b/external_imported/vcpkg/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43f84b32dcc2e675fac20a42c0cf0c7f801c1fbc", + "version": "1.0.12", + "port-version": 0 + }, { "git-tree": "038a02d8e9a403f61bd3d45ce0f6f626a67d72f3", "version": "1.0.11", diff --git a/external_imported/vcpkg/versions/f-/frozen.json b/external_imported/vcpkg/versions/f-/frozen.json index 8020b3ca3..ee2651893 100644 --- a/external_imported/vcpkg/versions/f-/frozen.json +++ b/external_imported/vcpkg/versions/f-/frozen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a8050c893da6b0549af088c1045ad459f330275", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "938d0ffeb689db9642ac49d16d7e7a22d3be93ab", "version-date": "2021-04-22", diff --git a/external_imported/vcpkg/versions/f-/ftgl.json b/external_imported/vcpkg/versions/f-/ftgl.json index 3a4533b9c..54fd244bb 100644 --- a/external_imported/vcpkg/versions/f-/ftgl.json +++ b/external_imported/vcpkg/versions/f-/ftgl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "42f6d4d37641856fc516bd9df7775c448434e94a", + "version-date": "2022-05-18", + "port-version": 1 + }, + { + "git-tree": "5f8871169a409d3eff23c83391564108912a6a97", + "version-date": "2022-05-18", + "port-version": 0 + }, { "git-tree": "5642730406fc248cae1eaefc9e739b9bf1c13fbf", "version-string": "2.4.0", diff --git a/external_imported/vcpkg/versions/f-/ftxui.json b/external_imported/vcpkg/versions/f-/ftxui.json index f27022935..68c44fc1d 100644 --- a/external_imported/vcpkg/versions/f-/ftxui.json +++ b/external_imported/vcpkg/versions/f-/ftxui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42d65bbb4e3ffbb459b80b05de4322fa10593e29", + "version-semver": "3.0.0", + "port-version": 0 + }, { "git-tree": "f84934653f0ae5ca32279726f41dae1b2f6a4fb5", "version-semver": "2.0.0", diff --git a/external_imported/vcpkg/versions/f-/fuzzylite.json b/external_imported/vcpkg/versions/f-/fuzzylite.json index 8741a481e..704663aab 100644 --- a/external_imported/vcpkg/versions/f-/fuzzylite.json +++ b/external_imported/vcpkg/versions/f-/fuzzylite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a82dbec4f8e74e116214cfe7120ec0aa4b5d41bf", + "version": "6.0", + "port-version": 6 + }, { "git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3", "version": "6.0", diff --git a/external_imported/vcpkg/versions/g-/gainput.json b/external_imported/vcpkg/versions/g-/gainput.json index 9ce5b1b0c..d23cb9d36 100644 --- a/external_imported/vcpkg/versions/g-/gainput.json +++ b/external_imported/vcpkg/versions/g-/gainput.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7d03d82f8c42466bcd155b94e0dcefa79763931", + "version": "1.0.0", + "port-version": 6 + }, { "git-tree": "6edb146db254b1cec192c12f335bef0e54455770", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/g-/gamedev-framework.json b/external_imported/vcpkg/versions/g-/gamedev-framework.json index 13f04015a..83a46775c 100644 --- a/external_imported/vcpkg/versions/g-/gamedev-framework.json +++ b/external_imported/vcpkg/versions/g-/gamedev-framework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a45568c161b8eb5ae64471a466545b96b15818", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "4dbeca9676a469cb84eb1cfc731ae9bbc9110447", "version-semver": "0.20.0", diff --git a/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json b/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json index 3f87f529e..94813fbba 100644 --- a/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json +++ b/external_imported/vcpkg/versions/g-/gamenetworkingsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94a9a726c8c2caf64acec0988bd9ad58f57ab5df", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "56c1a61c82400d285d3d37cf8e20a1f362a0d83f", "version": "1.4.0", diff --git a/external_imported/vcpkg/versions/g-/gamma.json b/external_imported/vcpkg/versions/g-/gamma.json index 2c67cdc47..f507b7da0 100644 --- a/external_imported/vcpkg/versions/g-/gamma.json +++ b/external_imported/vcpkg/versions/g-/gamma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328", + "version-string": "gamma-2018-01-27", + "port-version": 4 + }, { "git-tree": "69d699310fe2e651e63668d194c19dfae5fd9376", "version-string": "gamma-2018-01-27", diff --git a/external_imported/vcpkg/versions/g-/gazebo.json b/external_imported/vcpkg/versions/g-/gazebo.json index 78d9fcac4..97ee3164a 100644 --- a/external_imported/vcpkg/versions/g-/gazebo.json +++ b/external_imported/vcpkg/versions/g-/gazebo.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b1f5088e196340aad31ea3700aceae72df1407ae", + "version-date": "2022-01-20", + "port-version": 4 + }, + { + "git-tree": "094ba2b47c08f30d45b33081f8b2b3790b2ec070", + "version-date": "2022-01-20", + "port-version": 3 + }, + { + "git-tree": "324403bb31aad7705e0f444e9c49f2b11417b9b0", + "version-date": "2022-01-20", + "port-version": 2 + }, + { + "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4", + "version-date": "2022-01-20", + "port-version": 1 + }, { "git-tree": "983e90284c8c0073e0193750a412eb4df01accdc", "version-date": "2022-01-20", diff --git a/external_imported/vcpkg/versions/g-/gcem.json b/external_imported/vcpkg/versions/g-/gcem.json index 7753c48bd..29d714d2b 100644 --- a/external_imported/vcpkg/versions/g-/gcem.json +++ b/external_imported/vcpkg/versions/g-/gcem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01116231bfab30197748230d4125d18fd2652150", + "version": "1.14.1", + "port-version": 0 + }, { "git-tree": "b5ffa19fc8b11179434020c69f6c998dd58268ee", "version-string": "1.13.1", diff --git a/external_imported/vcpkg/versions/g-/gdal.json b/external_imported/vcpkg/versions/g-/gdal.json index 6f1222acf..a99c8bd1d 100644 --- a/external_imported/vcpkg/versions/g-/gdal.json +++ b/external_imported/vcpkg/versions/g-/gdal.json @@ -1,5 +1,65 @@ { "versions": [ + { + "git-tree": "f88341b75df68d585c06df3ed7b7b0a5412ae986", + "version-semver": "3.5.2", + "port-version": 0 + }, + { + "git-tree": "548d8ee81b0b34493dc57b3610fb19db2403bb50", + "version-semver": "3.5.1", + "port-version": 6 + }, + { + "git-tree": "e875fbb6dc288ea2719e00a6b71b4834b8814640", + "version-semver": "3.5.1", + "port-version": 5 + }, + { + "git-tree": "419767a67a207c3b5401b817d8537acafe257e1b", + "version-semver": "3.5.1", + "port-version": 4 + }, + { + "git-tree": "a7d7e8b112055c7374cbf2e53172eb1832ddb73b", + "version-semver": "3.5.1", + "port-version": 3 + }, + { + "git-tree": "4d114225017db64685132cde062afde8ec8cbc9b", + "version-semver": "3.5.1", + "port-version": 2 + }, + { + "git-tree": "dd8ff4159201d96aecb0cc2de325b56a522ae0e1", + "version-semver": "3.5.1", + "port-version": 1 + }, + { + "git-tree": "f623db2a0771ad4df6c248b046cd8f369ecbdcca", + "version-semver": "3.5.1", + "port-version": 0 + }, + { + "git-tree": "cf1b59dd5a8518c4003a7d23d0db857315af0db9", + "version-semver": "3.4.3", + "port-version": 3 + }, + { + "git-tree": "509d3e54670e6552cce8d811a329d6c28589392e", + "version-semver": "3.4.3", + "port-version": 2 + }, + { + "git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063", + "version-semver": "3.4.3", + "port-version": 1 + }, + { + "git-tree": "8277225a2c5da40e154062f73526126fb00c9125", + "version-semver": "3.4.3", + "port-version": 0 + }, { "git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3", "version-semver": "3.4.2", diff --git a/external_imported/vcpkg/versions/g-/gdcm.json b/external_imported/vcpkg/versions/g-/gdcm.json index 3c99bc96f..f18a8a6e1 100644 --- a/external_imported/vcpkg/versions/g-/gdcm.json +++ b/external_imported/vcpkg/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d88a2229a173f1d38ae7beeb24d8169957968e74", + "version": "3.0.12", + "port-version": 0 + }, { "git-tree": "64bda232157a1119e4a16b3379294d13354e8971", "version": "3.0.7", diff --git a/external_imported/vcpkg/versions/g-/gdk-pixbuf.json b/external_imported/vcpkg/versions/g-/gdk-pixbuf.json index d431dc922..0817d42df 100644 --- a/external_imported/vcpkg/versions/g-/gdk-pixbuf.json +++ b/external_imported/vcpkg/versions/g-/gdk-pixbuf.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "ec4e9442f7771435547892134cde77081fd013d7", + "version": "2.42.9", + "port-version": 1 + }, + { + "git-tree": "c4d20ae662c74ed3f4bfec74bb57a68747564c96", + "version": "2.42.9", + "port-version": 0 + }, + { + "git-tree": "6662972ebf092397b1d94122ecfc754f0b81eeee", + "version": "2.42.8", + "port-version": 3 + }, + { + "git-tree": "2e82cf35eb436a674fdbdfa12cce69e629c83bf4", + "version": "2.42.8", + "port-version": 2 + }, + { + "git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38", + "version": "2.42.8", + "port-version": 1 + }, + { + "git-tree": "ad94c8b8ea1bd1f66085e17b9763b22080d6bf6b", + "version": "2.42.8", + "port-version": 0 + }, { "git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288", "version": "2.42.2", diff --git a/external_imported/vcpkg/versions/g-/geographiclib.json b/external_imported/vcpkg/versions/g-/geographiclib.json index 75c6083df..57f30e76a 100644 --- a/external_imported/vcpkg/versions/g-/geographiclib.json +++ b/external_imported/vcpkg/versions/g-/geographiclib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "efe97af6f3b9584df1eb7ba4491af1f87e5e0053", + "version": "2.1.1", + "port-version": 0 + }, + { + "git-tree": "447b01efd62b08035684790b159926403cc5f7a1", + "version": "2.1", + "port-version": 0 + }, + { + "git-tree": "440bbb70d0e2bd4df26e6c4c8e80a9f1942f743e", + "version": "2.0", + "port-version": 0 + }, { "git-tree": "907cce8f399c32730fa20954780e16187bb28bd0", "version": "1.52", diff --git a/external_imported/vcpkg/versions/g-/geos.json b/external_imported/vcpkg/versions/g-/geos.json index 42cd134f5..af658bf08 100644 --- a/external_imported/vcpkg/versions/g-/geos.json +++ b/external_imported/vcpkg/versions/g-/geos.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "9bf5a546e53664298e8d1f843600013cd0d94ae5", + "version": "3.11.0", + "port-version": 1 + }, + { + "git-tree": "65d05922979febad3d20696832347333c24f1c16", + "version": "3.11.0", + "port-version": 0 + }, + { + "git-tree": "aa45b04832db59c6f6c4e92cf0f67b21afe41a48", + "version": "3.10.2", + "port-version": 0 + }, { "git-tree": "852bf7181cbec88161abfe3cf4db2887f80ab2d4", "version": "3.10.0", diff --git a/external_imported/vcpkg/versions/g-/getopt-win32.json b/external_imported/vcpkg/versions/g-/getopt-win32.json index 3f3316afb..1b8ce8edc 100644 --- a/external_imported/vcpkg/versions/g-/getopt-win32.json +++ b/external_imported/vcpkg/versions/g-/getopt-win32.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a655b35c38424570406603859dcfbb70d25bc0b9", + "version": "0.1", + "port-version": 4 + }, + { + "git-tree": "97ccee735c01df1356a70d59bc114512f7ab77cc", + "version": "0.1", + "port-version": 3 + }, { "git-tree": "93d03f637c26f2efa154dfd7c3efb02074cf5eda", "version-string": "0.1", diff --git a/external_imported/vcpkg/versions/g-/getopt.json b/external_imported/vcpkg/versions/g-/getopt.json index 24d9652d4..a0183d27f 100644 --- a/external_imported/vcpkg/versions/g-/getopt.json +++ b/external_imported/vcpkg/versions/g-/getopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be2552adc01c2ba30044325925f7348121de5c3d", + "version-string": "0", + "port-version": 2 + }, { "git-tree": "81815a8f433219e332659e07204f90df381a28a7", "version-string": "0", diff --git a/external_imported/vcpkg/versions/g-/gklib.json b/external_imported/vcpkg/versions/g-/gklib.json new file mode 100644 index 000000000..a0af42d2b --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gklib.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "7f9c6f0e711860da19899fbe78e027d0a5e8cfc1", + "version-date": "2022-07-27", + "port-version": 2 + }, + { + "git-tree": "be7b5aca0025910c7dbbc260564bf7d56ada1a3c", + "version-date": "2022-07-27", + "port-version": 1 + }, + { + "git-tree": "1f3a1ab0a9e1fe871e03b766ea7dbf8b10f54658", + "version-date": "2022-07-27", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/glad.json b/external_imported/vcpkg/versions/g-/glad.json index c704203e6..052be36f8 100644 --- a/external_imported/vcpkg/versions/g-/glad.json +++ b/external_imported/vcpkg/versions/g-/glad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa93b14c1581057e1d14650f5f15c9b0757dd548", + "version": "0.1.36", + "port-version": 0 + }, { "git-tree": "2ebf6ed85a860c74f8649571e168900426cbb944", "version": "0.1.34", @@ -15,11 +20,6 @@ "version": "0.1.34", "port-version": 0 }, - { - "git-tree": "d222f56675de6eedfc3a25e5a4b93fee39747f49", - "version-string": "0.1.34", - "port-version": 2 - }, { "git-tree": "abaac8ade7697e7f6ae4a82c981aafa2cc6a5359", "version-string": "0.1.33-1", diff --git a/external_imported/vcpkg/versions/g-/glfw3.json b/external_imported/vcpkg/versions/g-/glfw3.json index bf6222fba..6c3ec39af 100644 --- a/external_imported/vcpkg/versions/g-/glfw3.json +++ b/external_imported/vcpkg/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2a1ebc7845c0e8e6c7d46c0b940f4457cf460d8", + "version-semver": "3.3.8", + "port-version": 0 + }, { "git-tree": "1da77592851c5a530a1c96c6d7d554c625b7f509", "version-semver": "3.3.7", diff --git a/external_imported/vcpkg/versions/g-/glib.json b/external_imported/vcpkg/versions/g-/glib.json index c4c805e65..307e9340e 100644 --- a/external_imported/vcpkg/versions/g-/glib.json +++ b/external_imported/vcpkg/versions/g-/glib.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "c9fbf2ec21948d70e4b8d5e633e600344982069f", + "version": "2.72.3", + "port-version": 3 + }, + { + "git-tree": "aed4b2abc6c22c9b49d18ad5ab5d3f12cb330d22", + "version": "2.72.3", + "port-version": 2 + }, + { + "git-tree": "5d5171b8b2d18d7a24e54d5a062aa18b5effb3f4", + "version": "2.72.3", + "port-version": 1 + }, + { + "git-tree": "abff8e76676673462462f949844d3369d93be61d", + "version": "2.72.3", + "port-version": 0 + }, + { + "git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d", + "version": "2.70.5", + "port-version": 2 + }, + { + "git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad", + "version": "2.70.5", + "port-version": 1 + }, { "git-tree": "c9d76755634e72f74de67a04e2713ba0278e772a", "version": "2.70.5", diff --git a/external_imported/vcpkg/versions/g-/glog.json b/external_imported/vcpkg/versions/g-/glog.json index b34d37318..5e3e114af 100644 --- a/external_imported/vcpkg/versions/g-/glog.json +++ b/external_imported/vcpkg/versions/g-/glog.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "b1be508a55f3c9cbd8d78b40ac3739365ff301b7", + "version": "0.6.0", + "port-version": 0 + }, + { + "git-tree": "b1c79ab6934cb1a24d37e2e7c0a73f486f3400c4", + "version": "0.5.0", + "port-version": 5 + }, + { + "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b", + "version": "0.5.0", + "port-version": 4 + }, + { + "git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8", + "version": "0.5.0", + "port-version": 3 + }, + { + "git-tree": "10e0077ffa3485fa75178aa8e2a3f8ec0314573b", + "version": "0.5.0", + "port-version": 2 + }, + { + "git-tree": "c0809e03781b0f3f322236ad964b6caa464dfe21", + "version": "0.5.0", + "port-version": 1 + }, { "git-tree": "55b03c1cae45ba6b081c9072e6431d720467c82b", "version": "0.5.0", diff --git a/external_imported/vcpkg/versions/g-/glslang.json b/external_imported/vcpkg/versions/g-/glslang.json index 2d97b899d..f2868c353 100644 --- a/external_imported/vcpkg/versions/g-/glslang.json +++ b/external_imported/vcpkg/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011", + "version": "11.11.0", + "port-version": 0 + }, { "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", "version": "11.8.0", diff --git a/external_imported/vcpkg/versions/g-/gmp.json b/external_imported/vcpkg/versions/g-/gmp.json index 9505d80d1..8fd6673aa 100644 --- a/external_imported/vcpkg/versions/g-/gmp.json +++ b/external_imported/vcpkg/versions/g-/gmp.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "28b5b46e27a69da50c1cd0a8be5d0a32cbca120b", + "version": "6.2.1", + "port-version": 13 + }, + { + "git-tree": "53a7476d7dc1a0a00be2ef9578ba87c3bc13f06f", + "version": "6.2.1", + "port-version": 12 + }, + { + "git-tree": "678326aeaf5a7fed7d24a2184cb0d483336cac74", + "version": "6.2.1", + "port-version": 11 + }, + { + "git-tree": "f4748213535c3fd004de44f6b1f15d123927cce6", + "version": "6.2.1", + "port-version": 10 + }, { "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", "version": "6.2.1", diff --git a/external_imported/vcpkg/versions/g-/gobject-introspection.json b/external_imported/vcpkg/versions/g-/gobject-introspection.json index 16c0cbb1d..e9f565479 100644 --- a/external_imported/vcpkg/versions/g-/gobject-introspection.json +++ b/external_imported/vcpkg/versions/g-/gobject-introspection.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a74d57d679dac22f5b60c5b7da97cad7ecb3d0fb", + "version": "1.72.0", + "port-version": 1 + }, + { + "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793", + "version": "1.72.0", + "port-version": 0 + }, { "git-tree": "a39c3bd1142fd69e6dba29cf3bd4c7e93b049406", "version": "1.70.0", diff --git a/external_imported/vcpkg/versions/g-/google-cloud-cpp.json b/external_imported/vcpkg/versions/g-/google-cloud-cpp.json index 62f2f8638..7f58bd916 100644 --- a/external_imported/vcpkg/versions/g-/google-cloud-cpp.json +++ b/external_imported/vcpkg/versions/g-/google-cloud-cpp.json @@ -1,5 +1,55 @@ { "versions": [ + { + "git-tree": "47537b3b241e2f6a757553ad9475c44c7e13eb01", + "version": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "8e675db53dae8b88be806ecd93411810ee8048d7", + "version": "2.1.0", + "port-version": 2 + }, + { + "git-tree": "a70cc631d25b110ce203a0f571689304fb0e8595", + "version": "2.1.0", + "port-version": 1 + }, + { + "git-tree": "a68fd18fa28b5bbe4807c7ed32ed45c0d4392dd1", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "80997c40db6cb1d4e51f77875f75bf3a8046680f", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "71a72e78da707ee567b96bc835cf25cd8e8eb975", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "95315156a8c6fefdde56b6c4718062975ff7e0ce", + "version": "1.42.0", + "port-version": 0 + }, + { + "git-tree": "a6fac62fee7c3ad470f81ac87fcdf19d5a85f8b8", + "version": "1.41.0", + "port-version": 0 + }, + { + "git-tree": "506bdfbf9040c856f8f3a4a2c183da38f9030817", + "version": "1.40.1", + "port-version": 1 + }, + { + "git-tree": "2a18f7bea0f4811da422b3099c4331305cb1f617", + "version": "1.40.1", + "port-version": 0 + }, { "git-tree": "7f6839d85455e137c21bf5bf894e00e0327c3423", "version": "1.39.0", diff --git a/external_imported/vcpkg/versions/g-/gperf.json b/external_imported/vcpkg/versions/g-/gperf.json index addff5181..9421e9188 100644 --- a/external_imported/vcpkg/versions/g-/gperf.json +++ b/external_imported/vcpkg/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd0763af6d1af5d123d81c77fe9062d33b3e918", + "version": "3.1", + "port-version": 4 + }, { "git-tree": "15455ef99f1ce92d079d047e90fc486c098c6b18", "version": "3.1", diff --git a/external_imported/vcpkg/versions/g-/gpgmm.json b/external_imported/vcpkg/versions/g-/gpgmm.json new file mode 100644 index 000000000..9cc971b5b --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gpgmm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "588c2c48227d309001811deaab846ce36476c3c9", + "version": "0.0.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/gppanel.json b/external_imported/vcpkg/versions/g-/gppanel.json index 5b4ec4c3b..d83b89752 100644 --- a/external_imported/vcpkg/versions/g-/gppanel.json +++ b/external_imported/vcpkg/versions/g-/gppanel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e5dbacb2efcf80443e7d7c42bc2c98b3622a7c8", + "version-date": "2020-05-20", + "port-version": 2 + }, { "git-tree": "4cc181130888f98e2495b4a1f342b28a532f28b4", "version-date": "2020-05-20", diff --git a/external_imported/vcpkg/versions/g-/graphene.json b/external_imported/vcpkg/versions/g-/graphene.json index 9a023fe39..c41e87db1 100644 --- a/external_imported/vcpkg/versions/g-/graphene.json +++ b/external_imported/vcpkg/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a55f155dd8a61f69cfd04bc85fcbb7bba5efcaed", + "version": "1.10.2", + "port-version": 3 + }, { "git-tree": "35d8f02c154c44312abd824ba408d52855dbf138", "version": "1.10.2", diff --git a/external_imported/vcpkg/versions/g-/graphviz.json b/external_imported/vcpkg/versions/g-/graphviz.json index 725c98546..e9db85c9e 100644 --- a/external_imported/vcpkg/versions/g-/graphviz.json +++ b/external_imported/vcpkg/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f5333a2eb91b052b2691132f48aefced3bf1df", + "version-semver": "2.49.1", + "port-version": 4 + }, { "git-tree": "c1f20d0e1aaccb1035e3fe3eb95d005b4161a56e", "version-semver": "2.49.1", diff --git a/external_imported/vcpkg/versions/g-/grpc.json b/external_imported/vcpkg/versions/g-/grpc.json index 160d6a33a..9d8e0d4f8 100644 --- a/external_imported/vcpkg/versions/g-/grpc.json +++ b/external_imported/vcpkg/versions/g-/grpc.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "28334108999e49da12dbde24bcfc183984ecef41", + "version-semver": "1.49.0", + "port-version": 0 + }, + { + "git-tree": "efed7f493dec5fdebaebdec83c521fc860b432a3", + "version-semver": "1.48.0", + "port-version": 2 + }, + { + "git-tree": "7b2206a9758481b4773a93435aa6cfe7de4bf9e5", + "version-semver": "1.48.0", + "port-version": 1 + }, + { + "git-tree": "ef80a11383e8ff6bd068d50e620ea681cea3a22e", + "version-semver": "1.48.0", + "port-version": 0 + }, + { + "git-tree": "7db8056216ec23b5d48a44eaab6581c3357c1389", + "version-semver": "1.46.3", + "port-version": 1 + }, + { + "git-tree": "dabbbee8a5b79662990efb664c6975e2ea548599", + "version-semver": "1.46.3", + "port-version": 0 + }, + { + "git-tree": "6b15dbb6b2a6f81d7ae885b5b8f273b729b8d0ba", + "version-semver": "1.44.0", + "port-version": 1 + }, { "git-tree": "489c160e47ae99de58a438f93714ecbb008df330", "version-semver": "1.44.0", diff --git a/external_imported/vcpkg/versions/g-/grppi.json b/external_imported/vcpkg/versions/g-/grppi.json index 4b198a176..fa94a3293 100644 --- a/external_imported/vcpkg/versions/g-/grppi.json +++ b/external_imported/vcpkg/versions/g-/grppi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4f8344f7b0d97a42dfe8e95fe94f3af6b1bbe06", + "version": "0.4.0", + "port-version": 2 + }, { "git-tree": "4149700fba5f680c7efae07383dc7d6cf6cfcef9", "version-string": "0.4.0", diff --git a/external_imported/vcpkg/versions/g-/gsl.json b/external_imported/vcpkg/versions/g-/gsl.json index 635882c89..c80bd8801 100644 --- a/external_imported/vcpkg/versions/g-/gsl.json +++ b/external_imported/vcpkg/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bf0e1015fe68141e3c5d0b6777c2d38c352b72d", + "version": "2.7.1", + "port-version": 1 + }, { "git-tree": "dc3b20f09d0d6131faaa2dc0448d60676af96672", "version": "2.7.1", diff --git a/external_imported/vcpkg/versions/g-/gstreamer.json b/external_imported/vcpkg/versions/g-/gstreamer.json index 4accf168c..fd6824af5 100644 --- a/external_imported/vcpkg/versions/g-/gstreamer.json +++ b/external_imported/vcpkg/versions/g-/gstreamer.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "34e4471f1313a9d9ce220e461dde37a331c5bf47", + "version": "1.19.2", + "port-version": 8 + }, + { + "git-tree": "88e3063c417fe72ab1532ad99494b71c8037d8b5", + "version": "1.19.2", + "port-version": 7 + }, + { + "git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38", + "version": "1.19.2", + "port-version": 6 + }, { "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", "version": "1.19.2", diff --git a/external_imported/vcpkg/versions/g-/gtest.json b/external_imported/vcpkg/versions/g-/gtest.json index 58f9b691a..fe2b3942a 100644 --- a/external_imported/vcpkg/versions/g-/gtest.json +++ b/external_imported/vcpkg/versions/g-/gtest.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8f4ae2732d1a648bdfe56b16ae5d68df63ecf344", + "version-semver": "1.12.1", + "port-version": 0 + }, + { + "git-tree": "da295db55242fd454a3b42486c3f9043356ca40f", + "version-semver": "1.12.0", + "port-version": 0 + }, { "git-tree": "9731f44f8b0ecbc67eafccd0440700357d2cdfc4", "version-semver": "1.11.0", diff --git a/external_imported/vcpkg/versions/g-/gtk.json b/external_imported/vcpkg/versions/g-/gtk.json index 9d944fe71..4a1434fef 100644 --- a/external_imported/vcpkg/versions/g-/gtk.json +++ b/external_imported/vcpkg/versions/g-/gtk.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4c2e407dc3ecdc258c2f9c0243467c2e87c3529f", + "version": "4.6.2", + "port-version": 2 + }, + { + "git-tree": "d2d59edf9986797558b8abafbff9c913bf4f02ca", + "version": "4.6.2", + "port-version": 1 + }, + { + "git-tree": "00d7796e9bcff96a64e45b977a72129b1dc7be43", + "version": "4.6.2", + "port-version": 0 + }, { "git-tree": "ae837c3a08bb71e486641d8b4464c132dbf54464", "version": "4.6.0", diff --git a/external_imported/vcpkg/versions/g-/gtl.json b/external_imported/vcpkg/versions/g-/gtl.json index 5776144ad..8268ef670 100644 --- a/external_imported/vcpkg/versions/g-/gtl.json +++ b/external_imported/vcpkg/versions/g-/gtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45ab838bcba517295403cbd3d619f7cedca27346", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/g-/gts.json b/external_imported/vcpkg/versions/g-/gts.json index 3ac6eb676..dbd92b127 100644 --- a/external_imported/vcpkg/versions/g-/gts.json +++ b/external_imported/vcpkg/versions/g-/gts.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1bce412085edcd46e3f358cca2c3bb1cffb25cfa", + "version": "0.7.6", + "port-version": 7 + }, + { + "git-tree": "fbe5bc5629f2ec46a083b4e861589cae5b559c5f", + "version": "0.7.6", + "port-version": 6 + }, + { + "git-tree": "90471122b5c6aa2ce7566b25b06d9f0b858c482e", + "version": "0.7.6", + "port-version": 5 + }, { "git-tree": "e2e045b3685112306e5fcbd493ea6f97fb35a501", "version": "0.7.6", diff --git a/external_imported/vcpkg/versions/g-/guile.json b/external_imported/vcpkg/versions/g-/guile.json new file mode 100644 index 000000000..bed043b14 --- /dev/null +++ b/external_imported/vcpkg/versions/g-/guile.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c74041cde8519afb26d9fa588b8d24877d35514", + "version": "3.0.8", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/guilite.json b/external_imported/vcpkg/versions/g-/guilite.json index db73a1105..c0a80fd20 100644 --- a/external_imported/vcpkg/versions/g-/guilite.json +++ b/external_imported/vcpkg/versions/g-/guilite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43572106c3593ef39db61013f97d37d33c867542", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "c68992e6acdc51afc39edfdfe1342ecbd197bee6", "version-date": "2021-07-31", diff --git a/external_imported/vcpkg/versions/g-/gul14.json b/external_imported/vcpkg/versions/g-/gul14.json new file mode 100644 index 000000000..d7c4b807e --- /dev/null +++ b/external_imported/vcpkg/versions/g-/gul14.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7985ecf5f6874b9cf594d43d403820294529d0d3", + "version": "2.6", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/g-/gumbo.json b/external_imported/vcpkg/versions/g-/gumbo.json index 8c64b9300..93cc94f00 100644 --- a/external_imported/vcpkg/versions/g-/gumbo.json +++ b/external_imported/vcpkg/versions/g-/gumbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33203d45b5dcbc9d4bb0175691909a4e9c930d81", + "version": "0.10.1", + "port-version": 5 + }, { "git-tree": "6c80a646e227f1181f474077dbf80f356555f452", "version-string": "0.10.1", diff --git a/external_imported/vcpkg/versions/h-/halide.json b/external_imported/vcpkg/versions/h-/halide.json index c313ea05b..c0d638418 100644 --- a/external_imported/vcpkg/versions/h-/halide.json +++ b/external_imported/vcpkg/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8beaf9e4b505e3a59e286d220492de1af4381154", + "version": "14.0.0", + "port-version": 0 + }, { "git-tree": "92aa2ed7a51a38dfb53cdcb2f4b9c54f58030d52", "version": "13.0.2", diff --git a/external_imported/vcpkg/versions/h-/hareflow.json b/external_imported/vcpkg/versions/h-/hareflow.json new file mode 100644 index 000000000..1eeae5b86 --- /dev/null +++ b/external_imported/vcpkg/versions/h-/hareflow.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "80c6cc2de2019b438b3eb7caecc26277e5cc836c", + "version-semver": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/h-/harfbuzz.json b/external_imported/vcpkg/versions/h-/harfbuzz.json index 0f296ad12..af7dd766c 100644 --- a/external_imported/vcpkg/versions/h-/harfbuzz.json +++ b/external_imported/vcpkg/versions/h-/harfbuzz.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "64cea6fad2515aeabcdb82768bbb9b4b30db7af6", + "version": "5.0.1", + "port-version": 2 + }, + { + "git-tree": "890fd1dc4836a76fac4de6ee409c762ac0afe587", + "version": "5.0.1", + "port-version": 1 + }, + { + "git-tree": "bfe57115dd9a78a72cbbaadf756e83bbbff449ed", + "version": "5.0.1", + "port-version": 0 + }, + { + "git-tree": "aa86b69179481aee3a47cb7452a7058a65e6da0c", + "version": "4.2.0", + "port-version": 1 + }, + { + "git-tree": "02ad2865be7815604bb2c0e6cbc368f3d23d93d6", + "version": "4.2.0", + "port-version": 0 + }, + { + "git-tree": "1c4a2589742ad6156667771b0cf38ecb46e8c797", + "version-semver": "3.2.0", + "port-version": 3 + }, { "git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271", "version-semver": "3.2.0", diff --git a/external_imported/vcpkg/versions/h-/hash-library.json b/external_imported/vcpkg/versions/h-/hash-library.json new file mode 100644 index 000000000..b4c338382 --- /dev/null +++ b/external_imported/vcpkg/versions/h-/hash-library.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b3e49529dd25b60564de8ceed9485e17e8a7f8da", + "version": "8", + "port-version": 2 + }, + { + "git-tree": "fad55dc152114a3f71c5eafd33a3facd7e3a2286", + "version": "8", + "port-version": 1 + }, + { + "git-tree": "c7e4fae9255d5bdacac11e7a7dc550df777b8b37", + "version": "8", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/h-/hdf5.json b/external_imported/vcpkg/versions/h-/hdf5.json index a82c072f6..6360efbd8 100644 --- a/external_imported/vcpkg/versions/h-/hdf5.json +++ b/external_imported/vcpkg/versions/h-/hdf5.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f6647d7591d9b5a588d92e0fb4266d2028132ff9", + "version": "1.12.2", + "port-version": 1 + }, + { + "git-tree": "4abe78968a986c1793207ae653eb686926f3c141", + "version": "1.12.2", + "port-version": 0 + }, + { + "git-tree": "c6491dde27884b1326e6f74f3862c1ae63a122ca", + "version": "1.12.1", + "port-version": 5 + }, { "git-tree": "1000a70aefebfdd856715d265c3421c80157b773", "version": "1.12.1", diff --git a/external_imported/vcpkg/versions/h-/hexl.json b/external_imported/vcpkg/versions/h-/hexl.json index cc0d88ede..916fde9c2 100644 --- a/external_imported/vcpkg/versions/h-/hexl.json +++ b/external_imported/vcpkg/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d048751f3f15d5536e3e26d096e5efe3d8713ac", + "version": "1.2.4", + "port-version": 0 + }, { "git-tree": "c345ad60bfec1af5f712c6076de5d58ec497d889", "version": "1.2.3", diff --git a/external_imported/vcpkg/versions/h-/hidapi.json b/external_imported/vcpkg/versions/h-/hidapi.json index 51df67bed..e1c4608a3 100644 --- a/external_imported/vcpkg/versions/h-/hidapi.json +++ b/external_imported/vcpkg/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "803a911247de97c28264c5dee2102b368137562d", + "version-semver": "0.12.0", + "port-version": 0 + }, { "git-tree": "145fcc6e2c3aa564666793d494a6b90c1323e0ac", "version-semver": "0.11.2", diff --git a/external_imported/vcpkg/versions/h-/highfive.json b/external_imported/vcpkg/versions/h-/highfive.json index eaf02f1ba..ba429d3ee 100644 --- a/external_imported/vcpkg/versions/h-/highfive.json +++ b/external_imported/vcpkg/versions/h-/highfive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8303489c627f763e4edfea72273d56ce30dcbc02", + "version": "2.3", + "port-version": 3 + }, { "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81", "version": "2.3", diff --git a/external_imported/vcpkg/versions/h-/hiredis.json b/external_imported/vcpkg/versions/h-/hiredis.json index 36c7df6be..2c59b0b7f 100644 --- a/external_imported/vcpkg/versions/h-/hiredis.json +++ b/external_imported/vcpkg/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448374fa990c04aa7964508d32817a6d7868600b", + "version": "1.0.2", + "port-version": 4 + }, { "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", "version": "1.0.2", diff --git a/external_imported/vcpkg/versions/h-/hpx.json b/external_imported/vcpkg/versions/h-/hpx.json index 2bf34abec..1bdd4bc46 100644 --- a/external_imported/vcpkg/versions/h-/hpx.json +++ b/external_imported/vcpkg/versions/h-/hpx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "aaf58e8627662fd841d011ea7e71d23507573772", + "version": "1.8.0", + "port-version": 1 + }, + { + "git-tree": "2bd151915f73223a06d9470f38f56d253392a484", + "version": "1.8.0", + "port-version": 0 + }, { "git-tree": "48d153f2932b01257af5a799676268abdfb35fac", "version-semver": "1.7.1", diff --git a/external_imported/vcpkg/versions/h-/hunspell.json b/external_imported/vcpkg/versions/h-/hunspell.json index 7477d3161..b526cc956 100644 --- a/external_imported/vcpkg/versions/h-/hunspell.json +++ b/external_imported/vcpkg/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3adb7d5162395e281e90173a290f16303c977f3b", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "9beac8cd192fb54839925b083fa72e611d7bcfee", "version": "1.7.0", diff --git a/external_imported/vcpkg/versions/h-/hwloc.json b/external_imported/vcpkg/versions/h-/hwloc.json index f3f40d96a..1e09f8aa0 100644 --- a/external_imported/vcpkg/versions/h-/hwloc.json +++ b/external_imported/vcpkg/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ce0161512ee6cc0ef1f2e68a6c73db63422f0ee", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961", "version": "2.7.0", diff --git a/external_imported/vcpkg/versions/h-/hyperscan.json b/external_imported/vcpkg/versions/h-/hyperscan.json index 7003a0102..432e36530 100644 --- a/external_imported/vcpkg/versions/h-/hyperscan.json +++ b/external_imported/vcpkg/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72c36aba3fff7cd403bdf02ad8f691ced9da30a9", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "14beb85ac3a741f5504afa923832eb651795f530", "version-string": "5.3.0", diff --git a/external_imported/vcpkg/versions/i-/icu.json b/external_imported/vcpkg/versions/i-/icu.json index fe4be9d2f..0829a549a 100644 --- a/external_imported/vcpkg/versions/i-/icu.json +++ b/external_imported/vcpkg/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13fe0c9056059654ea7e482cd06ff70c26f9e029", + "version": "71.1", + "port-version": 0 + }, { "git-tree": "2d082108b0899697c9b6253c260188728374e56b", "version": "70.1", diff --git a/external_imported/vcpkg/versions/i-/ideviceinstaller.json b/external_imported/vcpkg/versions/i-/ideviceinstaller.json index 4ca28ad90..666d716a5 100644 --- a/external_imported/vcpkg/versions/i-/ideviceinstaller.json +++ b/external_imported/vcpkg/versions/i-/ideviceinstaller.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38626b7d6489e6842528257d8a38b2dd31627720", + "version-string": "1.1.2.23", + "port-version": 3 + }, { "git-tree": "3f0f8f093c1597406cdf0695b26403a2ec969baa", "version-string": "1.1.2.23", diff --git a/external_imported/vcpkg/versions/i-/ignition-cmake0.json b/external_imported/vcpkg/versions/i-/ignition-cmake0.json index b2bb0cf30..b34232575 100644 --- a/external_imported/vcpkg/versions/i-/ignition-cmake0.json +++ b/external_imported/vcpkg/versions/i-/ignition-cmake0.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd21340a3227e51353676cc9147ba3d759fcaf6d", + "version": "0.6.2", + "port-version": 4 + }, { "git-tree": "de484d582fc076a89f57fde7db6944eb57c006df", "version-string": "0.6.2", diff --git a/external_imported/vcpkg/versions/i-/ignition-cmake2.json b/external_imported/vcpkg/versions/i-/ignition-cmake2.json index 42b3ed613..652bc5f9c 100644 --- a/external_imported/vcpkg/versions/i-/ignition-cmake2.json +++ b/external_imported/vcpkg/versions/i-/ignition-cmake2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "04ad74fe00ed7c2030aec3e27fc0beaaf2c90bf8", + "version": "2.5.0", + "port-version": 3 + }, + { + "git-tree": "d146d55be3a48e481af0a87660c44ce2a7b5cb11", + "version": "2.5.0", + "port-version": 2 + }, { "git-tree": "6c12bb698575d2b7cff16d177c2601ab195041fa", "version": "2.5.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-common1.json b/external_imported/vcpkg/versions/i-/ignition-common1.json index 6dafbea52..8ec4ff082 100644 --- a/external_imported/vcpkg/versions/i-/ignition-common1.json +++ b/external_imported/vcpkg/versions/i-/ignition-common1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7759642adcf3e61cc1ce5b55699db02d31a94591", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "6e4a5f2f998f4730002bd95e92251b77e757d6b2", "version-string": "1.1.1", diff --git a/external_imported/vcpkg/versions/i-/ignition-common3.json b/external_imported/vcpkg/versions/i-/ignition-common3.json index ccad732b9..b34807520 100644 --- a/external_imported/vcpkg/versions/i-/ignition-common3.json +++ b/external_imported/vcpkg/versions/i-/ignition-common3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6dc33f01d43ba86ec811a09138434f76815a40c8", + "version": "3.9.0", + "port-version": 4 + }, + { + "git-tree": "929c84951a63b65c9dd48f73a4a7147ae5a1779b", + "version": "3.9.0", + "port-version": 3 + }, { "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3", "version-string": "3.9.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-fuel-tools1.json b/external_imported/vcpkg/versions/i-/ignition-fuel-tools1.json index 539d737ff..4aa3ad3e0 100644 --- a/external_imported/vcpkg/versions/i-/ignition-fuel-tools1.json +++ b/external_imported/vcpkg/versions/i-/ignition-fuel-tools1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2809092ee332d969d0c3d7953010b2a3aed0b801", + "version": "1.2.0", + "port-version": 4 + }, { "git-tree": "9c9a312b5c09cc860b8cbc810d68ba5a17bd7afb", "version-string": "1.2.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-fuel-tools4.json b/external_imported/vcpkg/versions/i-/ignition-fuel-tools4.json index ecb8fd1c3..4819f0c7e 100644 --- a/external_imported/vcpkg/versions/i-/ignition-fuel-tools4.json +++ b/external_imported/vcpkg/versions/i-/ignition-fuel-tools4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "168bd907379d81e0af580ea8f5cad0a9e448469e", + "version": "4.3.0", + "port-version": 2 + }, { "git-tree": "e6f7783701420adbe90b861a5a96130bd87f114e", "version-string": "4.3.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-math4.json b/external_imported/vcpkg/versions/i-/ignition-math4.json index 0448bf757..072a925ff 100644 --- a/external_imported/vcpkg/versions/i-/ignition-math4.json +++ b/external_imported/vcpkg/versions/i-/ignition-math4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3de1aed28c6b2599a41fa1fe4ef45fd447f988", + "version": "4.0.0", + "port-version": 3 + }, { "git-tree": "0312d0e2b91d2e465a1464c83a17dfb5fbe57e4a", "version-string": "4.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-math6.json b/external_imported/vcpkg/versions/i-/ignition-math6.json index a1220d2ba..4fa097963 100644 --- a/external_imported/vcpkg/versions/i-/ignition-math6.json +++ b/external_imported/vcpkg/versions/i-/ignition-math6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb148027e8b1f6b1c6a47500140fa02467911e26", + "version": "6.6.0", + "port-version": 3 + }, { "git-tree": "7fda0a4d654c39cd30c400919981ea71675f696f", "version-string": "6.6.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-modularscripts.json b/external_imported/vcpkg/versions/i-/ignition-modularscripts.json index 2ee4650be..1ee29b448 100644 --- a/external_imported/vcpkg/versions/i-/ignition-modularscripts.json +++ b/external_imported/vcpkg/versions/i-/ignition-modularscripts.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ae302700b77870b26543f2df7764304d848c198a", + "version-date": "2022-05-11", + "port-version": 1 + }, + { + "git-tree": "d834091edb40475a3e9f55455ff532f3ac629142", + "version-date": "2022-05-11", + "port-version": 0 + }, { "git-tree": "0b00233924c15f702784cb2342b469771125c3a5", "version-string": "2020-11-23", diff --git a/external_imported/vcpkg/versions/i-/ignition-msgs1.json b/external_imported/vcpkg/versions/i-/ignition-msgs1.json index d0a2b7844..89799ae23 100644 --- a/external_imported/vcpkg/versions/i-/ignition-msgs1.json +++ b/external_imported/vcpkg/versions/i-/ignition-msgs1.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "61644519b91178792399cda9a6f03cb8d7651eaf", + "version": "1.0.0", + "port-version": 6 + }, + { + "git-tree": "b906441e45012934421ddd0ad823bb7324939dd8", + "version": "1.0.0", + "port-version": 5 + }, { "git-tree": "7155088669524bfd132aaab6af9f7257e8bfde54", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-msgs5.json b/external_imported/vcpkg/versions/i-/ignition-msgs5.json index a2fcd4fd2..8276981c2 100644 --- a/external_imported/vcpkg/versions/i-/ignition-msgs5.json +++ b/external_imported/vcpkg/versions/i-/ignition-msgs5.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a7de105c1d93f5c86e6ee624d65fe1bd8d9a2beb", + "version": "5.3.0", + "port-version": 6 + }, + { + "git-tree": "ca89a878842c0d94483430295c59f9c24eb607bb", + "version": "5.3.0", + "port-version": 5 + }, { "git-tree": "a77594480a911b7648ca1ad24a575b826ddc2a9a", "version": "5.3.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-msgs6.json b/external_imported/vcpkg/versions/i-/ignition-msgs6.json index 4d1447919..2b167f3bd 100644 --- a/external_imported/vcpkg/versions/i-/ignition-msgs6.json +++ b/external_imported/vcpkg/versions/i-/ignition-msgs6.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "809e114122aec8103638b9c376b883f59376b1a1", + "version": "6.0.0", + "port-version": 5 + }, + { + "git-tree": "a15e3cd08c8481cb639dc9b741ea55df597f6cf8", + "version": "6.0.0", + "port-version": 4 + }, { "git-tree": "99d4ba95339db124ba068ea2b7fe9cf53d648da3", "version": "6.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-plugin1.json b/external_imported/vcpkg/versions/i-/ignition-plugin1.json index 5a8a0a6c1..b9db2a478 100644 --- a/external_imported/vcpkg/versions/i-/ignition-plugin1.json +++ b/external_imported/vcpkg/versions/i-/ignition-plugin1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f04ba4b936f3f2885c7a463d2a86a1359990931", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "71166ea18bf5f4d4de750b96836b780cd7395c0e", "version-string": "1.1.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-transport4.json b/external_imported/vcpkg/versions/i-/ignition-transport4.json index 916bf8f06..2911cc079 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport4.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "485717373dc99ab0f6f3a6b0ad8fec42bf8e9a9b", + "version": "4.0.0", + "port-version": 6 + }, { "git-tree": "17d4c446fb99c9510ee2324a03529b6fb1119a41", "version": "4.0.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-transport8.json b/external_imported/vcpkg/versions/i-/ignition-transport8.json index c731867f2..06f92d704 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport8.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport8.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "967c8839fce7bd85b58ed1d4a5506a2be278a8ef", + "version": "8.1.0", + "port-version": 4 + }, + { + "git-tree": "df4d904c15b18ca24200a42fdfc4e5930c91618a", + "version": "8.1.0", + "port-version": 3 + }, { "git-tree": "10fb9c7619753767ea31b84db43272712730f32c", "version-string": "8.1.0", diff --git a/external_imported/vcpkg/versions/i-/ignition-transport9.json b/external_imported/vcpkg/versions/i-/ignition-transport9.json index b121adedc..712a03c81 100644 --- a/external_imported/vcpkg/versions/i-/ignition-transport9.json +++ b/external_imported/vcpkg/versions/i-/ignition-transport9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "918e7d23ff4ca98405b40bbdf55f9302b6cb0ed0", + "version": "9.0.0", + "port-version": 4 + }, { "git-tree": "abbc50866e79bb1566460eb88135358ed740268d", "version": "9.0.0", diff --git a/external_imported/vcpkg/versions/i-/igraph.json b/external_imported/vcpkg/versions/i-/igraph.json index a37f62b31..f92ff6017 100644 --- a/external_imported/vcpkg/versions/i-/igraph.json +++ b/external_imported/vcpkg/versions/i-/igraph.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "f2edea91149fdcafafff97f6b08988f440c4ef54", + "version": "0.10.1", + "port-version": 0 + }, + { + "git-tree": "9be9a85091b6cb99b14f88bfcbc205e175ead0f6", + "version": "0.9.10", + "port-version": 0 + }, + { + "git-tree": "c374fc0b09a493a6afbd4c009dd43763b2a9132f", + "version": "0.9.9", + "port-version": 0 + }, + { + "git-tree": "562fb321b0c46134d9b876fe95a3796fd4404b24", + "version": "0.9.8", + "port-version": 2 + }, + { + "git-tree": "635707a7146747b8b5a35ba35d5e94669e499d3b", + "version": "0.9.8", + "port-version": 1 + }, { "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", "version": "0.9.8", diff --git a/external_imported/vcpkg/versions/i-/iir1.json b/external_imported/vcpkg/versions/i-/iir1.json index 9bd18e4ea..3d176ff4d 100644 --- a/external_imported/vcpkg/versions/i-/iir1.json +++ b/external_imported/vcpkg/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b684559e0b19d393deae83fdf6e2182937942a76", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "393a498a50400c062dafdefbbbdbd3d1c3daef4a", "version": "1.9.0", diff --git a/external_imported/vcpkg/versions/i-/ijg-libjpeg.json b/external_imported/vcpkg/versions/i-/ijg-libjpeg.json index d6ce80d44..ab35bd732 100644 --- a/external_imported/vcpkg/versions/i-/ijg-libjpeg.json +++ b/external_imported/vcpkg/versions/i-/ijg-libjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb37d14790c59df2657d83e21009faa54643f19d", + "version-string": "9e", + "port-version": 0 + }, { "git-tree": "320dc4cbe69f8dea86bce50c1445f51f780de1a3", "version-string": "9d", diff --git a/external_imported/vcpkg/versions/i-/ilmbase.json b/external_imported/vcpkg/versions/i-/ilmbase.json index 8c7c55b56..97b9956ec 100644 --- a/external_imported/vcpkg/versions/i-/ilmbase.json +++ b/external_imported/vcpkg/versions/i-/ilmbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6926b258aab64f6946a04ba1f8f23592bfaf44ec", + "version": "3", + "port-version": 0 + }, { "git-tree": "7d1a248f37b30f491ebf4430ee294e1e9018ec44", "version-string": "2.3.0", diff --git a/external_imported/vcpkg/versions/i-/imgui-sfml.json b/external_imported/vcpkg/versions/i-/imgui-sfml.json index 21b4db84f..58f4f6795 100644 --- a/external_imported/vcpkg/versions/i-/imgui-sfml.json +++ b/external_imported/vcpkg/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "998381d4b79034aba39b0fdb7bb6ef3a4187d1fb", + "version": "2.5", + "port-version": 1 + }, { "git-tree": "8ece0f7736052672d61d85745b1fb6a3b1362720", "version": "2.5", diff --git a/external_imported/vcpkg/versions/i-/imgui.json b/external_imported/vcpkg/versions/i-/imgui.json index 0804d5120..e9ccb175b 100644 --- a/external_imported/vcpkg/versions/i-/imgui.json +++ b/external_imported/vcpkg/versions/i-/imgui.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2a4c55df4b895535fba9e3934ed64cef92bf4a4d", + "version": "1.88", + "port-version": 1 + }, + { + "git-tree": "c28ebbdbe22a87ce01c3b2b6c15bed036721c6a0", + "version": "1.88", + "port-version": 0 + }, + { + "git-tree": "647accc743e0af0547fbf8671c170038e202fd1e", + "version": "1.87", + "port-version": 1 + }, { "git-tree": "b9a40068f3905099cc5cb247f1b488d0e27dfd7f", "version": "1.87", diff --git a/external_imported/vcpkg/versions/i-/implot.json b/external_imported/vcpkg/versions/i-/implot.json index 067455617..fb26db802 100644 --- a/external_imported/vcpkg/versions/i-/implot.json +++ b/external_imported/vcpkg/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba255028c68d4a1e37f4dc1a360b892f067f9c45", + "version": "0.14", + "port-version": 0 + }, { "git-tree": "6166fdfe50da875e98426577b0fd64e8c26c924c", "version": "0.13", diff --git a/external_imported/vcpkg/versions/i-/influxdb-cxx.json b/external_imported/vcpkg/versions/i-/influxdb-cxx.json index 310b08ecb..0318e65be 100644 --- a/external_imported/vcpkg/versions/i-/influxdb-cxx.json +++ b/external_imported/vcpkg/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eba82142d2afb448bc5295fe22e0849cd0f8ca7", + "version-date": "2022-09-02", + "port-version": 0 + }, { "git-tree": "9403a6547a2dbd42b86d686c2ecd7a3e7344f13a", "version": "0.6.7", diff --git a/external_imported/vcpkg/versions/i-/inih.json b/external_imported/vcpkg/versions/i-/inih.json index ef0781ca2..000f4f53b 100644 --- a/external_imported/vcpkg/versions/i-/inih.json +++ b/external_imported/vcpkg/versions/i-/inih.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccae9a4d18198ac2d9303cac12c4dbb1fbe0bf24", + "version": "56", + "port-version": 0 + }, { "git-tree": "de1d85a0ea62e95bd096ecff062115646742cf1e", "version-string": "51", diff --git a/external_imported/vcpkg/versions/i-/iniparser.json b/external_imported/vcpkg/versions/i-/iniparser.json index 4e334c1bf..a52fdeec1 100644 --- a/external_imported/vcpkg/versions/i-/iniparser.json +++ b/external_imported/vcpkg/versions/i-/iniparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1a9b214d253fa9d677b4ed158bd5e0d0e4e8a31", + "version-date": "2020-04-06", + "port-version": 3 + }, { "git-tree": "4c89c4448c92e7d793775802d4d6cba832af7457", "version-string": "2020-04-06", diff --git a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json index 079529415..fdeefa02e 100644 --- a/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json +++ b/external_imported/vcpkg/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47e6c0bf433235a53c450a3c1c61388a10a643e0", + "version-string": "20U2", + "port-version": 4 + }, { "git-tree": "b105f0256b4fccc53e7653a732dc65459e1d8562", "version-string": "20U2", diff --git a/external_imported/vcpkg/versions/i-/isal.json b/external_imported/vcpkg/versions/i-/isal.json index bb1ef772d..978fd2dc3 100644 --- a/external_imported/vcpkg/versions/i-/isal.json +++ b/external_imported/vcpkg/versions/i-/isal.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "182dacba1a91116c56c83ede14decd8879b86cf7", + "version": "2.30.0", + "port-version": 0 + }, + { + "git-tree": "7fa8499c557c19920d80318d9a1999922cd28663", + "version": "2.25.0", + "port-version": 3 + }, + { + "git-tree": "121b0c9241ea1f704bf6cb9ad5f010f6ae732dd0", + "version": "2.25.0", + "port-version": 2 + }, { "git-tree": "35b65a5fbb2ff6cd6468e1c02565a4b999d2a442", "version-string": "2.25.0", diff --git a/external_imported/vcpkg/versions/i-/ixwebsocket.json b/external_imported/vcpkg/versions/i-/ixwebsocket.json index 7db4ef058..0c4f7fde8 100644 --- a/external_imported/vcpkg/versions/i-/ixwebsocket.json +++ b/external_imported/vcpkg/versions/i-/ixwebsocket.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c5abcb4348cb05507367eeaac8fb075c5cf8ed35", + "version-semver": "11.4.3", + "port-version": 0 + }, + { + "git-tree": "35c2086eecc92cd95482b875fd1ec843eb233f94", + "version-semver": "11.4.2", + "port-version": 0 + }, { "git-tree": "59a791c16bb7cf163c801d50013cafd8ae9b94a7", "version-semver": "11.3.3", diff --git a/external_imported/vcpkg/versions/j-/jack2.json b/external_imported/vcpkg/versions/j-/jack2.json index 057fecc05..a3105dccd 100644 --- a/external_imported/vcpkg/versions/j-/jack2.json +++ b/external_imported/vcpkg/versions/j-/jack2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84f683fbf07cae4c021f1d0d5fd5cab7b58d991e", + "version-semver": "1.9.21", + "port-version": 0 + }, { "git-tree": "f5494181c269f8b65a26fd702664bfde1a3f2e3f", "version-semver": "1.9.19", diff --git a/external_imported/vcpkg/versions/j-/jansson.json b/external_imported/vcpkg/versions/j-/jansson.json index 6ee487746..50a364af9 100644 --- a/external_imported/vcpkg/versions/j-/jansson.json +++ b/external_imported/vcpkg/versions/j-/jansson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f284c9aba6b994cb6fe175b675976d34257b4c85", + "version": "2.14", + "port-version": 1 + }, + { + "git-tree": "1a5c55feab368e4bfb40be993b9ea5a39fc82f51", + "version": "2.14", + "port-version": 0 + }, { "git-tree": "f63fad0d7e1e2a98826543c3b1f671c34b104a72", "version-string": "2.13.1", diff --git a/external_imported/vcpkg/versions/j-/jasper.json b/external_imported/vcpkg/versions/j-/jasper.json index 00ce7cf1e..f13ac321f 100644 --- a/external_imported/vcpkg/versions/j-/jasper.json +++ b/external_imported/vcpkg/versions/j-/jasper.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "fb8dca022aa130726431991cc9c70cc3162ea657", + "version": "2.0.33", + "port-version": 6 + }, + { + "git-tree": "e5220ea6a54e25d777f853a2c77196be67da02f3", + "version": "2.0.33", + "port-version": 5 + }, + { + "git-tree": "5cc65b3d32490a3fd1bd1768188b905a873af2ef", + "version": "2.0.33", + "port-version": 4 + }, { "git-tree": "caf8b5e479138be21f8a7782806e9ef5c1dcdb37", "version": "2.0.33", diff --git a/external_imported/vcpkg/versions/j-/jemalloc.json b/external_imported/vcpkg/versions/j-/jemalloc.json index a27e65c4c..447406220 100644 --- a/external_imported/vcpkg/versions/j-/jemalloc.json +++ b/external_imported/vcpkg/versions/j-/jemalloc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "96ec9736a357ac7af9b108bcc8e9d237cfb18a43", + "version": "5.3.0", + "port-version": 1 + }, + { + "git-tree": "6baf5d3d5e323c49a4f91a2e67f778421af4a4c5", + "version": "5.3.0", + "port-version": 0 + }, { "git-tree": "0ced62e7a268f8442b2e808df7b094afe8998c38", "version-string": "4.3.1", diff --git a/external_imported/vcpkg/versions/j-/json-c.json b/external_imported/vcpkg/versions/j-/json-c.json index 34a233e6d..b08334fc8 100644 --- a/external_imported/vcpkg/versions/j-/json-c.json +++ b/external_imported/vcpkg/versions/j-/json-c.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2090ebb6a6e0be1d0f6331c266bd0bc6eef1cd57", + "version-date": "2022-06-26", + "port-version": 2 + }, + { + "git-tree": "c24e9a9cbc53b10a7235087cc58e89924415b281", + "version-date": "2022-06-26", + "port-version": 1 + }, + { + "git-tree": "84aaadc268ad278e102cdd7e9526e5c5929c1cd6", + "version-date": "2022-06-26", + "port-version": 0 + }, { "git-tree": "5c8d00d59a40b54cc9400f045b62e439740c2909", "version-string": "2019-09-10", diff --git a/external_imported/vcpkg/versions/j-/jsoncons.json b/external_imported/vcpkg/versions/j-/jsoncons.json index 8ef14f506..097a7f1d1 100644 --- a/external_imported/vcpkg/versions/j-/jsoncons.json +++ b/external_imported/vcpkg/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d8c58c4275c63e12b3a23413421609cc35ba4e", + "version": "0.168.7", + "port-version": 0 + }, { "git-tree": "ee0a71fa7021ce4daf9c225529489e7e1da7f10a", "version-string": "0.168.3", diff --git a/external_imported/vcpkg/versions/j-/jsonnet.json b/external_imported/vcpkg/versions/j-/jsonnet.json index f3dcfe0c2..2eb4d1b35 100644 --- a/external_imported/vcpkg/versions/j-/jsonnet.json +++ b/external_imported/vcpkg/versions/j-/jsonnet.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8", + "version": "0.18.0", + "port-version": 1 + }, + { + "git-tree": "1ac55d2bf1f121bd14e748bbf55569a49a9015d9", + "version": "0.18.0", + "port-version": 0 + }, { "git-tree": "24a514c5bcece6b71ac13744ec40f92f285fc689", "version": "0.17.0", diff --git a/external_imported/vcpkg/versions/j-/jwt-cpp.json b/external_imported/vcpkg/versions/j-/jwt-cpp.json index 5cab5fb68..a12705fe0 100644 --- a/external_imported/vcpkg/versions/j-/jwt-cpp.json +++ b/external_imported/vcpkg/versions/j-/jwt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d1a0be50079d7774b6807b914518a3028477096", + "version-semver": "0.6.0", + "port-version": 0 + }, { "git-tree": "fbec7fade6b949737e531b1e5f57133e592edf96", "version-semver": "0.5.1", diff --git a/external_imported/vcpkg/versions/j-/jxrlib.json b/external_imported/vcpkg/versions/j-/jxrlib.json index 4995aa67e..9689aa86e 100644 --- a/external_imported/vcpkg/versions/j-/jxrlib.json +++ b/external_imported/vcpkg/versions/j-/jxrlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faadd72c2d406fce9c076c025285aa692995a8b5", + "version": "2019.10.9", + "port-version": 4 + }, { "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f", "version": "2019.10.9", diff --git a/external_imported/vcpkg/versions/k-/kangaru.json b/external_imported/vcpkg/versions/k-/kangaru.json index e0cf6d2f7..8e22f1070 100644 --- a/external_imported/vcpkg/versions/k-/kangaru.json +++ b/external_imported/vcpkg/versions/k-/kangaru.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "194f665c94fecadc626ab9431003eec963a6820d", + "version": "4.3.1", + "port-version": 0 + }, + { + "git-tree": "b6015882a3de991781c67d93b4c470aafcdd3e2b", + "version": "4.3.0", + "port-version": 0 + }, { "git-tree": "e47bf7620670afbcbb349017d71275289fa9b6a9", "version-string": "4.2.4", diff --git a/external_imported/vcpkg/versions/k-/kf5archive.json b/external_imported/vcpkg/versions/k-/kf5archive.json index ab9038bb7..5674d6c43 100644 --- a/external_imported/vcpkg/versions/k-/kf5archive.json +++ b/external_imported/vcpkg/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "200f5a032c9615fb66ad30f53671cb39b776c270", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "2eafcdc8cb04d2ec80f9beb89254ca4f74616a07", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5attica.json b/external_imported/vcpkg/versions/k-/kf5attica.json index 65f356aee..a8c52afa7 100644 --- a/external_imported/vcpkg/versions/k-/kf5attica.json +++ b/external_imported/vcpkg/versions/k-/kf5attica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b57c9ffcaa73c2b461946b692ec5b73cb6c4be9", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "1ef9b989e525f13878a113dcd3ac801efe6d3b7b", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5auth.json b/external_imported/vcpkg/versions/k-/kf5auth.json index e965941bd..6cdabd5d9 100644 --- a/external_imported/vcpkg/versions/k-/kf5auth.json +++ b/external_imported/vcpkg/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b48f53d5ccd018dedbc8489fecb94272c00a693", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "e2f603c61a444935527c7c0a3e6f3871dc8de3df", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5bookmarks.json b/external_imported/vcpkg/versions/k-/kf5bookmarks.json index 35c965c0a..ae015025b 100644 --- a/external_imported/vcpkg/versions/k-/kf5bookmarks.json +++ b/external_imported/vcpkg/versions/k-/kf5bookmarks.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cd5cb169adf05127a9593b836443a7cf0caf7b9", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "4d1a01a9c81b7126f63ac11f2729498f93d56903", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5codecs.json b/external_imported/vcpkg/versions/k-/kf5codecs.json index 05b772b73..0b6981061 100644 --- a/external_imported/vcpkg/versions/k-/kf5codecs.json +++ b/external_imported/vcpkg/versions/k-/kf5codecs.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b6719ea6680496a4d022d37b8508a82929efa269", + "version": "5.89.0", + "port-version": 2 + }, + { + "git-tree": "3f089e2bf752a07b60871e0cbc1bcdf085b3e7fd", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "689fa05db3db3ea404ccec181b0a8bba8e614562", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5completion.json b/external_imported/vcpkg/versions/k-/kf5completion.json index c76749705..9c5aa246d 100644 --- a/external_imported/vcpkg/versions/k-/kf5completion.json +++ b/external_imported/vcpkg/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0056d39621f6e5c5835fb0c43f341c4c7814cb3c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "883845542162455b20188292bdf1cbcad36615ef", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5config.json b/external_imported/vcpkg/versions/k-/kf5config.json index 7f60f5810..b0dc665ef 100644 --- a/external_imported/vcpkg/versions/k-/kf5config.json +++ b/external_imported/vcpkg/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "889c81ade9cc8884e33b26cf2a53a4438f36ac73", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5configwidgets.json b/external_imported/vcpkg/versions/k-/kf5configwidgets.json index 9a78dc931..6e284a33e 100644 --- a/external_imported/vcpkg/versions/k-/kf5configwidgets.json +++ b/external_imported/vcpkg/versions/k-/kf5configwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49a14e655f74489ffbb31381c530f5cfbae085f5", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "321b0a6c4261d5a3bcf760d5010e388b6297e3d5", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5coreaddons.json b/external_imported/vcpkg/versions/k-/kf5coreaddons.json index f89e710d9..fbf60a8db 100644 --- a/external_imported/vcpkg/versions/k-/kf5coreaddons.json +++ b/external_imported/vcpkg/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "871ce017f9d68b32eae29502a4e235d4b56ffa5c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "6431d962993955c520f26f0c6d28f4cdaf5cfdea", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5crash.json b/external_imported/vcpkg/versions/k-/kf5crash.json index 6c4dc8cc9..911c6046f 100644 --- a/external_imported/vcpkg/versions/k-/kf5crash.json +++ b/external_imported/vcpkg/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e580a5e3144b93a7d4b28aeb00ee6f3c4853158", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "09f21ea5657354bd2e6a725f7c6b9e8e6b47af68", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5dbusaddons.json b/external_imported/vcpkg/versions/k-/kf5dbusaddons.json index 236a730e6..6b5682ea3 100644 --- a/external_imported/vcpkg/versions/k-/kf5dbusaddons.json +++ b/external_imported/vcpkg/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa7c4e3746bad3e33f18004fbc3e27f174565d5b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "86fe61a2bf5e56705d1c90e61f355a08328d2886", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5declarative.json b/external_imported/vcpkg/versions/k-/kf5declarative.json index 6892e7ecf..bd8a5abc4 100644 --- a/external_imported/vcpkg/versions/k-/kf5declarative.json +++ b/external_imported/vcpkg/versions/k-/kf5declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efd6146040b9f86326574988e82191cbf8a23590", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "0e7f25daab01ec329e68aafcb705359e9c341bee", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5diagram.json b/external_imported/vcpkg/versions/k-/kf5diagram.json index 1dbe75336..349194e2f 100644 --- a/external_imported/vcpkg/versions/k-/kf5diagram.json +++ b/external_imported/vcpkg/versions/k-/kf5diagram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50871666a977c4954a0bd35a068c7dcfb83a4fba", + "version": "2.8.0", + "port-version": 1 + }, { "git-tree": "934ea388abb43f4946b4473a2b74cba0bf6b1e5c", "version": "2.8.0", diff --git a/external_imported/vcpkg/versions/k-/kf5globalaccel.json b/external_imported/vcpkg/versions/k-/kf5globalaccel.json index 964957155..c16e1810a 100644 --- a/external_imported/vcpkg/versions/k-/kf5globalaccel.json +++ b/external_imported/vcpkg/versions/k-/kf5globalaccel.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "12a2d7458be3768c8fefca6986a678aad429b66e", + "version": "5.89.0", + "port-version": 3 + }, + { + "git-tree": "610034ef9764b5d45569588235e9a5838ae05757", + "version": "5.89.0", + "port-version": 2 + }, + { + "git-tree": "5a4dc9bc81874eec1192fa77b8a04ab67fb75239", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "186e5eaf6182ee6c12a1543aad61a2d317dbe90b", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5guiaddons.json b/external_imported/vcpkg/versions/k-/kf5guiaddons.json index 5b8edfdee..fcc18e489 100644 --- a/external_imported/vcpkg/versions/k-/kf5guiaddons.json +++ b/external_imported/vcpkg/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37f004eb6d5e6377d161abf76991be133c2ad2f1", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "1d532e40b86e82f54d1cec8ea0752168dac149b0", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5holidays.json b/external_imported/vcpkg/versions/k-/kf5holidays.json index 82a72f220..224435004 100644 --- a/external_imported/vcpkg/versions/k-/kf5holidays.json +++ b/external_imported/vcpkg/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1e843d6b36f5866cb578d7151ace6f4c42f67fb", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5i18n.json b/external_imported/vcpkg/versions/k-/kf5i18n.json index 81f997bcd..6268bd8d3 100644 --- a/external_imported/vcpkg/versions/k-/kf5i18n.json +++ b/external_imported/vcpkg/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f5d368735b3d217ffc3353be0a8d85d5eaa8e85", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "714138715b9030eceab63caba6085c4c9cd2e6d5", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5iconthemes.json b/external_imported/vcpkg/versions/k-/kf5iconthemes.json index bc60ee134..ab99bdfaa 100644 --- a/external_imported/vcpkg/versions/k-/kf5iconthemes.json +++ b/external_imported/vcpkg/versions/k-/kf5iconthemes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f24fa167b4438332ec95d1202d0bafa55e0047f6", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "6ff2f989294b0c0487ff5049498efb10571334eb", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5itemmodels.json b/external_imported/vcpkg/versions/k-/kf5itemmodels.json index e55f871fd..8eafd5e04 100644 --- a/external_imported/vcpkg/versions/k-/kf5itemmodels.json +++ b/external_imported/vcpkg/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "705a7782c204e337e6d9e1a8b6012d9666fa5f1c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "a97d6d3556bddd30d108f13e831789b8cc9c1de9", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5itemviews.json b/external_imported/vcpkg/versions/k-/kf5itemviews.json index 22853ab6c..ed43c48d7 100644 --- a/external_imported/vcpkg/versions/k-/kf5itemviews.json +++ b/external_imported/vcpkg/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b8749cec5799435ad29e1a21bd957f4b212789b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "8cdccbe27ce997559f69d74f6267c3cbfd294e1e", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5jobwidgets.json b/external_imported/vcpkg/versions/k-/kf5jobwidgets.json index 18cf0763e..ced280ce1 100644 --- a/external_imported/vcpkg/versions/k-/kf5jobwidgets.json +++ b/external_imported/vcpkg/versions/k-/kf5jobwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5eaddef9be54d6df981f7068082a2de2c03f50e", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "f608e47e7f8135de9e7c172bc168e8a444801e66", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5kcmutils.json b/external_imported/vcpkg/versions/k-/kf5kcmutils.json index 9671fe955..90b4bc7fb 100644 --- a/external_imported/vcpkg/versions/k-/kf5kcmutils.json +++ b/external_imported/vcpkg/versions/k-/kf5kcmutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "750360181cf0718e672e8fce8f47f252a6282c2b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "e57e3f3eda8ac0230b4f7e7bb31abd02c766398c", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5kio.json b/external_imported/vcpkg/versions/k-/kf5kio.json index b868ba249..2b11e9575 100644 --- a/external_imported/vcpkg/versions/k-/kf5kio.json +++ b/external_imported/vcpkg/versions/k-/kf5kio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ac545c09ad339684b43c2a6eb74b034f4ee1f25", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "644d4ef87d5683404a3b034195c07a982fc45979", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5newstuff.json b/external_imported/vcpkg/versions/k-/kf5newstuff.json index 368f1e2bc..2499cc5d1 100644 --- a/external_imported/vcpkg/versions/k-/kf5newstuff.json +++ b/external_imported/vcpkg/versions/k-/kf5newstuff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bc9c597ba5d97881249280f95c0e47256f11fec", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "7295ad1e62fd07e6aa74fb1d4fe0562e4f6b5ecb", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5notifications.json b/external_imported/vcpkg/versions/k-/kf5notifications.json index 4916ba0c5..25c2984d3 100644 --- a/external_imported/vcpkg/versions/k-/kf5notifications.json +++ b/external_imported/vcpkg/versions/k-/kf5notifications.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d1cf6886532e33f979d0ea01db8f00f855ffd85", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "86baef519df4a14115be8d39ddac5b3c9df751cb", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5package.json b/external_imported/vcpkg/versions/k-/kf5package.json index 1dbec4e0b..c5dbf5d6d 100644 --- a/external_imported/vcpkg/versions/k-/kf5package.json +++ b/external_imported/vcpkg/versions/k-/kf5package.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a2ffee582428d57ac7ffcbc9b84b175fd4f7dd6", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "0c7ba772f4a36a4bec3f1a573c124cc812cce788", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5plotting.json b/external_imported/vcpkg/versions/k-/kf5plotting.json index a5fd11df7..e9add2480 100644 --- a/external_imported/vcpkg/versions/k-/kf5plotting.json +++ b/external_imported/vcpkg/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a310fc3ab59198518b01efdd979941b8d23866d5", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5service.json b/external_imported/vcpkg/versions/k-/kf5service.json index bf52e5fb2..a62f7edb4 100644 --- a/external_imported/vcpkg/versions/k-/kf5service.json +++ b/external_imported/vcpkg/versions/k-/kf5service.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b907d7007202c4bc425b82c4fde84702dae9dd8a", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "8c834b6365035b2fcdd1996f3105456474f1b8a7", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5solid.json b/external_imported/vcpkg/versions/k-/kf5solid.json index 5fe748f91..04b14d587 100644 --- a/external_imported/vcpkg/versions/k-/kf5solid.json +++ b/external_imported/vcpkg/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd69d4aaf53197f9f93af1378d98a01ee68c5ec1", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "769197391a9b8b1f614405d61e05361915dffdc2", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5sonnet.json b/external_imported/vcpkg/versions/k-/kf5sonnet.json index 1e8eb71d0..6d9fcc51c 100644 --- a/external_imported/vcpkg/versions/k-/kf5sonnet.json +++ b/external_imported/vcpkg/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53b534ea7faff1d7803c333319a76fbd3c4245e3", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "4befb84624256110ee9b61eef7b2a38bed809274", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5syntaxhighlighting.json b/external_imported/vcpkg/versions/k-/kf5syntaxhighlighting.json index 2354bb6ee..eae97dd55 100644 --- a/external_imported/vcpkg/versions/k-/kf5syntaxhighlighting.json +++ b/external_imported/vcpkg/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1a612321aa345449388a6479bd9ec591c74fcfe", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "604681b0df59a2cc8cf1d69d8a355a9eecf59328", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5textwidgets.json b/external_imported/vcpkg/versions/k-/kf5textwidgets.json index fb59ad5cd..1d0aec34b 100644 --- a/external_imported/vcpkg/versions/k-/kf5textwidgets.json +++ b/external_imported/vcpkg/versions/k-/kf5textwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "386be7174ae0c7933126a345673f7627d23338ad", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "5010e707b462a2d020694963f2e6d9affdea6db2", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5wallet.json b/external_imported/vcpkg/versions/k-/kf5wallet.json index 879900175..438c1b05b 100644 --- a/external_imported/vcpkg/versions/k-/kf5wallet.json +++ b/external_imported/vcpkg/versions/k-/kf5wallet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c999c1fac42e446c163683aff3b737a34ab86369", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "7cdf30cbdbee449144de7e7f145e7e91ebd3aecb", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5widgetsaddons.json b/external_imported/vcpkg/versions/k-/kf5widgetsaddons.json index d274e7fe5..2d111959f 100644 --- a/external_imported/vcpkg/versions/k-/kf5widgetsaddons.json +++ b/external_imported/vcpkg/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cd66a59a38a228b3344621b1c7e5077d0e189f8", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "82e07e830a46ae869835ac36c61a1c4ea05542d3", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5windowsystem.json b/external_imported/vcpkg/versions/k-/kf5windowsystem.json index cb45d7f75..3c6ac1851 100644 --- a/external_imported/vcpkg/versions/k-/kf5windowsystem.json +++ b/external_imported/vcpkg/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce5cc90a2d071246c1fbdb3240be60ae240d1566", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "a15cfdf8b903d0aca25ec242187172a32f15d210", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kf5xmlgui.json b/external_imported/vcpkg/versions/k-/kf5xmlgui.json index 358cc452a..80bb0b04c 100644 --- a/external_imported/vcpkg/versions/k-/kf5xmlgui.json +++ b/external_imported/vcpkg/versions/k-/kf5xmlgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3805659c0182f6360c9a25ba03623268f48dbfe", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "ef8256a376b36bf9971b1788e88f4332146a1558", "version": "5.89.0", diff --git a/external_imported/vcpkg/versions/k-/kfr.json b/external_imported/vcpkg/versions/k-/kfr.json index 863c2a4f9..061ac339e 100644 --- a/external_imported/vcpkg/versions/k-/kfr.json +++ b/external_imported/vcpkg/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7465d297a8018bccb142249ed62bf26481608837", + "version-semver": "4.2.1", + "port-version": 2 + }, { "git-tree": "76c0a2397fec739067cac1a9970c113ed47341b1", "version-semver": "4.2.1", diff --git a/external_imported/vcpkg/versions/k-/kinectsdk1.json b/external_imported/vcpkg/versions/k-/kinectsdk1.json index 263c42573..5c8c5bfc2 100644 --- a/external_imported/vcpkg/versions/k-/kinectsdk1.json +++ b/external_imported/vcpkg/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "688e49039e9c86fcb57c431b527a7f125a996857", + "version": "1.8", + "port-version": 5 + }, { "git-tree": "d49f0532a6e9776666ef3960a9b267f32ff3cfc4", "version": "1.8", diff --git a/external_imported/vcpkg/versions/k-/kinectsdk2.json b/external_imported/vcpkg/versions/k-/kinectsdk2.json index 0243bb1b4..418b22af4 100644 --- a/external_imported/vcpkg/versions/k-/kinectsdk2.json +++ b/external_imported/vcpkg/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fc9568898ab7f14edea8ffb65da87161c9c0b6c", + "version": "2.0", + "port-version": 4 + }, { "git-tree": "a0a13df11c972355370eef866bd266e2ae7c90d5", "version-string": "2.0", diff --git a/external_imported/vcpkg/versions/k-/ktx.json b/external_imported/vcpkg/versions/k-/ktx.json index 98609c3f7..cb174b45c 100644 --- a/external_imported/vcpkg/versions/k-/ktx.json +++ b/external_imported/vcpkg/versions/k-/ktx.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e8a49dcd008235323faeb7a266a0b04a8487a11c", + "version-semver": "4.1.0-rc2", + "port-version": 0 + }, + { + "git-tree": "70ff7e521be27f851d96a9d69016fe3c58abe74d", + "version-semver": "4.1.0-rc1", + "port-version": 0 + }, { "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5", "version": "4.0.0", diff --git a/external_imported/vcpkg/versions/k-/kubazip.json b/external_imported/vcpkg/versions/k-/kubazip.json index 1286e2b6f..f895e05b2 100644 --- a/external_imported/vcpkg/versions/k-/kubazip.json +++ b/external_imported/vcpkg/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14bf9d5b15ecf5769d10e5000e74167e97b0ade1", + "version": "0.2.4", + "port-version": 0 + }, { "git-tree": "131416be9d3de3fccb254751a17cd78e1252b464", "version-string": "0.1.19", diff --git a/external_imported/vcpkg/versions/l-/lapack-reference.json b/external_imported/vcpkg/versions/l-/lapack-reference.json index 999e4f135..c5f07c06b 100644 --- a/external_imported/vcpkg/versions/l-/lapack-reference.json +++ b/external_imported/vcpkg/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ad48321efe7014cd1dc7ab7b46516309e6c395", + "version": "3.10.1", + "port-version": 0 + }, { "git-tree": "14b5e3ab7315ce36951f759c6254712ed41cc0af", "version": "3.10.0", diff --git a/external_imported/vcpkg/versions/l-/lcm.json b/external_imported/vcpkg/versions/l-/lcm.json index a0cb98da0..b96eabc77 100644 --- a/external_imported/vcpkg/versions/l-/lcm.json +++ b/external_imported/vcpkg/versions/l-/lcm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4277e71373ff869df31475afceb6b2e6881e4650", + "version": "1.4.0", + "port-version": 4 + }, + { + "git-tree": "0fda8029241e6ff01935878156cd1c9cd2f3fe68", + "version": "1.4.0", + "port-version": 3 + }, { "git-tree": "2094a87ea105e0b1d78db96519581cda97d527e2", "version": "1.4.0", diff --git a/external_imported/vcpkg/versions/l-/lcms.json b/external_imported/vcpkg/versions/l-/lcms.json index 5253e4224..65c76959c 100644 --- a/external_imported/vcpkg/versions/l-/lcms.json +++ b/external_imported/vcpkg/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "220d2255b3f13ec7b0266393d65c674f5c060c2b", + "version": "2.12", + "port-version": 4 + }, { "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", "version": "2.12", diff --git a/external_imported/vcpkg/versions/l-/lerc.json b/external_imported/vcpkg/versions/l-/lerc.json index d414aab0e..4887f12be 100644 --- a/external_imported/vcpkg/versions/l-/lerc.json +++ b/external_imported/vcpkg/versions/l-/lerc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9fce90d3d96f4afb8ffcf1b2e7484ee75aa78ed2", + "version": "4.0", + "port-version": 0 + }, + { + "git-tree": "3037b9fd610059bc84e89607a3e58aa13641cdd8", + "version": "3.0", + "port-version": 0 + }, { "git-tree": "81c91f19fa142f53370b1a7ecac53fd2ba10aaf6", "version-string": "2.2", diff --git a/external_imported/vcpkg/versions/l-/libao.json b/external_imported/vcpkg/versions/l-/libao.json index e5186e1ae..c0d0833c8 100644 --- a/external_imported/vcpkg/versions/l-/libao.json +++ b/external_imported/vcpkg/versions/l-/libao.json @@ -9,11 +9,6 @@ "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1", "version": "1.2.2", "port-version": 3 - }, - { - "git-tree": "3ce3e18f2bb49577bbf0e0341cd0e5eb425e47bc", - "version": "1.2.2", - "port-version": 2 } ] } diff --git a/external_imported/vcpkg/versions/l-/libarchive.json b/external_imported/vcpkg/versions/l-/libarchive.json index 1cb4b7bf0..dc35fbeb4 100644 --- a/external_imported/vcpkg/versions/l-/libarchive.json +++ b/external_imported/vcpkg/versions/l-/libarchive.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5b833f83c0eee161ec6fc6624c0b713dcfb207be", + "version": "3.6.1", + "port-version": 1 + }, + { + "git-tree": "84b70980f3d82a88b9f8628261efeefd4869755e", + "version": "3.6.1", + "port-version": 0 + }, { "git-tree": "aeb6f06729d407abcf56fa92b2fcff01c031035b", "version-semver": "3.5.2", @@ -46,7 +56,7 @@ "port-version": 6 }, { - "git-tree": "fe188805a906d5d853bc330253242c12029ae0de", + "git-tree": "a8318f61dfe300b1b980b2ecaf295bd626572ad4", "version-semver": "3.4.3", "port-version": 5 }, diff --git a/external_imported/vcpkg/versions/l-/libass.json b/external_imported/vcpkg/versions/l-/libass.json index ba8620656..1ab96ad46 100644 --- a/external_imported/vcpkg/versions/l-/libass.json +++ b/external_imported/vcpkg/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5dfc84a884c525317deec9d8e62df51d64a8e3d", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "358f5ebe2b07d2c3043f1397a7caa51fcf7ebdce", "version": "0.15.2", diff --git a/external_imported/vcpkg/versions/l-/libatomic-ops.json b/external_imported/vcpkg/versions/l-/libatomic-ops.json index 910318126..df1982c85 100644 --- a/external_imported/vcpkg/versions/l-/libatomic-ops.json +++ b/external_imported/vcpkg/versions/l-/libatomic-ops.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0165283f0349283e2d14bd752fc428fb9fffd6b", + "version": "7.7.0", + "port-version": 1 + }, { "git-tree": "6d7b45bb0c10342d8e43900fab12f2baab4eb6a1", "version": "7.7.0", diff --git a/external_imported/vcpkg/versions/l-/libavif.json b/external_imported/vcpkg/versions/l-/libavif.json index 4bcdf7f29..2dfc410a0 100644 --- a/external_imported/vcpkg/versions/l-/libavif.json +++ b/external_imported/vcpkg/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2789410c80d4668a070e8eba96873a221615f3b", + "version-semver": "0.10.1", + "port-version": 0 + }, { "git-tree": "a160f6cf67dc99a095c98a9a7260b7a5fd110b7b", "version-semver": "0.9.2", diff --git a/external_imported/vcpkg/versions/l-/libbf.json b/external_imported/vcpkg/versions/l-/libbf.json index d338b8248..183b294f4 100644 --- a/external_imported/vcpkg/versions/l-/libbf.json +++ b/external_imported/vcpkg/versions/l-/libbf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef", "version-string": "1.0.0", diff --git a/external_imported/vcpkg/versions/l-/libcaer.json b/external_imported/vcpkg/versions/l-/libcaer.json new file mode 100644 index 000000000..0fc607cb7 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libcaer.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "bd2fc3b1a8232d4d15ab248ce77f379e825296a3", + "version-date": "2022-07-25", + "port-version": 1 + }, + { + "git-tree": "7b5ee918213a05dc43d5e7f3eb33b2961609c430", + "version-date": "2022-07-25", + "port-version": 0 + }, + { + "git-tree": "275713cf9dbdd13533fe379ad7f8c81fcf9a895c", + "version": "3.3.14", + "port-version": 1 + }, + { + "git-tree": "4dffda61ffebd9440265c6edde057d1af909cf5c", + "version": "3.3.14", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libcbor.json b/external_imported/vcpkg/versions/l-/libcbor.json index 105e60aae..eb5113b76 100644 --- a/external_imported/vcpkg/versions/l-/libcbor.json +++ b/external_imported/vcpkg/versions/l-/libcbor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e881ce93b52a9b16f4c03e4bed79c661def7631", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49", "version": "0.8.0", diff --git a/external_imported/vcpkg/versions/l-/libcds.json b/external_imported/vcpkg/versions/l-/libcds.json index fcdaa2d5c..60bbde654 100644 --- a/external_imported/vcpkg/versions/l-/libcds.json +++ b/external_imported/vcpkg/versions/l-/libcds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741", + "version": "2.3.3", + "port-version": 2 + }, { "git-tree": "9c4f193efcb3e703332e10483b443570e1af5ae7", "version-string": "2.3.3", diff --git a/external_imported/vcpkg/versions/l-/libcerf.json b/external_imported/vcpkg/versions/l-/libcerf.json index 7a3556498..471bb29f3 100644 --- a/external_imported/vcpkg/versions/l-/libcerf.json +++ b/external_imported/vcpkg/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aed61567fd3da5dc36a9a5290262b389ab79fa5", + "version": "1.13", + "port-version": 3 + }, { "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", "version-string": "1.13", diff --git a/external_imported/vcpkg/versions/l-/libcopp.json b/external_imported/vcpkg/versions/l-/libcopp.json index 104a19a9d..bceee8ee2 100644 --- a/external_imported/vcpkg/versions/l-/libcopp.json +++ b/external_imported/vcpkg/versions/l-/libcopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2f995866846ccb6dd7ae147312e095c66f912db", + "version-semver": "1.4.1", + "port-version": 2 + }, { "git-tree": "214d2cff167ae0646312fd5d5f2eecca62a91e19", "version-semver": "1.4.1", diff --git a/external_imported/vcpkg/versions/l-/libcuckoo.json b/external_imported/vcpkg/versions/l-/libcuckoo.json index 35c71d5b6..1983195ad 100644 --- a/external_imported/vcpkg/versions/l-/libcuckoo.json +++ b/external_imported/vcpkg/versions/l-/libcuckoo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8390f186a348872f4f8caf773c6ce376cf4365", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "47bda50b4e599d0dc81a015e175d1510de0ca62d", "version-string": "0.3", diff --git a/external_imported/vcpkg/versions/l-/libdatachannel.json b/external_imported/vcpkg/versions/l-/libdatachannel.json index 17279c4e6..e9b3d9547 100644 --- a/external_imported/vcpkg/versions/l-/libdatachannel.json +++ b/external_imported/vcpkg/versions/l-/libdatachannel.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "8a0b138705a4ef7e8b7117c8674d018bf281335f", + "version-semver": "0.17.10", + "port-version": 0 + }, + { + "git-tree": "91ca5987e29fac6963c6ee8d6c4f91ecb621dd81", + "version-semver": "0.17.9", + "port-version": 0 + }, + { + "git-tree": "0770e9b271c6d1eb630a403f754c2dd2ee93f1c6", + "version-semver": "0.17.8", + "port-version": 0 + }, + { + "git-tree": "9692159a4275af713e1525a9c81447fdd614869a", + "version-semver": "0.17.1", + "port-version": 0 + }, { "git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2", "version-semver": "0.16.4", diff --git a/external_imported/vcpkg/versions/l-/libdc1394.json b/external_imported/vcpkg/versions/l-/libdc1394.json index 4e630d646..cf9e2628c 100644 --- a/external_imported/vcpkg/versions/l-/libdc1394.json +++ b/external_imported/vcpkg/versions/l-/libdc1394.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "836d621852118c9ba8ce3e7ec8f3d8a2b9d9ea2b", + "version": "2.2.6", + "port-version": 1 + }, { "git-tree": "709fb395bf34f777acced25c12d6fd76d90f0100", "version": "2.2.6", diff --git a/external_imported/vcpkg/versions/l-/libe57.json b/external_imported/vcpkg/versions/l-/libe57.json index 0371207ea..647a28351 100644 --- a/external_imported/vcpkg/versions/l-/libe57.json +++ b/external_imported/vcpkg/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e53fb4c480d35feeeb67361182d4d630ac3834ca", + "version-semver": "1.1.332", + "port-version": 2 + }, { "git-tree": "e38a82bc97129e317606207d234101aefe7dcb17", "version-semver": "1.1.332", diff --git a/external_imported/vcpkg/versions/l-/libffi.json b/external_imported/vcpkg/versions/l-/libffi.json index f69e95476..cf6dec526 100644 --- a/external_imported/vcpkg/versions/l-/libffi.json +++ b/external_imported/vcpkg/versions/l-/libffi.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d484f79a6c1e9cd25a8a4791af0c9a40fc26b51", + "version": "3.4.2", + "port-version": 6 + }, + { + "git-tree": "14f8b4d7dc645ea8f2ddfe77eeaaeef55f123cb5", + "version": "3.4.2", + "port-version": 5 + }, { "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83", "version": "3.4.2", diff --git a/external_imported/vcpkg/versions/l-/libflac.json b/external_imported/vcpkg/versions/l-/libflac.json index 8dd6b4051..23d75d343 100644 --- a/external_imported/vcpkg/versions/l-/libflac.json +++ b/external_imported/vcpkg/versions/l-/libflac.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6931704180602d16a54e15759cd6c04739d40699", + "version": "1.3.4", + "port-version": 1 + }, + { + "git-tree": "a3dff2074f8f7a8ac9d8e9c5e78d8cae8538f3ef", + "version": "1.3.4", + "port-version": 0 + }, { "git-tree": "040c261fb123656fc61f659e887a6db0fabc275e", "version": "1.3.3", diff --git a/external_imported/vcpkg/versions/l-/libfontenc.json b/external_imported/vcpkg/versions/l-/libfontenc.json new file mode 100644 index 000000000..a1bd50d67 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libfontenc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4201b994bdcfcf20458025d0fcfffe1f97d444dc", + "version": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libfreenect2.json b/external_imported/vcpkg/versions/l-/libfreenect2.json index 51d968935..3100a1da8 100644 --- a/external_imported/vcpkg/versions/l-/libfreenect2.json +++ b/external_imported/vcpkg/versions/l-/libfreenect2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "33bfc70d84b528fa549f57401c884abda1073526", + "version": "0.2.0", + "port-version": 9 + }, + { + "git-tree": "ce8aefbc76e982371258202989111294d9a5221d", + "version": "0.2.0", + "port-version": 8 + }, { "git-tree": "cdedefe776984f442e8af70b0e0738d12d56fafa", "version-string": "0.2.0", diff --git a/external_imported/vcpkg/versions/l-/libfs.json b/external_imported/vcpkg/versions/l-/libfs.json new file mode 100644 index 000000000..38c371816 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libfs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "48390af67d3ade78652e3b646864aa96b7cde8c0", + "version": "1.0.8", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libgcrypt.json b/external_imported/vcpkg/versions/l-/libgcrypt.json index cee2cf03b..133aaffed 100644 --- a/external_imported/vcpkg/versions/l-/libgcrypt.json +++ b/external_imported/vcpkg/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba183f10b284405f9b4b50720d7583131a87d393", + "version": "1.10.1", + "port-version": 0 + }, { "git-tree": "8c0737adf68a0ada3ed976e4acf201b4cbeb9dfe", "version": "1.9.4", diff --git a/external_imported/vcpkg/versions/l-/libgd.json b/external_imported/vcpkg/versions/l-/libgd.json index 9b02569ba..39ae3464f 100644 --- a/external_imported/vcpkg/versions/l-/libgd.json +++ b/external_imported/vcpkg/versions/l-/libgd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2de4ed776a149cb13e64876f1f8d7e241e3291db", + "version-semver": "2.3.3", + "port-version": 0 + }, { "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f", "version-semver": "2.3.2", diff --git a/external_imported/vcpkg/versions/l-/libgeotiff.json b/external_imported/vcpkg/versions/l-/libgeotiff.json index 6c93ee7b6..a3b344bf2 100644 --- a/external_imported/vcpkg/versions/l-/libgeotiff.json +++ b/external_imported/vcpkg/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa303b0481fcc35024bae8af620ab2271ca9b5b2", + "version": "1.7.1", + "port-version": 1 + }, { "git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1", "version": "1.7.1", diff --git a/external_imported/vcpkg/versions/l-/libgo.json b/external_imported/vcpkg/versions/l-/libgo.json index f8921f77a..7fa55e263 100644 --- a/external_imported/vcpkg/versions/l-/libgo.json +++ b/external_imported/vcpkg/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7eea4022110bad013d460a23328cd2e82385bb1", + "version": "3.1", + "port-version": 5 + }, { "git-tree": "b50450a394cd5b4e882d353439c3dae6cc0564f2", "version": "3.1", diff --git a/external_imported/vcpkg/versions/l-/libgpg-error.json b/external_imported/vcpkg/versions/l-/libgpg-error.json index 7b6379058..0b83c5910 100644 --- a/external_imported/vcpkg/versions/l-/libgpg-error.json +++ b/external_imported/vcpkg/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "728a8999d1083dc72eae0612669f0c34075a3f01", + "version": "1.42", + "port-version": 4 + }, { "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97", "version": "1.42", diff --git a/external_imported/vcpkg/versions/l-/libgpiod.json b/external_imported/vcpkg/versions/l-/libgpiod.json index 8737d8f5d..4e8ba921e 100644 --- a/external_imported/vcpkg/versions/l-/libgpiod.json +++ b/external_imported/vcpkg/versions/l-/libgpiod.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "effc79de6dafb6ef6762bd2863a222c6090881e8", + "version": "1.6.3", + "port-version": 2 + }, + { + "git-tree": "014bb3350492c4259151f00b3419e2054f707401", + "version": "1.6.3", + "port-version": 1 + }, { "git-tree": "9a8b2a2d891f2435ff9ce3fbcea0bd870327bad0", "version": "1.6.3", diff --git a/external_imported/vcpkg/versions/l-/libharu.json b/external_imported/vcpkg/versions/l-/libharu.json index e08b48e1b..579f95262 100644 --- a/external_imported/vcpkg/versions/l-/libharu.json +++ b/external_imported/vcpkg/versions/l-/libharu.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7119cd9fe86c40e908ef4c65be267b35caf8d010", + "version-semver": "2.4.0-rc1", + "port-version": 0 + }, + { + "git-tree": "bfeaf0d13fce9156ac216daa37a2c945290fc0ed", + "version-date": "2017-08-15", + "port-version": 11 + }, { "git-tree": "312f4b697d2f46818c218e270bd447cdeb76322c", "version-string": "2017-08-15", diff --git a/external_imported/vcpkg/versions/l-/libheif.json b/external_imported/vcpkg/versions/l-/libheif.json index 437397e9a..bfd7edebe 100644 --- a/external_imported/vcpkg/versions/l-/libheif.json +++ b/external_imported/vcpkg/versions/l-/libheif.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0876b38db237beed53c8edd6ebe83622a3771287", + "version": "1.13.0", + "port-version": 0 + }, + { + "git-tree": "f183481e325abb8be75988c2061260ebf60ad7d4", + "version": "1.12.0", + "port-version": 4 + }, { "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", "version": "1.12.0", diff --git a/external_imported/vcpkg/versions/l-/libhsplasma.json b/external_imported/vcpkg/versions/l-/libhsplasma.json index 146287506..dcfd8672a 100644 --- a/external_imported/vcpkg/versions/l-/libhsplasma.json +++ b/external_imported/vcpkg/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b2f7f61711ccfb81d5d9a8b34e057494bd5f902", + "version-date": "2022-05-19", + "port-version": 0 + }, { "git-tree": "1e9aee8fff86881286f825d1efa9afd1d4f013c6", "version-string": "2021.06.08", diff --git a/external_imported/vcpkg/versions/l-/libhv.json b/external_imported/vcpkg/versions/l-/libhv.json index f2f0d3cb7..eb9947bc1 100644 --- a/external_imported/vcpkg/versions/l-/libhv.json +++ b/external_imported/vcpkg/versions/l-/libhv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e382c63e132653ac3e2062b4fa0d182242c4da3a", + "version": "1.2.6", + "port-version": 0 + }, + { + "git-tree": "3533f306ae38ad29c619656d006ae9536bfcdcb4", + "version": "1.2.4", + "port-version": 2 + }, { "git-tree": "b5953fb3634520fafd04507d0a7266e92c87a129", "version": "1.2.4", diff --git a/external_imported/vcpkg/versions/l-/libhydrogen.json b/external_imported/vcpkg/versions/l-/libhydrogen.json index b6e8a73ad..526ac477f 100644 --- a/external_imported/vcpkg/versions/l-/libhydrogen.json +++ b/external_imported/vcpkg/versions/l-/libhydrogen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "08c53fcf5af4463927ee0880632e2e7e52c08f49", + "version-date": "2022-06-21", + "port-version": 0 + }, + { + "git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13", + "version-date": "2021-12-02", + "port-version": 1 + }, { "git-tree": "d5de7dac51afd6d1575a5a74f6a562b2affc1717", "version-date": "2021-12-02", diff --git a/external_imported/vcpkg/versions/l-/libice.json b/external_imported/vcpkg/versions/l-/libice.json new file mode 100644 index 000000000..38babced6 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libice.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95b91f0eb6ed362a133896484d1cc4fa5ee3b007", + "version": "1.0.10", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libiconv.json b/external_imported/vcpkg/versions/l-/libiconv.json index 24335a8f5..ea95cbbec 100644 --- a/external_imported/vcpkg/versions/l-/libiconv.json +++ b/external_imported/vcpkg/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f92b7d29ce3243d3d51e07686869eca63ece88a", + "version": "1.17", + "port-version": 0 + }, { "git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5", "version": "1.16", diff --git a/external_imported/vcpkg/versions/l-/libigl.json b/external_imported/vcpkg/versions/l-/libigl.json index 17a22a4f4..da1c5373e 100644 --- a/external_imported/vcpkg/versions/l-/libigl.json +++ b/external_imported/vcpkg/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fbdb4cb097785d6b9814e4a4ec89f8530a51c1a", + "version": "2.3.0", + "port-version": 2 + }, { "git-tree": "b4de37a62b3d7349f427f26ad38b8fe1f386d09d", "version": "2.3.0", diff --git a/external_imported/vcpkg/versions/l-/libilbc.json b/external_imported/vcpkg/versions/l-/libilbc.json index 03cd54d4b..986350f44 100644 --- a/external_imported/vcpkg/versions/l-/libilbc.json +++ b/external_imported/vcpkg/versions/l-/libilbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f12ae842a06b6f2d77a889d6279dc997bbd61d0b", + "version": "3.0.4", + "port-version": 0 + }, { "git-tree": "2c86ad893279ccf359e6ee1b22ff5e2e3a935a42", "version-string": "3.0.3", diff --git a/external_imported/vcpkg/versions/l-/libirecovery.json b/external_imported/vcpkg/versions/l-/libirecovery.json index fae92d1fe..d24780b0d 100644 --- a/external_imported/vcpkg/versions/l-/libirecovery.json +++ b/external_imported/vcpkg/versions/l-/libirecovery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1396dbed8e08ee556ad00ce3a67ba0de7c7b6298", + "version-string": "1.0.25", + "port-version": 4 + }, { "git-tree": "8e5ca128c3c62e747f3cc4beaeb0f5d74b263403", "version-string": "1.0.25", diff --git a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json index 857413fbe..5319e0844 100644 --- a/external_imported/vcpkg/versions/l-/libjpeg-turbo.json +++ b/external_imported/vcpkg/versions/l-/libjpeg-turbo.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "07c9848d16ee346b314e87e6c0d856bfb0745af9", + "version": "2.1.4", + "port-version": 0 + }, + { + "git-tree": "f3ab7c40b47aa03953467e7697d3eea7b60d624e", + "version": "2.1.3", + "port-version": 3 + }, { "git-tree": "dd9bb6eb0d4e28d2b3ef0d83b6b9ef736555621d", "version": "2.1.3", diff --git a/external_imported/vcpkg/versions/l-/libjuice.json b/external_imported/vcpkg/versions/l-/libjuice.json index cce469f9a..d06ef902c 100644 --- a/external_imported/vcpkg/versions/l-/libjuice.json +++ b/external_imported/vcpkg/versions/l-/libjuice.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "6e2a1fe37401f748f1437cee446e6b7e924de95d", + "version": "1.0.4", + "port-version": 0 + }, + { + "git-tree": "14dfa625a6a7c50182396dca9eae0ec9a38c01ab", + "version": "1.0.3", + "port-version": 0 + }, + { + "git-tree": "0d17a1b43666a1d6a177ed4a0d434f92e16ea791", + "version": "1.0.2", + "port-version": 0 + }, + { + "git-tree": "02ea9a1ae4e054d9474f801747e5edd17a3d8ad1", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "62c215b49c59158589a9bc98d02b20243ef1bf0b", "version": "0.9.8", diff --git a/external_imported/vcpkg/versions/l-/liblas.json b/external_imported/vcpkg/versions/l-/liblas.json index 547d1f632..8d32b3242 100644 --- a/external_imported/vcpkg/versions/l-/liblas.json +++ b/external_imported/vcpkg/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59d85ba2350ba688af5aad5a538382fd7b2963e3", + "version": "1.8.1", + "port-version": 10 + }, { "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005", "version": "1.8.1", diff --git a/external_imported/vcpkg/versions/l-/liblbfgs.json b/external_imported/vcpkg/versions/l-/liblbfgs.json index e3c7174bb..d562fe8f0 100644 --- a/external_imported/vcpkg/versions/l-/liblbfgs.json +++ b/external_imported/vcpkg/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf2ac29eb7e040dc4eefe6d623d5caa3b592de0", + "version": "1.10", + "port-version": 2 + }, { "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", "version-string": "1.10", diff --git a/external_imported/vcpkg/versions/l-/liblsquic.json b/external_imported/vcpkg/versions/l-/liblsquic.json new file mode 100644 index 000000000..e182c28c5 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/liblsquic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6f4593aba81acc749f3223d0fd3987d5920b164", + "version": "3.1.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/liblzma.json b/external_imported/vcpkg/versions/l-/liblzma.json index ce6deba11..77c763c10 100644 --- a/external_imported/vcpkg/versions/l-/liblzma.json +++ b/external_imported/vcpkg/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96b6aac6211ad3fd3da29508a519c3cd5f09716d", + "version-semver": "5.2.5", + "port-version": 6 + }, { "git-tree": "18b7cbd0972b536a6bd4c0ef0f41dce9c3f047ac", "version-semver": "5.2.5", diff --git a/external_imported/vcpkg/versions/l-/libmariadb.json b/external_imported/vcpkg/versions/l-/libmariadb.json index 2a3c4716b..6b89163e9 100644 --- a/external_imported/vcpkg/versions/l-/libmariadb.json +++ b/external_imported/vcpkg/versions/l-/libmariadb.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "34106302d34bd62e9298357aa8b47b2c3aabf204", + "version-semver": "3.3.1", + "port-version": 1 + }, + { + "git-tree": "ab286c57741848d9bb9a806ad29f5366283af520", + "version-semver": "3.3.1", + "port-version": 0 + }, + { + "git-tree": "06122c8b00cc582d3ee36072fcbd03fa9385f238", + "version-semver": "3.1.15", + "port-version": 1 + }, { "git-tree": "c51d4e78081ee708c1cdebeaaa201aa0064079e3", "version-semver": "3.1.15", diff --git a/external_imported/vcpkg/versions/l-/libmicrodns.json b/external_imported/vcpkg/versions/l-/libmicrodns.json new file mode 100644 index 000000000..03ec5150c --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libmicrodns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "479151454954c9fe2e5ddce7f1b358f3c8688ce8", + "version": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libmodplug.json b/external_imported/vcpkg/versions/l-/libmodplug.json index a342cd476..0cc707721 100644 --- a/external_imported/vcpkg/versions/l-/libmodplug.json +++ b/external_imported/vcpkg/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "605d260810f9d1a489af7fb484d509581b39763d", + "version": "0.8.9.0", + "port-version": 10 + }, { "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", "version-string": "0.8.9.0", diff --git a/external_imported/vcpkg/versions/l-/libmount.json b/external_imported/vcpkg/versions/l-/libmount.json index 72797a339..8f67a0941 100644 --- a/external_imported/vcpkg/versions/l-/libmount.json +++ b/external_imported/vcpkg/versions/l-/libmount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf368ca79f716bd0b287bf1eeedd87c3529831cf", + "version": "2.38", + "port-version": 0 + }, { "git-tree": "0f746b3d702445fd2de54c25c08491cdaae45810", "version": "2.37.2", diff --git a/external_imported/vcpkg/versions/l-/libmt32emu.json b/external_imported/vcpkg/versions/l-/libmt32emu.json index 76e96543d..b202270b3 100644 --- a/external_imported/vcpkg/versions/l-/libmt32emu.json +++ b/external_imported/vcpkg/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf84211f16b9b598e1ebd2cee0be2487d2e49fca", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "de283dae22ced9be75cf6356a02732fec8b4eb11", "version": "2.6.2", diff --git a/external_imported/vcpkg/versions/l-/libmysql.json b/external_imported/vcpkg/versions/l-/libmysql.json index c1a4d97c6..843ce2bf5 100644 --- a/external_imported/vcpkg/versions/l-/libmysql.json +++ b/external_imported/vcpkg/versions/l-/libmysql.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b0337316bdcf6acfc791eb6fac2c490db774b24e", + "version": "8.0.20", + "port-version": 8 + }, + { + "git-tree": "bde440f72e606ffbfcfba3393813261aa91e5c05", + "version": "8.0.20", + "port-version": 7 + }, { "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84", "version": "8.0.20", diff --git a/external_imported/vcpkg/versions/l-/libnice.json b/external_imported/vcpkg/versions/l-/libnice.json index 199e05f67..8e64beb7f 100644 --- a/external_imported/vcpkg/versions/l-/libnice.json +++ b/external_imported/vcpkg/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e15c3356146049f0dffd9aef46786677bb4b007e", + "version": "0.1.18", + "port-version": 1 + }, { "git-tree": "0317c7f34e075c4ebad894b0a6fffed8657f93e5", "version": "0.1.18", diff --git a/external_imported/vcpkg/versions/l-/libopensp.json b/external_imported/vcpkg/versions/l-/libopensp.json index 168ab8b25..4fc572cff 100644 --- a/external_imported/vcpkg/versions/l-/libopensp.json +++ b/external_imported/vcpkg/versions/l-/libopensp.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "c52391221569480b2e639b0e07a9e809e7711320", + "git-tree": "1c38530c26ffb1fc7fb2e0bd40f76ca8fa2bfb57", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "4b7d728266ee8b4e03f27a619cbf9efc9484cbb6", "version": "1.5.2", "port-version": 0 } diff --git a/external_imported/vcpkg/versions/l-/libosmium.json b/external_imported/vcpkg/versions/l-/libosmium.json index ff0000a08..0bd25a298 100644 --- a/external_imported/vcpkg/versions/l-/libosmium.json +++ b/external_imported/vcpkg/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2336c0db38fce27c033ff77a649645a1eb508e33", + "version-semver": "2.18.0", + "port-version": 0 + }, { "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", "version-semver": "2.17.1", diff --git a/external_imported/vcpkg/versions/l-/libpff.json b/external_imported/vcpkg/versions/l-/libpff.json index 7d305a168..3b6c8eb07 100644 --- a/external_imported/vcpkg/versions/l-/libpff.json +++ b/external_imported/vcpkg/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a47e314b091400914616ff8c5e017110f2493018", + "version-date": "2021-11-14", + "port-version": 0 + }, { "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", "version-date": "2018-07-14", diff --git a/external_imported/vcpkg/versions/l-/libpng.json b/external_imported/vcpkg/versions/l-/libpng.json index a9380b8c1..782224d16 100644 --- a/external_imported/vcpkg/versions/l-/libpng.json +++ b/external_imported/vcpkg/versions/l-/libpng.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "85dc7678690f09c78cc366b1f13498c41be51aff", + "version": "1.6.37", + "port-version": 19 + }, + { + "git-tree": "5e3ec787e7c6f09dd162648b700aeb712af0ffd2", + "version": "1.6.37", + "port-version": 18 + }, + { + "git-tree": "ffe71783883ccf1c6e6a306daa686868bfb62191", + "version": "1.6.37", + "port-version": 17 + }, { "git-tree": "b082585ac20aefc27150af5386b6a8a15473e93a", "version": "1.6.37", diff --git a/external_imported/vcpkg/versions/l-/libpq.json b/external_imported/vcpkg/versions/l-/libpq.json index 2944d48a5..319cc73f9 100644 --- a/external_imported/vcpkg/versions/l-/libpq.json +++ b/external_imported/vcpkg/versions/l-/libpq.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "bdf23f137f7f72e57555542fc392a8ec8e0ebd28", + "version": "14.4", + "port-version": 1 + }, + { + "git-tree": "2b3456bfb8b04525c44007f3c8a04b7e208d639d", + "version": "14.4", + "port-version": 0 + }, + { + "git-tree": "2b437be1592b794cb09437beba153937991a189a", + "version": "14.1", + "port-version": 2 + }, { "git-tree": "0f614944d19861d7751cd9c880c6b61d87f36a3d", "version": "14.1", diff --git a/external_imported/vcpkg/versions/l-/libpqxx.json b/external_imported/vcpkg/versions/l-/libpqxx.json index 5c0592d27..332f8470d 100644 --- a/external_imported/vcpkg/versions/l-/libpqxx.json +++ b/external_imported/vcpkg/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da2e393b9844105fa00c800afb44bc93541dcb00", + "version": "7.7.3", + "port-version": 0 + }, { "git-tree": "6dd0107ca668c589cf18a57a884dd3ef276730cf", "version-semver": "7.6.0", diff --git a/external_imported/vcpkg/versions/l-/libproxy.json b/external_imported/vcpkg/versions/l-/libproxy.json index 1a5479e01..59eb95945 100644 --- a/external_imported/vcpkg/versions/l-/libproxy.json +++ b/external_imported/vcpkg/versions/l-/libproxy.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "657915bf898e4e4ccf08b6274665b541efa15876", + "version": "0.4.17", + "port-version": 5 + }, + { + "git-tree": "7aa3e3fbb2539fe4adaaff6056effdc2a97ff14b", + "version": "0.4.17", + "port-version": 4 + }, + { + "git-tree": "ff241fdc3665ad4d1dce051fcdd8ee8dc8617c86", + "version": "0.4.17", + "port-version": 3 + }, { "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca", "version": "0.4.17", diff --git a/external_imported/vcpkg/versions/l-/librabbitmq.json b/external_imported/vcpkg/versions/l-/librabbitmq.json index 1184cdf79..aed7f1677 100644 --- a/external_imported/vcpkg/versions/l-/librabbitmq.json +++ b/external_imported/vcpkg/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaa23b49b84d0ec45e28645d78adc6c0b2f8faed", + "version": "0.11.0", + "port-version": 2 + }, { "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", "version": "0.11.0", diff --git a/external_imported/vcpkg/versions/l-/libraw.json b/external_imported/vcpkg/versions/l-/libraw.json index 698626379..b93666263 100644 --- a/external_imported/vcpkg/versions/l-/libraw.json +++ b/external_imported/vcpkg/versions/l-/libraw.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "906477f849ef0c2b348f8ff9f526d2c5a2e19b22", + "version-string": "201903", + "port-version": 10 + }, + { + "git-tree": "13ab93771f3879d0f68e0418b028df14cb260dd3", + "version-string": "201903", + "port-version": 9 + }, + { + "git-tree": "e07b6b8ed70ad198a64027d0e44eab43d116039d", + "version-string": "201903", + "port-version": 8 + }, { "git-tree": "aeb0a198c349fb336ad7cd710aeaf0b1017679a1", "version-string": "201903", diff --git a/external_imported/vcpkg/versions/l-/librdkafka.json b/external_imported/vcpkg/versions/l-/librdkafka.json index ff08e20cb..0fe173cf5 100644 --- a/external_imported/vcpkg/versions/l-/librdkafka.json +++ b/external_imported/vcpkg/versions/l-/librdkafka.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ec1e8bdb3b0474f51cb416593474395c97ace7e2", + "version": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "2b06cb5f9952eb1e853ea372a57551fc1b40e009", + "version": "1.9.0", + "port-version": 1 + }, + { + "git-tree": "f8d629ff07daf495ff89cf9c3632fce7273a80c0", + "version": "1.9.0", + "port-version": 0 + }, { "git-tree": "0583e5dcb6a79a29685250e2b43ca1cd2a798d96", "version": "1.8.2", diff --git a/external_imported/vcpkg/versions/l-/librttopo.json b/external_imported/vcpkg/versions/l-/librttopo.json index 5c3773f05..6f3134362 100644 --- a/external_imported/vcpkg/versions/l-/librttopo.json +++ b/external_imported/vcpkg/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f4858afee7a92ece5923344f556b3900894eaf", + "version": "1.1.0", + "port-version": 6 + }, { "git-tree": "d747c88d429ff781b11627623d0958967f912a41", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/l-/libsigcpp.json b/external_imported/vcpkg/versions/l-/libsigcpp.json index 419144074..a1a014cb9 100644 --- a/external_imported/vcpkg/versions/l-/libsigcpp.json +++ b/external_imported/vcpkg/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7631555eb4ab142a7f643a266f79a87bc8aeca12", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "bdb51863c5589b8e47c717b7c96a1ead39d4dd27", "version": "3.0.7", diff --git a/external_imported/vcpkg/versions/l-/libslirp.json b/external_imported/vcpkg/versions/l-/libslirp.json index a46de194d..0a600351e 100644 --- a/external_imported/vcpkg/versions/l-/libslirp.json +++ b/external_imported/vcpkg/versions/l-/libslirp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6946f40e08a89013e998d3bf397613bdf08cb581", + "version-semver": "4.7.0", + "port-version": 0 + }, { "git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f", "version-semver": "4.6.1", diff --git a/external_imported/vcpkg/versions/l-/libsm.json b/external_imported/vcpkg/versions/l-/libsm.json new file mode 100644 index 000000000..05961d74c --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libsm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e2f29263e1b4b7198b9b564a2400b902f87ae51", + "version": "1.2.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libsndfile.json b/external_imported/vcpkg/versions/l-/libsndfile.json index b1d58472d..83ba3f8b3 100644 --- a/external_imported/vcpkg/versions/l-/libsndfile.json +++ b/external_imported/vcpkg/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee6720c9ecc42994e16325893fcc740b28210533", + "version-semver": "1.1.0", + "port-version": 1 + }, { "git-tree": "1ec8249a4721dda26735a12603defe2aa680c264", "version-semver": "1.1.0", diff --git a/external_imported/vcpkg/versions/l-/libsodium.json b/external_imported/vcpkg/versions/l-/libsodium.json index 7c623c534..9cf0250a3 100644 --- a/external_imported/vcpkg/versions/l-/libsodium.json +++ b/external_imported/vcpkg/versions/l-/libsodium.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "72748d8d6030aac034e5b74229898016f833b33a", + "version": "1.0.18", + "port-version": 8 + }, + { + "git-tree": "9ffdf9b217021918c33311af9faa9b4a3086d004", + "version": "1.0.18", + "port-version": 7 + }, { "git-tree": "06e21819c9b176b52aa0b9226c3e2bc07ec20a23", "version": "1.0.18", diff --git a/external_imported/vcpkg/versions/l-/libspatialindex.json b/external_imported/vcpkg/versions/l-/libspatialindex.json index 9f034e9d0..fc9887f64 100644 --- a/external_imported/vcpkg/versions/l-/libspatialindex.json +++ b/external_imported/vcpkg/versions/l-/libspatialindex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48179f2e21bb0918129f0f2d02cacb39f88ab347", + "version": "1.9.3", + "port-version": 1 + }, { "git-tree": "2e1fceafc0be5ea8fd1b2961104f46a5e29c9a6c", "version": "1.9.3", diff --git a/external_imported/vcpkg/versions/l-/libspatialite.json b/external_imported/vcpkg/versions/l-/libspatialite.json index a12239827..f236c9c9e 100644 --- a/external_imported/vcpkg/versions/l-/libspatialite.json +++ b/external_imported/vcpkg/versions/l-/libspatialite.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f13da82a42aca5aa182c22cf8d582cc9019e91fc", + "version": "5.0.1", + "port-version": 8 + }, + { + "git-tree": "e92008bb08f680c156f894b77774f76b5ff89f21", + "version": "5.0.1", + "port-version": 7 + }, + { + "git-tree": "17b2434a466cabf41bd653845871d5b4ec6bfdeb", + "version": "5.0.1", + "port-version": 6 + }, + { + "git-tree": "27ff74dc3c1f0d6c5e11dbcc110f34e46dae862a", + "version": "5.0.1", + "port-version": 5 + }, { "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", "version": "5.0.1", diff --git a/external_imported/vcpkg/versions/l-/libsquish.json b/external_imported/vcpkg/versions/l-/libsquish.json index da008f533..0c4945447 100644 --- a/external_imported/vcpkg/versions/l-/libsquish.json +++ b/external_imported/vcpkg/versions/l-/libsquish.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6a7a36071f8261b00c8720cbf8024df31c15650f", + "version": "1.15", + "port-version": 12 + }, + { + "git-tree": "3c259e069413fc51d82423f6c9842ad285e210e9", + "version": "1.15", + "port-version": 11 + }, { "git-tree": "9a7ae325bacc78d07dc92de654a877584cff0cca", "version": "1.15", diff --git a/external_imported/vcpkg/versions/l-/libsrt.json b/external_imported/vcpkg/versions/l-/libsrt.json index 80e2ed58c..5dea97130 100644 --- a/external_imported/vcpkg/versions/l-/libsrt.json +++ b/external_imported/vcpkg/versions/l-/libsrt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "00e56b5f80be0e6a959bf121d906edb2255c7764", + "version": "1.5.0", + "port-version": 2 + }, + { + "git-tree": "67081a32f9ebb0639c8cdf50daf0da4db33dfd37", + "version": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "eb7fad3230d33ce43f4e008d3ec92cb286fe01e5", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "bec354df76b0c680977252a11a9e88b1ae6818b9", "version": "1.4.4", diff --git a/external_imported/vcpkg/versions/l-/libsrtp.json b/external_imported/vcpkg/versions/l-/libsrtp.json index 85c54b46b..07d81e330 100644 --- a/external_imported/vcpkg/versions/l-/libsrtp.json +++ b/external_imported/vcpkg/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c935c9b1559cab3460f928c2a6abb25271cfb65", + "version": "2.4.2", + "port-version": 2 + }, { "git-tree": "a7e8bce682acd4a29f666961a69127864cd93374", "version": "2.4.2", diff --git a/external_imported/vcpkg/versions/l-/libtcod.json b/external_imported/vcpkg/versions/l-/libtcod.json index 4cc62a81d..81ad78b53 100644 --- a/external_imported/vcpkg/versions/l-/libtcod.json +++ b/external_imported/vcpkg/versions/l-/libtcod.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "98a04c69b32d8e84d25d2913a2f0ad7ec7b4b833", + "version": "1.22.3", + "port-version": 0 + }, + { + "git-tree": "b8a26dfda1df684c3d88697b774c3e0a9c91f9b9", + "version": "1.22.2", + "port-version": 0 + }, + { + "git-tree": "08ac6efab8aa18d3c8e4bde44914495640e451a9", + "version": "1.22.1", + "port-version": 0 + }, + { + "git-tree": "598c5c5eb9ba1628257089e6397b7bbdd6723ee0", + "version": "1.21.0", + "port-version": 0 + }, + { + "git-tree": "34c13b63430589533e25be1fdec7afc8fbe68f6c", + "version": "1.20.1", + "port-version": 1 + }, { "git-tree": "ec66d469b71cab685daede349e5193d15ab866c7", "version": "1.20.1", @@ -20,25 +45,10 @@ "version-semver": "1.16.7", "port-version": 2 }, - { - "git-tree": "40587cd0b117a21791c1da332c89c6e1a820e2a9", - "version-semver": "1.16.7", - "port-version": 1 - }, - { - "git-tree": "c8498087d7b87609436a7c5fb85c391592add740", - "version-string": "1.16.7", - "port-version": 0 - }, { "git-tree": "e2de0a47f3776252b6e04681c92d67b0730587ef", "version-string": "1.16.6", "port-version": 0 - }, - { - "git-tree": "b4899dcf1740634e91d040b66259568ecafaa1b6", - "version-string": "1.16.4", - "port-version": 0 } ] } diff --git a/external_imported/vcpkg/versions/l-/libtheora.json b/external_imported/vcpkg/versions/l-/libtheora.json index 3aa9a91bb..4fba0ff53 100644 --- a/external_imported/vcpkg/versions/l-/libtheora.json +++ b/external_imported/vcpkg/versions/l-/libtheora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e6aad4fc7e821831290f3e17d368ea17609117", + "version-string": "1.2.0alpha1-20170719", + "port-version": 4 + }, { "git-tree": "f54e2dbc66d96847b2b075baa7ae3a4cc032328d", "version-string": "1.2.0alpha1-20170719", diff --git a/external_imported/vcpkg/versions/l-/libtorrent.json b/external_imported/vcpkg/versions/l-/libtorrent.json index bb12eb92f..0e34f91c4 100644 --- a/external_imported/vcpkg/versions/l-/libtorrent.json +++ b/external_imported/vcpkg/versions/l-/libtorrent.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d1c101af3351c28c84e89394e1fb6826352bec76", + "version": "2.0.7", + "port-version": 0 + }, + { + "git-tree": "1ca0a5e5498fe7a999d78650e6ae935cebf1d764", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "e27617cd7ff2be85ee0c2d4a60be16cee95f1302", "version": "2.0.5", diff --git a/external_imported/vcpkg/versions/l-/libunibreak.json b/external_imported/vcpkg/versions/l-/libunibreak.json index ebb909929..364e54e6a 100644 --- a/external_imported/vcpkg/versions/l-/libunibreak.json +++ b/external_imported/vcpkg/versions/l-/libunibreak.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "724f588851a5f81f6ddd8eb1fc01a45bedfa5517", + "version": "5.0", + "port-version": 1 + }, + { + "git-tree": "ab89a270477d6d97e3d70c4503ee573f1ca8e539", + "version": "5.0", + "port-version": 0 + }, { "git-tree": "f1fb2965625f4dc28c5ab3c4e0a8a128901a0f0e", "version-string": "4.3", diff --git a/external_imported/vcpkg/versions/l-/libunistring.json b/external_imported/vcpkg/versions/l-/libunistring.json index 90395ba3c..c534b9ba6 100644 --- a/external_imported/vcpkg/versions/l-/libunistring.json +++ b/external_imported/vcpkg/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ae1c5ae3927f718073792b5cb86fa434b5c8c49", + "version": "0.9.10", + "port-version": 3 + }, { "git-tree": "1d6ff819975c70dc53d9aefa5d9046a0a21617b4", "version": "0.9.10", diff --git a/external_imported/vcpkg/versions/l-/liburing.json b/external_imported/vcpkg/versions/l-/liburing.json index 2fc0750a7..175bdc541 100644 --- a/external_imported/vcpkg/versions/l-/liburing.json +++ b/external_imported/vcpkg/versions/l-/liburing.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e41ee56c7ceb8925a59b8d427a63990f581c0328", + "version": "2.2", + "port-version": 1 + }, + { + "git-tree": "8d783b3db24821bcd85fcdbb5673b03613653e01", + "version": "2.2", + "port-version": 0 + }, + { + "git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647", + "version": "2.1", + "port-version": 0 + }, { "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", "version": "2.0", diff --git a/external_imported/vcpkg/versions/l-/libusb.json b/external_imported/vcpkg/versions/l-/libusb.json index a5a7bc304..b54e2c0ec 100644 --- a/external_imported/vcpkg/versions/l-/libusb.json +++ b/external_imported/vcpkg/versions/l-/libusb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bd3501fc0abc3d7ce598175f8f7f593f642a4973", + "version": "1.0.26", + "port-version": 1 + }, + { + "git-tree": "67fc457e16066e047803888e45b8ea3aaf713501", + "version": "1.0.26", + "port-version": 0 + }, { "git-tree": "337aac12b9bf6aab68dd1375c3592f1575efbda9", "version": "1.0.24", diff --git a/external_imported/vcpkg/versions/l-/libuv.json b/external_imported/vcpkg/versions/l-/libuv.json index fd88da0a5..0b2382838 100644 --- a/external_imported/vcpkg/versions/l-/libuv.json +++ b/external_imported/vcpkg/versions/l-/libuv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dad61360b9c0fb825e23a4ccc01dcd9658e2f253", + "version-semver": "1.44.2", + "port-version": 0 + }, + { + "git-tree": "4560e3046488c518b6573a14d7ad063a02f52db9", + "version-semver": "1.44.1", + "port-version": 0 + }, { "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f", "version-semver": "1.43.0", diff --git a/external_imported/vcpkg/versions/l-/libvpx.json b/external_imported/vcpkg/versions/l-/libvpx.json index 68e653796..87e023c64 100644 --- a/external_imported/vcpkg/versions/l-/libvpx.json +++ b/external_imported/vcpkg/versions/l-/libvpx.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5bad78764d9138da1f5f2b1c49ec291377166a30", + "version": "1.12.0", + "port-version": 0 + }, + { + "git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b", + "version": "1.11.0", + "port-version": 1 + }, + { + "git-tree": "3ec8aec9ecbcb2e3b5a0af7cea8045359d9aec94", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "79a7e2cf4e6df063990dc59d1aa221150eb0ce0e", "version-semver": "1.10.0", diff --git a/external_imported/vcpkg/versions/l-/libwebp.json b/external_imported/vcpkg/versions/l-/libwebp.json index 935958cc6..b5379d625 100644 --- a/external_imported/vcpkg/versions/l-/libwebp.json +++ b/external_imported/vcpkg/versions/l-/libwebp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6bce9ad4c595a817fb1f227661c5bc955b177754", + "version": "1.2.4", + "port-version": 0 + }, + { + "git-tree": "e2b9421b3093512c54494cf01a3fd6edb7424e02", + "version": "1.2.3", + "port-version": 0 + }, + { + "git-tree": "bf8ec989a234ddde96494e4e07d0ffd93df82151", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "ca5a8b2ed264617e8a35d22e1e6ac18ebe99900f", "version": "1.2.1", diff --git a/external_imported/vcpkg/versions/l-/libx11.json b/external_imported/vcpkg/versions/l-/libx11.json new file mode 100644 index 000000000..9e71dbb6c --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libx11.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e69bacce69d31cc63b4c1f6c5637ba204289a496", + "version": "1.7.3.1", + "port-version": 1 + }, + { + "git-tree": "1347521fb39c2ccfd11521a3e641854537799ca4", + "version": "1.7.3.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxau.json b/external_imported/vcpkg/versions/l-/libxau.json new file mode 100644 index 000000000..85719192b --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxau.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d82d4195d09a023e7a7fbc1c3a726a2f9f917a33", + "version": "1.0.9", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxdamage.json b/external_imported/vcpkg/versions/l-/libxdamage.json new file mode 100644 index 000000000..2c9916b6e --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxdamage.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87138386fc68780b661be1216e8bb2e334071702", + "version": "1.1.5", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxdmcp.json b/external_imported/vcpkg/versions/l-/libxdmcp.json new file mode 100644 index 000000000..2121b322b --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxdmcp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eddca1f6d162a3947f167d35c21ca40de9904307", + "version": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxext.json b/external_imported/vcpkg/versions/l-/libxext.json new file mode 100644 index 000000000..5ffa055ae --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxext.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e67774822086eb3d56334159f5aad5579643b5d3", + "version": "1.3.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxfixes.json b/external_imported/vcpkg/versions/l-/libxfixes.json new file mode 100644 index 000000000..538847ac6 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxfixes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f0262e8d5145c540a26a4740b62c84794244586", + "version": "6.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxi.json b/external_imported/vcpkg/versions/l-/libxi.json new file mode 100644 index 000000000..4c3bd3155 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "af8e343976780e89ba9aca93f5dafcf3e0dcfecf", + "version": "1.8", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxkbcommon.json b/external_imported/vcpkg/versions/l-/libxkbcommon.json new file mode 100644 index 000000000..5cdbd5a14 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxkbcommon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "41ae34eb1eb104faea75a726f115e0e774c17d65", + "version": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxkbfile.json b/external_imported/vcpkg/versions/l-/libxkbfile.json new file mode 100644 index 000000000..849a5f8cc --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxkbfile.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4b6df8dfd8284d03ff745d341c1269c191027811", + "version": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxml2.json b/external_imported/vcpkg/versions/l-/libxml2.json index e3f0b4de3..208073dff 100644 --- a/external_imported/vcpkg/versions/l-/libxml2.json +++ b/external_imported/vcpkg/versions/l-/libxml2.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e1262b96218e08ee3cc877999c759e658cca8273", + "version": "2.9.14", + "port-version": 1 + }, + { + "git-tree": "454c94726c33c2893c30afbe34243d69dc4d91e0", + "version": "2.9.14", + "port-version": 0 + }, + { + "git-tree": "0da62e928cc294ad51a384594db59d6ff2dc49d4", + "version-semver": "2.9.13", + "port-version": 0 + }, { "git-tree": "582189632eff9dc4ba2ef262a853c339d2838bd9", "version-semver": "2.9.12", diff --git a/external_imported/vcpkg/versions/l-/libxmlmm.json b/external_imported/vcpkg/versions/l-/libxmlmm.json index 184f88ba9..a002ea62a 100644 --- a/external_imported/vcpkg/versions/l-/libxmlmm.json +++ b/external_imported/vcpkg/versions/l-/libxmlmm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "5f54a7f6dadcf5781a5d48d22a113f5f37af0956", + "version": "0.6.0", + "port-version": 3 + }, + { + "git-tree": "869d2ab96342804f872b8d56ad8ccd5e80b274b6", + "version": "0.6.0", + "port-version": 2 + }, { "git-tree": "4f34eb9988a27e6184d3271ca0e346793b30d836", "version-string": "0.6.0", diff --git a/external_imported/vcpkg/versions/l-/libxpm.json b/external_imported/vcpkg/versions/l-/libxpm.json new file mode 100644 index 000000000..cc9d5fcf4 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxpm.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "04f6484a58c91b33e62feae8a44caa25ab667aaf", + "version": "3.5.11", + "port-version": 1 + }, + { + "git-tree": "d72a962542b4175f99f5127b477866f2a5eba510", + "version": "3.5.11", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxrandr.json b/external_imported/vcpkg/versions/l-/libxrandr.json new file mode 100644 index 000000000..e621e9f4b --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxrandr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a2319ebdf2506031a67829f725660eba807869cc", + "version": "1.5.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxrender.json b/external_imported/vcpkg/versions/l-/libxrender.json new file mode 100644 index 000000000..a2e03f0a6 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxrender.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0ef5b766bea2ae48efec7303a59faefdbb0bb96", + "version": "0.9.10", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxres.json b/external_imported/vcpkg/versions/l-/libxres.json new file mode 100644 index 000000000..d2366d8fc --- /dev/null +++ b/external_imported/vcpkg/versions/l-/libxres.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a045d82350a03dfa05a612ae66ec5698c21bf195", + "version": "1.2.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/libxslt.json b/external_imported/vcpkg/versions/l-/libxslt.json index 4305d6ee5..0c97d9e82 100644 --- a/external_imported/vcpkg/versions/l-/libxslt.json +++ b/external_imported/vcpkg/versions/l-/libxslt.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "9aebd365040f19a4060880bbf942aeda189e94ed", + "version": "1.1.37", + "port-version": 0 + }, + { + "git-tree": "fb07abefc8894accd9967f41c8db983dcc031189", + "version": "1.1.35", + "port-version": 2 + }, + { + "git-tree": "3febc2931430356214f9a15ec06f7863ad4825d9", + "version": "1.1.35", + "port-version": 1 + }, + { + "git-tree": "d6fe77f9ea62ee9e22769ffd1ae0f28229df2a50", + "version": "1.1.35", + "port-version": 0 + }, + { + "git-tree": "063e2e6a6b9ef700f0c2587d2def57eb0e2285e6", + "version": "1.1.34", + "port-version": 5 + }, { "git-tree": "034ea26a2cde47c4d19df6eb35bc124a79ad37a3", "version": "1.1.34", diff --git a/external_imported/vcpkg/versions/l-/libzip.json b/external_imported/vcpkg/versions/l-/libzip.json index e14cc3658..6e694aafb 100644 --- a/external_imported/vcpkg/versions/l-/libzip.json +++ b/external_imported/vcpkg/versions/l-/libzip.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ec8e48c035f43c65ce9f0f5b455affaa92aa477e", + "version": "1.9.2", + "port-version": 0 + }, + { + "git-tree": "c09a3e4837603b5b74bd434802fdbf8c2367e494", + "version-semver": "1.9.0", + "port-version": 0 + }, { "git-tree": "aac0a6e50e8ada73d9bfeb5a5ce5e631fd37fce8", "version-semver": "1.8.0", diff --git a/external_imported/vcpkg/versions/l-/libzippp.json b/external_imported/vcpkg/versions/l-/libzippp.json index 2d17503c7..5b48d498e 100644 --- a/external_imported/vcpkg/versions/l-/libzippp.json +++ b/external_imported/vcpkg/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e5a10e0beabc7b9a1f9f313e62a1c73833e1c4f", + "version": "5.1-1.8.0", + "port-version": 0 + }, { "git-tree": "40f7e8d02ea29cb28b5c0c19257aebf97def3f8e", "version-string": "5.0-1.8.0", diff --git a/external_imported/vcpkg/versions/l-/linmath.json b/external_imported/vcpkg/versions/l-/linmath.json new file mode 100644 index 000000000..4c8bbaa50 --- /dev/null +++ b/external_imported/vcpkg/versions/l-/linmath.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0ecd0a63de52eff819e837a8fe44856b07228376", + "version-date": "2022-07-30", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/live555.json b/external_imported/vcpkg/versions/l-/live555.json index 68c898e36..c7e600765 100644 --- a/external_imported/vcpkg/versions/l-/live555.json +++ b/external_imported/vcpkg/versions/l-/live555.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6f99761c9c260c5b654cd1028610b2edaa3036e0", + "version-date": "2022-07-14", + "port-version": 0 + }, + { + "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "d2d9c96e8a0fa3a6af648952b384dc53504bf738", "version-date": "2021-12-18", diff --git a/external_imported/vcpkg/versions/l-/llfio.json b/external_imported/vcpkg/versions/l-/llfio.json index f2a4b5461..44ecb4107 100644 --- a/external_imported/vcpkg/versions/l-/llfio.json +++ b/external_imported/vcpkg/versions/l-/llfio.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "75a5c6e3170c65d747e5103b292f5da55ec2aa0a", + "version-date": "2022-09-18", + "port-version": 0 + }, + { + "git-tree": "7974159a11b2a1a1f5aed7b6c500eae3fa54481f", + "version-date": "2022-09-08", + "port-version": 0 + }, + { + "git-tree": "b6959e579906ce5c4ea9aa59f467499dce49a3b6", + "version": "2.0-20220112", + "port-version": 3 + }, + { + "git-tree": "c3d2d8d9dfddbbf74af7e1f603ac18e4aee2fe7a", + "version": "2.0-20220112", + "port-version": 2 + }, + { + "git-tree": "bc96b88ab308808ce26135e75038c4b316d5533c", + "version": "2.0-20220112", + "port-version": 1 + }, { "git-tree": "aaacb49264f3175de57367f28c90bd3904d7209f", "version-string": "2.0-20220112", diff --git a/external_imported/vcpkg/versions/l-/llvm.json b/external_imported/vcpkg/versions/l-/llvm.json index ee0a089ff..f330f79e6 100644 --- a/external_imported/vcpkg/versions/l-/llvm.json +++ b/external_imported/vcpkg/versions/l-/llvm.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7f97dd1dc56be6b5637b8406bd01ac0c245eb0dc", + "version": "14.0.4", + "port-version": 0 + }, + { + "git-tree": "741b89d3872cb0152d5c295ce075b8d751381f51", + "version": "14.0.3", + "port-version": 1 + }, + { + "git-tree": "751084451d4807176af868b2edab17131c2e4a09", + "version": "14.0.3", + "port-version": 0 + }, + { + "git-tree": "1c835fcc79ad542a73ac25fd939556039ff75cd1", + "version": "13.0.0", + "port-version": 5 + }, { "git-tree": "15418b7e938058677963d920b616403240eca37f", "version": "13.0.0", diff --git a/external_imported/vcpkg/versions/l-/lmdb.json b/external_imported/vcpkg/versions/l-/lmdb.json index 027244f68..d150fa7f1 100644 --- a/external_imported/vcpkg/versions/l-/lmdb.json +++ b/external_imported/vcpkg/versions/l-/lmdb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1c94e6b90d91bc39a4307502116b20d7b38de413", + "version": "0.9.29", + "port-version": 2 + }, + { + "git-tree": "02d32452e2c5a3284fcdd1f448ab513dbb18a085", + "version": "0.9.29", + "port-version": 1 + }, { "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", "version": "0.9.29", diff --git a/external_imported/vcpkg/versions/l-/lockpp.json b/external_imported/vcpkg/versions/l-/lockpp.json new file mode 100644 index 000000000..fbd5055fb --- /dev/null +++ b/external_imported/vcpkg/versions/l-/lockpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a186ea76115669b87e581cdc125423e950322d70", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/l-/log4cxx.json b/external_imported/vcpkg/versions/l-/log4cxx.json index c8f1a7ada..33fc5613a 100644 --- a/external_imported/vcpkg/versions/l-/log4cxx.json +++ b/external_imported/vcpkg/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65dd3e2c021462bc3445c9f215ace6936a177bb6", + "version": "0.13.0.1", + "port-version": 0 + }, { "git-tree": "b85ee3fd18c7e2f12f928ef132e5707059ad32c0", "version": "0.12.1", diff --git a/external_imported/vcpkg/versions/l-/lua.json b/external_imported/vcpkg/versions/l-/lua.json index 9ee6c7e25..5fb64a0a4 100644 --- a/external_imported/vcpkg/versions/l-/lua.json +++ b/external_imported/vcpkg/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1443185b76c2f6e0e74c425ed0b3176e98a5fb01", + "version": "5.4.4", + "port-version": 2 + }, { "git-tree": "26701e6e610ff6eaee198ca1aaa0b9125e4b2d6f", "version": "5.4.4", diff --git a/external_imported/vcpkg/versions/l-/luajit.json b/external_imported/vcpkg/versions/l-/luajit.json index 2e60dce61..7eeb517a5 100644 --- a/external_imported/vcpkg/versions/l-/luajit.json +++ b/external_imported/vcpkg/versions/l-/luajit.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "bacc33ec723d7fc2b895a1351a2042c5c6fb6971", + "version-date": "2022-08-11", + "port-version": 1 + }, + { + "git-tree": "4c2d21d9bf0e5cedc0f7540a7e473c2e86f2c5ef", + "version-date": "2022-08-11", + "port-version": 0 + }, + { + "git-tree": "9b560fe2d3810733d0b0f69b2a91093b02ac49b6", + "version": "2.0.5", + "port-version": 8 + }, + { + "git-tree": "daf2e19a72e3bf1d8a6c47a38489c9d1bd016d33", + "version": "2.0.5", + "port-version": 7 + }, + { + "git-tree": "d8d4e2ca9656ec3a26a0ade9f0421e17b11206c7", + "version": "2.0.5", + "port-version": 6 + }, { "git-tree": "3748aef9d3bd9d941f6af4d9c049cc55194cb7f5", "version": "2.0.5", diff --git a/external_imported/vcpkg/versions/l-/luasec.json b/external_imported/vcpkg/versions/l-/luasec.json index 29c704691..4881a9987 100644 --- a/external_imported/vcpkg/versions/l-/luasec.json +++ b/external_imported/vcpkg/versions/l-/luasec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c562198b62737a1b5c47ef51bb4a5a7b46fd3ce", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "ac5ef37f939164b6bc4a63bf7eeec24e8e8c5a79", "version": "1.0.1", diff --git a/external_imported/vcpkg/versions/l-/luasocket.json b/external_imported/vcpkg/versions/l-/luasocket.json index 568f5f181..fcddb746f 100644 --- a/external_imported/vcpkg/versions/l-/luasocket.json +++ b/external_imported/vcpkg/versions/l-/luasocket.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b4e4099cfa80585c7df33b66e37580cea982e83d", + "version": "3.0.0", + "port-version": 1 + }, + { + "git-tree": "2f809809d4b061b2579f41521b20a7c4a0992558", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "94ee0f78bf41cf8d10f7bc25b2305a9a0a33cb36", "version-date": "2020-09-14", diff --git a/external_imported/vcpkg/versions/l-/lz4.json b/external_imported/vcpkg/versions/l-/lz4.json index bfb6a07c4..78c007c57 100644 --- a/external_imported/vcpkg/versions/l-/lz4.json +++ b/external_imported/vcpkg/versions/l-/lz4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3b3f8d7799086d118dd166c346665ad71b66c19", + "version": "1.9.3", + "port-version": 4 + }, { "git-tree": "43957fa49e865966b52c6729db11aa067f790d49", "version": "1.9.3", diff --git a/external_imported/vcpkg/versions/m-/magic-enum.json b/external_imported/vcpkg/versions/m-/magic-enum.json index 26748e3dd..e39e687e2 100644 --- a/external_imported/vcpkg/versions/m-/magic-enum.json +++ b/external_imported/vcpkg/versions/m-/magic-enum.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c67da42e72855b5d2d5d72d570fafb3a1149fa01", + "version": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "2b170feb45c6c04a727f51a40d65fd01b5f0afdc", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", "version-string": "0.7.3", diff --git a/external_imported/vcpkg/versions/m-/magnum.json b/external_imported/vcpkg/versions/m-/magnum.json index f4ee5a923..4257e7602 100644 --- a/external_imported/vcpkg/versions/m-/magnum.json +++ b/external_imported/vcpkg/versions/m-/magnum.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e6431ca1de3d870f6489764786af14b7230fa29f", + "version-string": "2020.06", + "port-version": 11 + }, + { + "git-tree": "13edb110eb5bc10f3591616c0fb64e7bc4b2ce9f", + "version-string": "2020.06", + "port-version": 10 + }, { "git-tree": "bb2fc062b29313fd1d23a656464fb3dd2b983370", "version-string": "2020.06", diff --git a/external_imported/vcpkg/versions/m-/mailio.json b/external_imported/vcpkg/versions/m-/mailio.json index 156df34a5..505193296 100644 --- a/external_imported/vcpkg/versions/m-/mailio.json +++ b/external_imported/vcpkg/versions/m-/mailio.json @@ -6,7 +6,7 @@ "port-version": 2 }, { - "git-tree": "f0fde0f6599aacd2b890c94326f504bf2af8f642", + "git-tree": "80186942edc09cad3c911ebbc6dd77d30af68502", "version": "0.21.0", "port-version": 1 }, diff --git a/external_imported/vcpkg/versions/m-/mapnik.json b/external_imported/vcpkg/versions/m-/mapnik.json index 19ea139eb..7f11caf03 100644 --- a/external_imported/vcpkg/versions/m-/mapnik.json +++ b/external_imported/vcpkg/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd7ab22238efd828be89e8e17677aa5b395ac07b", + "version-date": "2022-01-28", + "port-version": 2 + }, { "git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc", "version-date": "2022-01-28", diff --git a/external_imported/vcpkg/versions/m-/marble.json b/external_imported/vcpkg/versions/m-/marble.json index 69ee45563..c9d010a3d 100644 --- a/external_imported/vcpkg/versions/m-/marble.json +++ b/external_imported/vcpkg/versions/m-/marble.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c1e722f12de290f18b92e662040c499a51d57249", + "version-string": "22.04.0", + "port-version": 1 + }, + { + "git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a", + "version-string": "22.04.0", + "port-version": 0 + }, { "git-tree": "eb15f05858eaff46b5d7b142d3c874f889d26557", "version-string": "19.08.2", diff --git a/external_imported/vcpkg/versions/m-/matchit.json b/external_imported/vcpkg/versions/m-/matchit.json new file mode 100644 index 000000000..1bcabadf6 --- /dev/null +++ b/external_imported/vcpkg/versions/m-/matchit.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1076ccb795a41c9ac08c17b06a295043695ed6ab", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/m-/materialx.json b/external_imported/vcpkg/versions/m-/materialx.json new file mode 100644 index 000000000..b2b5b2346 --- /dev/null +++ b/external_imported/vcpkg/versions/m-/materialx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0dc3a4ac664a5b4fe18a946a35965b519c148e7", + "version": "1.38.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/m-/mathgl.json b/external_imported/vcpkg/versions/m-/mathgl.json index f1cb188ae..34ddc7066 100644 --- a/external_imported/vcpkg/versions/m-/mathgl.json +++ b/external_imported/vcpkg/versions/m-/mathgl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e86f7ba9325f53bd43f5713e38d78fba18e7bc1d", + "version": "2.5", + "port-version": 2 + }, + { + "git-tree": "2601a536d9214365148c954f41a6597939a89d7d", + "version": "2.5", + "port-version": 1 + }, { "git-tree": "d75f46bbb8d518f326f688d355d5e9d241f44dc6", "version": "2.5", diff --git a/external_imported/vcpkg/versions/m-/matio.json b/external_imported/vcpkg/versions/m-/matio.json index 74bf34be5..472498c79 100644 --- a/external_imported/vcpkg/versions/m-/matio.json +++ b/external_imported/vcpkg/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e018403a4c2e749f8983b6a64f60dac577342853", + "version-semver": "1.5.23", + "port-version": 0 + }, { "git-tree": "c11c8ba1ca5c7f0286165d497088779ec0df756a", "version-semver": "1.5.19", diff --git a/external_imported/vcpkg/versions/m-/matplotplusplus.json b/external_imported/vcpkg/versions/m-/matplotplusplus.json index 6d730f39d..8dc2b38c2 100644 --- a/external_imported/vcpkg/versions/m-/matplotplusplus.json +++ b/external_imported/vcpkg/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8554ae7ec807245bdcd27b44ddebd39608edfe53", + "version-date": "2021-04-11", + "port-version": 6 + }, { "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b", "version-date": "2021-04-11", diff --git a/external_imported/vcpkg/versions/m-/mbedtls.json b/external_imported/vcpkg/versions/m-/mbedtls.json index 440fc362e..161576939 100644 --- a/external_imported/vcpkg/versions/m-/mbedtls.json +++ b/external_imported/vcpkg/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fd876a24f60e3034438c6793627be091ab6426", + "version": "2.28.1", + "port-version": 0 + }, { "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", "version": "2.28.0", diff --git a/external_imported/vcpkg/versions/m-/mchehab-zbar.json b/external_imported/vcpkg/versions/m-/mchehab-zbar.json new file mode 100644 index 000000000..8b4e71c46 --- /dev/null +++ b/external_imported/vcpkg/versions/m-/mchehab-zbar.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7c066057a5c24bbea65e26e9e7519db938a2932e", + "version": "0.23.90", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/m-/mdns.json b/external_imported/vcpkg/versions/m-/mdns.json index b902fa0fd..1f40a43a9 100644 --- a/external_imported/vcpkg/versions/m-/mdns.json +++ b/external_imported/vcpkg/versions/m-/mdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "4983c367da3c0798e1e0a7b9d8844eeba57c5b97", "version": "1.4.1", diff --git a/external_imported/vcpkg/versions/m-/mdnsresponder.json b/external_imported/vcpkg/versions/m-/mdnsresponder.json index f410f5208..e15d683a2 100644 --- a/external_imported/vcpkg/versions/m-/mdnsresponder.json +++ b/external_imported/vcpkg/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "682a242458b4279dc56aa5111c5c94dc09038c23", + "version": "878.270.2", + "port-version": 2 + }, { "git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55", "version": "878.270.2", diff --git a/external_imported/vcpkg/versions/m-/mesa.json b/external_imported/vcpkg/versions/m-/mesa.json index 37187a0e3..9151abe24 100644 --- a/external_imported/vcpkg/versions/m-/mesa.json +++ b/external_imported/vcpkg/versions/m-/mesa.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7febde5a35ffc0cc975e25219121f5dc7048e0ef", + "version": "22.1.7", + "port-version": 0 + }, + { + "git-tree": "7df282d97d0ef5ec5a19b770dced8cd773e570c0", + "version": "22.0.2", + "port-version": 0 + }, + { + "git-tree": "32925250dd7d2e060ca2cfe9fbda1d3f4312f29a", + "version": "21.2.5", + "port-version": 4 + }, { "git-tree": "aa75375f1cc9c3c4697c8fa8df4e647fb60f0125", "version": "21.2.5", diff --git a/external_imported/vcpkg/versions/m-/meschach.json b/external_imported/vcpkg/versions/m-/meschach.json index ed69f8e81..abd1ed099 100644 --- a/external_imported/vcpkg/versions/m-/meschach.json +++ b/external_imported/vcpkg/versions/m-/meschach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e475a3306653b4ab8f50dc691dff3f7fda152b83", + "version-string": "1.2b", + "port-version": 5 + }, { "git-tree": "11c21ca45a95bf05d74344c2518e3a9d107da566", "version-string": "1.2b", diff --git a/external_imported/vcpkg/versions/m-/metis.json b/external_imported/vcpkg/versions/m-/metis.json index 82f7ccab1..2842a70cf 100644 --- a/external_imported/vcpkg/versions/m-/metis.json +++ b/external_imported/vcpkg/versions/m-/metis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a8b82dc534499155aca4057cb5ee998da7cdbc4", + "version-date": "2022-07-27", + "port-version": 0 + }, { "git-tree": "f3670208e9dc0b726c3c009e37f2398b7f2acca3", "version-string": "5.1.0", diff --git a/external_imported/vcpkg/versions/m-/mgnlibs.json b/external_imported/vcpkg/versions/m-/mgnlibs.json index ae2cc30ba..d8807add7 100644 --- a/external_imported/vcpkg/versions/m-/mgnlibs.json +++ b/external_imported/vcpkg/versions/m-/mgnlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1713a84947406acff6800ccc47f68951394b424d", + "version-date": "2019-09-29", + "port-version": 2 + }, { "git-tree": "4a611255e7ec6133fd9167e7db71227a7da8dd22", "version-string": "2019-09-29", diff --git a/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json b/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json index 90859a944..884fcc3ac 100644 --- a/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json +++ b/external_imported/vcpkg/versions/m-/milerius-sfml-imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "959aac1b74b20fe931081e70cedd5e82533669fc", + "version": "1.1", + "port-version": 5 + }, { "git-tree": "4bfc198df4803019e174c0489fcc91e178f66930", "version": "1.1", diff --git a/external_imported/vcpkg/versions/m-/mimalloc.json b/external_imported/vcpkg/versions/m-/mimalloc.json index d5427e0d1..cf9938722 100644 --- a/external_imported/vcpkg/versions/m-/mimalloc.json +++ b/external_imported/vcpkg/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d0b88ffbb864754eb8b01ac111f84adb8a36a8", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4", "version": "2.0.5", diff --git a/external_imported/vcpkg/versions/m-/minimp3.json b/external_imported/vcpkg/versions/m-/minimp3.json index 415f3d8c8..73663162f 100644 --- a/external_imported/vcpkg/versions/m-/minimp3.json +++ b/external_imported/vcpkg/versions/m-/minimp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2997f9c06f0831c803fca134a599171dc2399bc4", + "version-date": "2021-11-30", + "port-version": 0 + }, { "git-tree": "4ed9d5474095c5aaecd2fc4ccab507523dd98241", "version-string": "2020-12-25", diff --git a/external_imported/vcpkg/versions/m-/minio-cpp.json b/external_imported/vcpkg/versions/m-/minio-cpp.json index 66dde1213..345558d6e 100644 --- a/external_imported/vcpkg/versions/m-/minio-cpp.json +++ b/external_imported/vcpkg/versions/m-/minio-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0c6bcc87e2a8548708c11f3e7c3148f1004d3146", + "version": "0.1.1", + "port-version": 1 + }, + { + "git-tree": "8442cf19a35307cd48476abbf05e85194509c7a2", + "version": "0.1.1", + "port-version": 0 + }, + { + "git-tree": "e406e5f0c1d14b66ad6e58c91d122ca0d01df04c", + "version": "0.1.0", + "port-version": 0 + }, { "git-tree": "0b0fe1b9353fd016b3f2e3212ae30a7a82b71ceb", "version-date": "2022-01-03", diff --git a/external_imported/vcpkg/versions/m-/minizip.json b/external_imported/vcpkg/versions/m-/minizip.json index 5931b7c32..9c1239b4e 100644 --- a/external_imported/vcpkg/versions/m-/minizip.json +++ b/external_imported/vcpkg/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "528703ed8d2b78aeaa55695765535efafa24540b", + "version-semver": "1.2.11", + "port-version": 11 + }, { "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", "version-semver": "1.2.11", diff --git a/external_imported/vcpkg/versions/m-/mmloader.json b/external_imported/vcpkg/versions/m-/mmloader.json index a381834b3..3257087c7 100644 --- a/external_imported/vcpkg/versions/m-/mmloader.json +++ b/external_imported/vcpkg/versions/m-/mmloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad", + "version": "1.0.1", + "port-version": 2 + }, { "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", "version-date": "2021-12-13", diff --git a/external_imported/vcpkg/versions/m-/mnn.json b/external_imported/vcpkg/versions/m-/mnn.json index af46b0080..6f5141ac9 100644 --- a/external_imported/vcpkg/versions/m-/mnn.json +++ b/external_imported/vcpkg/versions/m-/mnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f76a851632ab292ad4fbabcf5b6e94c0c6d957b", + "version": "1.1.0", + "port-version": 3 + }, { "git-tree": "e77125ae365a54bdcbbdb5bb2d77d32834a4487b", "version": "1.1.0", diff --git a/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json b/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json index 4510acc81..38482de4a 100644 --- a/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json +++ b/external_imported/vcpkg/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "732830e44f7d4c9c31025d6c77e7d40220abef38", + "version": "3.6.5", + "port-version": 3 + }, { "git-tree": "2c9183634ff53b6e76b201ad39abf63b5d26bc8a", "version": "3.6.5", diff --git a/external_imported/vcpkg/versions/m-/mongoose.json b/external_imported/vcpkg/versions/m-/mongoose.json index 7d09a84ad..35a0e8175 100644 --- a/external_imported/vcpkg/versions/m-/mongoose.json +++ b/external_imported/vcpkg/versions/m-/mongoose.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbba0161f41a1ea996f1e64afecc998e01e59661", + "version": "7.6", + "port-version": 0 + }, { "git-tree": "504d873811dc91402f21952ea4c9fd08602cc822", "version": "7.5", diff --git a/external_imported/vcpkg/versions/m-/moos-core.json b/external_imported/vcpkg/versions/m-/moos-core.json index 16f32ea86..b3c3d744a 100644 --- a/external_imported/vcpkg/versions/m-/moos-core.json +++ b/external_imported/vcpkg/versions/m-/moos-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2081cab97d387c22addea1cec2a244f45a1a6b09", + "version": "10.4.0", + "port-version": 7 + }, { "git-tree": "bbdd0d3fb08ac68bdd5d73aedb783d5edf912845", "version-string": "10.4.0", diff --git a/external_imported/vcpkg/versions/m-/mosquitto.json b/external_imported/vcpkg/versions/m-/mosquitto.json index 597552f8c..b8884b9e3 100644 --- a/external_imported/vcpkg/versions/m-/mosquitto.json +++ b/external_imported/vcpkg/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d", + "version": "2.0.14", + "port-version": 0 + }, { "git-tree": "f57ff6e27ac8e72ba497868198a9c9ae3d0bd281", "version": "2.0.12", diff --git a/external_imported/vcpkg/versions/m-/mp-units.json b/external_imported/vcpkg/versions/m-/mp-units.json index a8e54c22c..ef5ebfecc 100644 --- a/external_imported/vcpkg/versions/m-/mp-units.json +++ b/external_imported/vcpkg/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bce95b7e67f66db9d613e7e3601c2b90cec665", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "ed05b65c897d6508b0b5f88f8a97373cf8fd8715", "version-semver": "0.7.0", diff --git a/external_imported/vcpkg/versions/m-/mp3lame.json b/external_imported/vcpkg/versions/m-/mp3lame.json index bcabc3520..4389fec3a 100644 --- a/external_imported/vcpkg/versions/m-/mp3lame.json +++ b/external_imported/vcpkg/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd7f2793ec89d5ce9c00b4b9848a80905eb7ab67", + "version": "3.100", + "port-version": 8 + }, { "git-tree": "ead40ed860e86cd8c3c5492b9bb3fcc7c8a2770e", "version-string": "3.100", diff --git a/external_imported/vcpkg/versions/m-/mpfr.json b/external_imported/vcpkg/versions/m-/mpfr.json index e3316b5bb..4336a2c57 100644 --- a/external_imported/vcpkg/versions/m-/mpfr.json +++ b/external_imported/vcpkg/versions/m-/mpfr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0d41295a2963c8db8171724b2456dfaa2ec1a866", + "version": "4.1.0", + "port-version": 6 + }, + { + "git-tree": "39b251ed109ce7a5787fe0e7235f9fe0ce436a09", + "version": "4.1.0", + "port-version": 5 + }, { "git-tree": "af50e086428e7b7b1e1e5969a296a770a32ff88d", "version": "4.1.0", diff --git a/external_imported/vcpkg/versions/m-/mpg123.json b/external_imported/vcpkg/versions/m-/mpg123.json index ead30f3ac..82c90e4bc 100644 --- a/external_imported/vcpkg/versions/m-/mpg123.json +++ b/external_imported/vcpkg/versions/m-/mpg123.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2b99f7a71d1996dc6a61c81a11a9a98805eba1c4", + "version": "1.29.3", + "port-version": 0 + }, + { + "git-tree": "d3b079fc036d9384ae34ead0db7c689499937039", + "version": "1.29.2", + "port-version": 3 + }, { "git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2", "version": "1.29.2", diff --git a/external_imported/vcpkg/versions/m-/mpi.json b/external_imported/vcpkg/versions/m-/mpi.json index 599d1b627..d177803d6 100644 --- a/external_imported/vcpkg/versions/m-/mpi.json +++ b/external_imported/vcpkg/versions/m-/mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eacb3d18a3407d1ceb6211ee7cad0b157249d22", + "version-string": "1", + "port-version": 3 + }, { "git-tree": "783aea281dc7cdf59ec0636bd60c2feaef6595b4", "version-string": "1", diff --git a/external_imported/vcpkg/versions/m-/mpir.json b/external_imported/vcpkg/versions/m-/mpir.json index ff850fbcd..8f7790807 100644 --- a/external_imported/vcpkg/versions/m-/mpir.json +++ b/external_imported/vcpkg/versions/m-/mpir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6", + "version-date": "2022-03-02", + "port-version": 1 + }, { "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", "version-date": "2022-03-02", diff --git a/external_imported/vcpkg/versions/m-/mpmcqueue.json b/external_imported/vcpkg/versions/m-/mpmcqueue.json index 7e226ceda..2234a129f 100644 --- a/external_imported/vcpkg/versions/m-/mpmcqueue.json +++ b/external_imported/vcpkg/versions/m-/mpmcqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7986416e7dd33174b060331018a3b8aeee3018f0", + "version-date": "2021-12-01", + "port-version": 0 + }, { "git-tree": "1953040343e61f40deb621b5ca28aed36ebc2008", "version-string": "2019-07-26", diff --git a/external_imported/vcpkg/versions/m-/mqtt-cpp.json b/external_imported/vcpkg/versions/m-/mqtt-cpp.json index 482ba03f6..d4a7ddf8a 100644 --- a/external_imported/vcpkg/versions/m-/mqtt-cpp.json +++ b/external_imported/vcpkg/versions/m-/mqtt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "185adb92fcfed90301dfc5aec8390b687cd35403", + "version-semver": "13.0.0", + "port-version": 0 + }, { "git-tree": "869a51ca4a2e5b126e9de0af838a24fb9e7c3ab1", "version-semver": "12.0.0", diff --git a/external_imported/vcpkg/versions/m-/ms-gltf.json b/external_imported/vcpkg/versions/m-/ms-gltf.json index d31cbad7f..82b9a8bda 100644 --- a/external_imported/vcpkg/versions/m-/ms-gltf.json +++ b/external_imported/vcpkg/versions/m-/ms-gltf.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b189e4d23ebe85437573b386d94b06b3f9fb6238", + "version-date": "2022-06-28", + "port-version": 1 + }, + { + "git-tree": "a9a91635168ea77faa39adb73b27483797fa8967", + "version-date": "2022-06-28", + "port-version": 0 + }, { "git-tree": "b287c12480725603087cb1ebd5044a6a4bd6b2cb", "version-string": "r1.9.5.4", diff --git a/external_imported/vcpkg/versions/m-/msdfgen.json b/external_imported/vcpkg/versions/m-/msdfgen.json index 333d04e5c..c6ca1037f 100644 --- a/external_imported/vcpkg/versions/m-/msdfgen.json +++ b/external_imported/vcpkg/versions/m-/msdfgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49eb065f4ec389be55189e28ab310178281bfe7", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "eade2edd986173003ec960fa30d29226a35ddb68", "version": "1.9.1", diff --git a/external_imported/vcpkg/versions/m-/msix.json b/external_imported/vcpkg/versions/m-/msix.json index f76cdce2f..c915f2459 100644 --- a/external_imported/vcpkg/versions/m-/msix.json +++ b/external_imported/vcpkg/versions/m-/msix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13d1f847b9d20c6ff27d6bed27728fb145aedd50", + "version": "1.7", + "port-version": 4 + }, { "git-tree": "e544825ca69bfca4e3f54141bf62cacb1cd878ea", "version": "1.7", diff --git a/external_imported/vcpkg/versions/m-/msmpi.json b/external_imported/vcpkg/versions/m-/msmpi.json index 16149fa95..1cca454f3 100644 --- a/external_imported/vcpkg/versions/m-/msmpi.json +++ b/external_imported/vcpkg/versions/m-/msmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3ccfae00ebdaac2c41fa2acfa59b862171be3ae", + "version": "10.1.12498", + "port-version": 4 + }, { "git-tree": "92f5e217faeaf4ec7e205a56bfff3a13b75e0393", "version": "10.1.12498", diff --git a/external_imported/vcpkg/versions/m-/mygui.json b/external_imported/vcpkg/versions/m-/mygui.json index d7b1309f5..2ca6e8ec6 100644 --- a/external_imported/vcpkg/versions/m-/mygui.json +++ b/external_imported/vcpkg/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7598c7df27293baca5e55e28c20aec14bf5672", + "version": "3.4.1", + "port-version": 3 + }, { "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", "version": "3.4.1", diff --git a/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json b/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json new file mode 100644 index 000000000..8dd35179f --- /dev/null +++ b/external_imported/vcpkg/versions/m-/mysql-connector-cpp.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26", + "version": "8.0.30", + "port-version": 1 + }, + { + "git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93", + "version": "8.0.30", + "port-version": 0 + }, + { + "git-tree": "9189c43b6dc73ec3c3765d025e12297fd5a79d37", + "version": "1.1.13", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/nameof.json b/external_imported/vcpkg/versions/n-/nameof.json index 2bce04d63..9db7ec0e2 100644 --- a/external_imported/vcpkg/versions/n-/nameof.json +++ b/external_imported/vcpkg/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e74d9d06b8f8982ecfbad4b07e5215c8ea054b", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "73b076af7e5bb74d8531885c3172ccdea74bce80", "version-string": "0.10.1", diff --git a/external_imported/vcpkg/versions/n-/nanobench.json b/external_imported/vcpkg/versions/n-/nanobench.json index 7be13eb56..59ceaf25a 100644 --- a/external_imported/vcpkg/versions/n-/nanobench.json +++ b/external_imported/vcpkg/versions/n-/nanobench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6353026a82baa4c84cc43554b4f518b8dbf79794", + "version": "4.3.7", + "port-version": 0 + }, { "git-tree": "b2078ee30dd4414efb21ecb3fe7c54efa854bc95", "version": "4.3.6", diff --git a/external_imported/vcpkg/versions/n-/nanoflann.json b/external_imported/vcpkg/versions/n-/nanoflann.json index cda02d8a5..6145f412d 100644 --- a/external_imported/vcpkg/versions/n-/nanoflann.json +++ b/external_imported/vcpkg/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59c3e1998e35dcf6648c1775b19e40c5017b2c84", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d", "version": "1.3.2", diff --git a/external_imported/vcpkg/versions/n-/nanogui.json b/external_imported/vcpkg/versions/n-/nanogui.json index 25cc3e33a..a7117eac6 100644 --- a/external_imported/vcpkg/versions/n-/nanogui.json +++ b/external_imported/vcpkg/versions/n-/nanogui.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ba52e521c1d71e2e1c855913e9a1b437920a9fc9", + "version-date": "2019-09-23", + "port-version": 5 + }, + { + "git-tree": "7b0c7f8295a21f967bfd880956f6d51b98d26874", + "version-date": "2019-09-23", + "port-version": 4 + }, { "git-tree": "55a7f3e088fe04ac01f7693c0685770ba865e6ae", "version-date": "2019-09-23", diff --git a/external_imported/vcpkg/versions/n-/nanosvg.json b/external_imported/vcpkg/versions/n-/nanosvg.json new file mode 100644 index 000000000..9a3038374 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nanosvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "827223ed18553b608489e328101549261d0c9d5a", + "version-date": "2022-04-29", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/ncnn.json b/external_imported/vcpkg/versions/n-/ncnn.json new file mode 100644 index 000000000..ef0cf20d1 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/ncnn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e87afd4b85016896dc6903f9e65e1d239e614b0b", + "version": "20220729", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/ncurses.json b/external_imported/vcpkg/versions/n-/ncurses.json index 26698d561..f0a3c5bdd 100644 --- a/external_imported/vcpkg/versions/n-/ncurses.json +++ b/external_imported/vcpkg/versions/n-/ncurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f61c866b4032d902b9c31cec60a4418615ae921b", + "version": "6.3", + "port-version": 2 + }, { "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", "version": "6.3", diff --git a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json index dbd0afaa8..fcf8c63a7 100644 --- a/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json +++ b/external_imported/vcpkg/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "e9c41d87d7d3dc77a9d7dfaddef8571574721f0d", + "version-date": "2022-09-08", + "port-version": 1 + }, + { + "git-tree": "89d5a8630a97d2e3a7cae1a56253de75014a0738", + "version-date": "2022-09-08", + "port-version": 0 + }, + { + "git-tree": "081192c8586e086ef1fe8beb576255f86dc9458e", + "version-date": "2022-07-04", + "port-version": 0 + }, + { + "git-tree": "3ab059ed3893e5635482409f22bd73cdbcec2166", + "version-date": "2022-06-17", + "port-version": 0 + }, + { + "git-tree": "be7fa7b222ea2c080583b12ad2f203d63c7ed55c", + "version": "0.0.0-cad832c8", + "port-version": 1 + }, { "git-tree": "af77893b0d87106812194f8bc866ecfbc6ade24a", "version-string": "0.0.0-cad832c8", diff --git a/external_imported/vcpkg/versions/n-/nethost.json b/external_imported/vcpkg/versions/n-/nethost.json index 0181e8cde..979f1d085 100644 --- a/external_imported/vcpkg/versions/n-/nethost.json +++ b/external_imported/vcpkg/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "267a7f140709e65c5d692a7f3add885021764c25", + "version": "6.0.5", + "port-version": 0 + }, { "git-tree": "5b1a7d98ce2c1520bbb370dfc2fcb8c3d704c300", "version-date": "2019-12-21", diff --git a/external_imported/vcpkg/versions/n-/nghttp2.json b/external_imported/vcpkg/versions/n-/nghttp2.json index fe89531ac..0ca6003ad 100644 --- a/external_imported/vcpkg/versions/n-/nghttp2.json +++ b/external_imported/vcpkg/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c6faba492d188ec0f72078720084f6a4dc00c3", + "version": "1.49.0", + "port-version": 0 + }, { "git-tree": "b7477580246c8547d75abc176295b832544cb132", "version": "1.46.0", diff --git a/external_imported/vcpkg/versions/n-/nghttp3.json b/external_imported/vcpkg/versions/n-/nghttp3.json new file mode 100644 index 000000000..86df12c31 --- /dev/null +++ b/external_imported/vcpkg/versions/n-/nghttp3.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "cf61122128fd277764b9319577d2ed3636c1d0d0", + "version": "0.7.0", + "port-version": 1 + }, + { + "git-tree": "f71e5ffcb5802adeb997b151ea1277662ff9b03f", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/n-/ngspice.json b/external_imported/vcpkg/versions/n-/ngspice.json index 79a6d2a47..cf170a13f 100644 --- a/external_imported/vcpkg/versions/n-/ngspice.json +++ b/external_imported/vcpkg/versions/n-/ngspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a20625f4656372060074ee98cf95ef002b16178", + "version": "37", + "port-version": 0 + }, { "git-tree": "ec514c4b9a568123369d7d081d004a2d92f6d592", "version": "35", diff --git a/external_imported/vcpkg/versions/n-/nifticlib.json b/external_imported/vcpkg/versions/n-/nifticlib.json index b3f2e4843..d586284ed 100644 --- a/external_imported/vcpkg/versions/n-/nifticlib.json +++ b/external_imported/vcpkg/versions/n-/nifticlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bee84e9bdd74b5b80c68eb3c8933a86a51b37915", + "version-date": "2020-04-30", + "port-version": 2 + }, { "git-tree": "e27d9a2c6e8d4b8b00fc3d1adb0f54f06fa5adee", "version-string": "2020-04-30", diff --git a/external_imported/vcpkg/versions/n-/nlohmann-json.json b/external_imported/vcpkg/versions/n-/nlohmann-json.json index 2b6fa1d43..382f3b167 100644 --- a/external_imported/vcpkg/versions/n-/nlohmann-json.json +++ b/external_imported/vcpkg/versions/n-/nlohmann-json.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "caa64b8c731ac2457575ea3c5f1827bc82ecac84", + "version-semver": "3.11.2", + "port-version": 0 + }, + { + "git-tree": "91f188e19b106e7d316de593e98f3319f8f5ec25", + "version-semver": "3.10.5", + "port-version": 3 + }, { "git-tree": "becf6a86f7e28342840fc807840c68b133c6fad8", "version-semver": "3.10.5", diff --git a/external_imported/vcpkg/versions/n-/nlopt.json b/external_imported/vcpkg/versions/n-/nlopt.json index e4eed6a6b..9450b649d 100644 --- a/external_imported/vcpkg/versions/n-/nlopt.json +++ b/external_imported/vcpkg/versions/n-/nlopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b98ca95cd180e8c31c718f78ef39b5d733f0399f", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "8307558e59725a365e7139c8e5fd371e5d3481e4", "version-string": "2.7.0", diff --git a/external_imported/vcpkg/versions/n-/nng.json b/external_imported/vcpkg/versions/n-/nng.json index a63b84091..b13488a6a 100644 --- a/external_imported/vcpkg/versions/n-/nng.json +++ b/external_imported/vcpkg/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e400d4ac38af1eafba51433102b0963d06053b2", + "version-semver": "1.5.2", + "port-version": 0 + }, { "git-tree": "ec4958fd8785c45084ce752f527ab7ef7acd69a7", "version-semver": "1.5.1", diff --git a/external_imported/vcpkg/versions/n-/nowide.json b/external_imported/vcpkg/versions/n-/nowide.json index ef5bd9f1a..a90912bd7 100644 --- a/external_imported/vcpkg/versions/n-/nowide.json +++ b/external_imported/vcpkg/versions/n-/nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc71e4553a59625e8daaf2c3e1d54af1f19a0279", + "version": "11.2.0", + "port-version": 0 + }, { "git-tree": "2243fbc97eb5f4ef81fe44e85e449227464cc185", "version": "11.1.3", diff --git a/external_imported/vcpkg/versions/n-/nrf-ble-driver.json b/external_imported/vcpkg/versions/n-/nrf-ble-driver.json index e01064548..6e6d7e609 100644 --- a/external_imported/vcpkg/versions/n-/nrf-ble-driver.json +++ b/external_imported/vcpkg/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82619c9f6f7860cb053b79c1091a39e0483b7d85", + "version": "4.1.2", + "port-version": 2 + }, { "git-tree": "f0f55511374a869316d374399923f94dc25c4150", "version-string": "4.1.2", diff --git a/external_imported/vcpkg/versions/n-/nspr.json b/external_imported/vcpkg/versions/n-/nspr.json index a784fd068..342fccc54 100644 --- a/external_imported/vcpkg/versions/n-/nspr.json +++ b/external_imported/vcpkg/versions/n-/nspr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a07f5ffc6f4bd4a9154a599898fbac38115c8124", + "version": "4.33", + "port-version": 2 + }, + { + "git-tree": "efd7b94673495b09ee48d1c2a4453f70c5e0bb7c", + "version": "4.33", + "port-version": 1 + }, { "git-tree": "ec6fe24b3b4db98f624391627f113a7bd93397eb", "version": "4.33", diff --git a/external_imported/vcpkg/versions/n-/nss.json b/external_imported/vcpkg/versions/n-/nss.json index f715e04fb..072371591 100644 --- a/external_imported/vcpkg/versions/n-/nss.json +++ b/external_imported/vcpkg/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6256143502011312dc467a9c57f0955617fee6d3", + "version": "3.78", + "port-version": 0 + }, { "git-tree": "06e7680df336bb6be816c75e42c6304d11566a3d", "version": "3.77", diff --git a/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json index 09a5878c1..a4c0521d8 100644 --- a/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json +++ b/external_imported/vcpkg/versions/n-/nu-book-zxing-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "316c6275dffcc126f298440ee209121c98996f5c", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "b807d508317d0b4bfc5a368fae07f81770851c0b", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/n-/nuklear.json b/external_imported/vcpkg/versions/n-/nuklear.json index 195260366..c86d86b83 100644 --- a/external_imported/vcpkg/versions/n-/nuklear.json +++ b/external_imported/vcpkg/versions/n-/nuklear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7a06d2b4b1e882bff894a676e9c89d25898d7c4", + "version-date": "2022-05-12", + "port-version": 0 + }, { "git-tree": "9c243e51fbb0d9fa4562a3e4a8eba9a7fb2e0cdd", "version-date": "2021-03-18", diff --git a/external_imported/vcpkg/versions/n-/nuspell.json b/external_imported/vcpkg/versions/n-/nuspell.json index a6bb2cf29..b27722218 100644 --- a/external_imported/vcpkg/versions/n-/nuspell.json +++ b/external_imported/vcpkg/versions/n-/nuspell.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "0daf4a7623ab68c7f706b815dbe29e8f4627668e", + "version-semver": "5.1.1", + "port-version": 0 + }, + { + "git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a", + "version-semver": "5.1.0", + "port-version": 2 + }, + { + "git-tree": "02475776fc8cc0332efe7e0ea8851872c911de32", + "version-semver": "5.1.0", + "port-version": 1 + }, + { + "git-tree": "53fb93bbc0d441813026ef171e32d7479ab839f3", + "version-semver": "5.1.0", + "port-version": 0 + }, { "git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb", "version-semver": "5.0.0", diff --git a/external_imported/vcpkg/versions/n-/nvtt.json b/external_imported/vcpkg/versions/n-/nvtt.json index 9eb4a0ee0..876fe47d0 100644 --- a/external_imported/vcpkg/versions/n-/nvtt.json +++ b/external_imported/vcpkg/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1a685fa7402dce13182820ddd1dce2c6126b69f", + "version": "2.1.2", + "port-version": 5 + }, { "git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc", "version": "2.1.2", diff --git a/external_imported/vcpkg/versions/o-/oatpp-consul.json b/external_imported/vcpkg/versions/o-/oatpp-consul.json index 3dfcbc547..917b44540 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-consul.json +++ b/external_imported/vcpkg/versions/o-/oatpp-consul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbf60e5cb055ff29081126e61debb330651a24fd", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-curl.json b/external_imported/vcpkg/versions/o-/oatpp-curl.json index 2302f299d..641eaf22e 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-curl.json +++ b/external_imported/vcpkg/versions/o-/oatpp-curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca3da373f9eca04129ab53c726e00678b7727a6e", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "ae678502914406793d56adb1bffbede8febdfb77", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-libressl.json b/external_imported/vcpkg/versions/o-/oatpp-libressl.json index 0440e9e5f..b565bf764 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-libressl.json +++ b/external_imported/vcpkg/versions/o-/oatpp-libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c52fe5660b4e58aa5782ccd3a43e5298f4225fe1", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-mongo.json b/external_imported/vcpkg/versions/o-/oatpp-mongo.json index e89f32c69..f64909604 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-mongo.json +++ b/external_imported/vcpkg/versions/o-/oatpp-mongo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e9c046ae1943591d58c8e48aee697a0e7718f8d", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-postgresql.json b/external_imported/vcpkg/versions/o-/oatpp-postgresql.json index 76f2a3112..bbf50cea9 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-postgresql.json +++ b/external_imported/vcpkg/versions/o-/oatpp-postgresql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d182a4a2fa22b5a9da9b16eca3a37d7bdb74b44", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-sqlite.json b/external_imported/vcpkg/versions/o-/oatpp-sqlite.json index 29af51afe..c10220090 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-sqlite.json +++ b/external_imported/vcpkg/versions/o-/oatpp-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-ssdp.json b/external_imported/vcpkg/versions/o-/oatpp-ssdp.json index dbd84e5c2..342f0818c 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-ssdp.json +++ b/external_imported/vcpkg/versions/o-/oatpp-ssdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f3fb7a485473cfc812dbd4fbc93c291db75aeea", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-swagger.json b/external_imported/vcpkg/versions/o-/oatpp-swagger.json index e2107262e..32934ddf7 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-swagger.json +++ b/external_imported/vcpkg/versions/o-/oatpp-swagger.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8935367b57b4203e0eba828a6b8f9cc5ebb659c", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp-zlib.json b/external_imported/vcpkg/versions/o-/oatpp-zlib.json index db9f47ae2..a07cde70d 100644 --- a/external_imported/vcpkg/versions/o-/oatpp-zlib.json +++ b/external_imported/vcpkg/versions/o-/oatpp-zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/oatpp.json b/external_imported/vcpkg/versions/o-/oatpp.json index 5ec6257b2..aad89efa1 100644 --- a/external_imported/vcpkg/versions/o-/oatpp.json +++ b/external_imported/vcpkg/versions/o-/oatpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/o-/octomap.json b/external_imported/vcpkg/versions/o-/octomap.json index 59c664cca..b12660857 100644 --- a/external_imported/vcpkg/versions/o-/octomap.json +++ b/external_imported/vcpkg/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6146ecee8dcf9ba6573d11f26c1574e89c546d8", + "version": "1.9.6", + "port-version": 0 + }, { "git-tree": "7b192c5e8bc138bffe383afcadf8bc91a0130d58", "version-string": "1.9.5", diff --git a/external_imported/vcpkg/versions/o-/ogre-next.json b/external_imported/vcpkg/versions/o-/ogre-next.json index 40f6f7475..535b7c4dd 100644 --- a/external_imported/vcpkg/versions/o-/ogre-next.json +++ b/external_imported/vcpkg/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41790e82daaddc561ebaf5ea9f589bd2e148e31a", + "version": "2.3.1", + "port-version": 0 + }, { "git-tree": "0b1cca4f491d535e198fc79195bf357811b4122a", "version": "2.3.0", diff --git a/external_imported/vcpkg/versions/o-/ogre.json b/external_imported/vcpkg/versions/o-/ogre.json index a717a3e98..4aca64051 100644 --- a/external_imported/vcpkg/versions/o-/ogre.json +++ b/external_imported/vcpkg/versions/o-/ogre.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ea03f2d3fd45123a688cd9fb177bcb9bab30a795", + "version": "1.12.9", + "port-version": 10 + }, + { + "git-tree": "24ad8730cbc30e48c816ce6bca6abfb6cf1851fc", + "version": "1.12.9", + "port-version": 9 + }, + { + "git-tree": "6401a93991e8fe6fe517b43a084120ac94efccb9", + "version": "1.12.9", + "port-version": 8 + }, { "git-tree": "fd55a098294ab4f2f8b46bc67172e6a8be3c1df0", "version": "1.12.9", diff --git a/external_imported/vcpkg/versions/o-/onednn.json b/external_imported/vcpkg/versions/o-/onednn.json index f21847d63..d161a6f69 100644 --- a/external_imported/vcpkg/versions/o-/onednn.json +++ b/external_imported/vcpkg/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfdcc802e353e844674f70e5a5d6c0726524d5c7", + "version-semver": "2.6.1", + "port-version": 0 + }, { "git-tree": "0ac578f6078a2120900435434f0df8c96d4a7a54", "version-semver": "2.4.3", diff --git a/external_imported/vcpkg/versions/o-/openal-soft.json b/external_imported/vcpkg/versions/o-/openal-soft.json index 1d70617a9..41556162e 100644 --- a/external_imported/vcpkg/versions/o-/openal-soft.json +++ b/external_imported/vcpkg/versions/o-/openal-soft.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "8f028dc8de3d983f0844c0b586c1b6ddfad5d899", + "version-semver": "1.22.2", + "port-version": 4 + }, + { + "git-tree": "a0e8008cd2061bcaeaf0ed725438edae4386aac1", + "version-semver": "1.22.2", + "port-version": 3 + }, + { + "git-tree": "a964545a6c1ea12eb653de3d4739431ddf1cce85", + "version-semver": "1.22.2", + "port-version": 2 + }, + { + "git-tree": "2a5b37e3c3d9cd16ebbcdaddcce6cb7249aa21ec", + "version-semver": "1.22.2", + "port-version": 1 + }, + { + "git-tree": "49395645807a6b8d7948d03474fbfa6c467be314", + "version-semver": "1.22.2", + "port-version": 0 + }, + { + "git-tree": "c3fd33b48248cdb7d2139e14d5ad324d122db4b3", + "version-semver": "1.22.0", + "port-version": 0 + }, + { + "git-tree": "cff63a457841bcacd168775e25794f8245d06cf0", + "version-semver": "1.21.1", + "port-version": 5 + }, { "git-tree": "a1dee3171a9184c0a13631fda79f6aa58d2b80b6", "version-semver": "1.21.1", diff --git a/external_imported/vcpkg/versions/o-/openblas.json b/external_imported/vcpkg/versions/o-/openblas.json index 0cf8441a7..b8eb31147 100644 --- a/external_imported/vcpkg/versions/o-/openblas.json +++ b/external_imported/vcpkg/versions/o-/openblas.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "17b5c709377ee3e375a3b6b165ac9acb9752c3f6", + "version": "0.3.21", + "port-version": 0 + }, + { + "git-tree": "abd8d8b0d0286d963399d79e3e8b6f7f8e12117b", + "version": "0.3.20", + "port-version": 0 + }, + { + "git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb", + "version": "0.3.19", + "port-version": 1 + }, { "git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65", "version": "0.3.19", diff --git a/external_imported/vcpkg/versions/o-/opencascade.json b/external_imported/vcpkg/versions/o-/opencascade.json index 4c4df69f2..9938358af 100644 --- a/external_imported/vcpkg/versions/o-/opencascade.json +++ b/external_imported/vcpkg/versions/o-/opencascade.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "137097588b2328c3d7f66c4f0e46e6e4fe1559cf", + "version": "7.6.2", + "port-version": 1 + }, + { + "git-tree": "6dd7a80ecf7e8183ebfd1e25fc64351e47f9eed0", + "version": "7.6.2", + "port-version": 0 + }, + { + "git-tree": "0b043af5fd55a990d23a36523c82b005422ba75c", + "version": "7.6.0", + "port-version": 1 + }, { "git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d", "version": "7.6.0", diff --git a/external_imported/vcpkg/versions/o-/opencc.json b/external_imported/vcpkg/versions/o-/opencc.json index 525db85fd..8ee07aa68 100644 --- a/external_imported/vcpkg/versions/o-/opencc.json +++ b/external_imported/vcpkg/versions/o-/opencc.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "463a25b4f9bfe6a259042a54cdd813ae7f96f4c9", + "version": "1.1.4", + "port-version": 3 + }, + { + "git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3", + "version": "1.1.4", + "port-version": 2 + }, + { + "git-tree": "bfa36e95a55659eb27edc3ba561b3c06b202ff76", + "version": "1.1.4", + "port-version": 1 + }, + { + "git-tree": "9c886059bbc8c7c14a7d7290b22e2036c3ff8fe6", + "version": "1.1.4", + "port-version": 0 + }, { "git-tree": "10bc4f21926d1c116227ba57e954c4f8a6c9e999", "version-date": "2020-04-26", diff --git a/external_imported/vcpkg/versions/o-/opencensus-cpp.json b/external_imported/vcpkg/versions/o-/opencensus-cpp.json index 4b2735ff7..f36008d7a 100644 --- a/external_imported/vcpkg/versions/o-/opencensus-cpp.json +++ b/external_imported/vcpkg/versions/o-/opencensus-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "12e85bfcbf3ecda837c873e30ca6e872e3a5fa89", + "version-date": "2021-08-26", + "port-version": 2 + }, + { + "git-tree": "043d8a451b507daa585a8a716cf297421912d3d4", + "version-date": "2021-08-26", + "port-version": 1 + }, { "git-tree": "1e0e908de8a31c22d295c1ad069e87ab2eb964b7", "version-date": "2021-08-26", diff --git a/external_imported/vcpkg/versions/o-/opencolorio.json b/external_imported/vcpkg/versions/o-/opencolorio.json index ac457821b..4d749dfe2 100644 --- a/external_imported/vcpkg/versions/o-/opencolorio.json +++ b/external_imported/vcpkg/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09", + "version-semver": "2.1.2", + "port-version": 0 + }, { "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", "version-semver": "2.1.1", diff --git a/external_imported/vcpkg/versions/o-/openctm.json b/external_imported/vcpkg/versions/o-/openctm.json new file mode 100644 index 000000000..22d7ae821 --- /dev/null +++ b/external_imported/vcpkg/versions/o-/openctm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ea30144a8ad57cb95b0603de14e4dc8e9f7b2ea2", + "version": "1.0.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/o-/opencv.json b/external_imported/vcpkg/versions/o-/opencv.json index 60ab4980b..091604602 100644 --- a/external_imported/vcpkg/versions/o-/opencv.json +++ b/external_imported/vcpkg/versions/o-/opencv.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "135db832c720c800e2ac222994aa216df7575d17", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "1ed18903421ae513e731348b2e5afb13c8c38d24", + "version": "4.5.5", + "port-version": 1 + }, { "git-tree": "afe6b1b5c7be14be0656724754f95e537416c763", "version": "4.5.5", diff --git a/external_imported/vcpkg/versions/o-/opencv2.json b/external_imported/vcpkg/versions/o-/opencv2.json index 601e9b465..fcc2b51ed 100644 --- a/external_imported/vcpkg/versions/o-/opencv2.json +++ b/external_imported/vcpkg/versions/o-/opencv2.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "2c74bb03ea3451c670c4ec82b3a1acda11baeaf6", + "version": "2.4.13.7", + "port-version": 15 + }, + { + "git-tree": "5161f9b494cb04f39503980cdca10bdac6e7ee53", + "version": "2.4.13.7", + "port-version": 14 + }, + { + "git-tree": "5dad4c606f120b7d208ec193036596bd82074e81", + "version": "2.4.13.7", + "port-version": 13 + }, + { + "git-tree": "65f3aff976c42b2759e70867fa006287ff1be835", + "version": "2.4.13.7", + "port-version": 12 + }, { "git-tree": "d90ae2125e2fa18011bd9defe7a651d110113b76", "version": "2.4.13.7", diff --git a/external_imported/vcpkg/versions/o-/opencv3.json b/external_imported/vcpkg/versions/o-/opencv3.json index c767104ac..1789c67f2 100644 --- a/external_imported/vcpkg/versions/o-/opencv3.json +++ b/external_imported/vcpkg/versions/o-/opencv3.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "ab004823dbf456854654e2e0851be69ee4e5c5c5", + "version": "3.4.18", + "port-version": 2 + }, + { + "git-tree": "6f45f46b8a492b795cce92786a3d2048ef24ef38", + "version": "3.4.18", + "port-version": 1 + }, + { + "git-tree": "15c9083efa4c00674bef4fbca443a662fe6dd5cd", + "version": "3.4.18", + "port-version": 0 + }, + { + "git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0", + "version": "3.4.16", + "port-version": 9 + }, + { + "git-tree": "d8a8b60a98ada175921aadcd09ed66509c9be2a4", + "version": "3.4.16", + "port-version": 8 + }, + { + "git-tree": "d3c28cb4da2e7da9d31cc72415aff26f0b4d8442", + "version": "3.4.16", + "port-version": 7 + }, + { + "git-tree": "65bade77414d264741d23ce93401c1bc08718e86", + "version": "3.4.16", + "port-version": 6 + }, { "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", "version": "3.4.16", @@ -71,7 +106,7 @@ "port-version": 0 }, { - "git-tree": "859d6618f0ff394cc940ede79ada4bff1b7655dc", + "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", "version": "3.4.12", "port-version": 1 }, diff --git a/external_imported/vcpkg/versions/o-/opencv4.json b/external_imported/vcpkg/versions/o-/opencv4.json index 63730e2fe..26b60a570 100644 --- a/external_imported/vcpkg/versions/o-/opencv4.json +++ b/external_imported/vcpkg/versions/o-/opencv4.json @@ -1,5 +1,65 @@ { "versions": [ + { + "git-tree": "fdfecadf1577e25595f58dbe2d6c26bd2cb99296", + "version": "4.6.0", + "port-version": 5 + }, + { + "git-tree": "970c048b2d380fe84e110c02a99dc099f8b877d0", + "version": "4.6.0", + "port-version": 4 + }, + { + "git-tree": "18c563d48f8245b3d1e0879ecdc6c37097a89b3c", + "version": "4.6.0", + "port-version": 3 + }, + { + "git-tree": "57554ec83d4e4667344f005a1f61be8164cbf58a", + "version": "4.6.0", + "port-version": 2 + }, + { + "git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41", + "version": "4.6.0", + "port-version": 1 + }, + { + "git-tree": "1ff543272c91a32d242ad5320e9ca63b29b34ed2", + "version": "4.6.0", + "port-version": 0 + }, + { + "git-tree": "8e165720af85f0da853cf0a4ac9eb5cb20804d13", + "version": "4.5.5", + "port-version": 7 + }, + { + "git-tree": "c929f4a1c447240d07e17d0f105b4a36e3d6b5ce", + "version": "4.5.5", + "port-version": 6 + }, + { + "git-tree": "26f2ba4a582c93442e82167dece932c3833a2124", + "version": "4.5.5", + "port-version": 5 + }, + { + "git-tree": "86073388865f7730e42d02768f8963156f2be82f", + "version": "4.5.5", + "port-version": 4 + }, + { + "git-tree": "0771f6243ddde63a9b212efeb5ad51a74b640a62", + "version": "4.5.5", + "port-version": 3 + }, + { + "git-tree": "90f4418431aa3ddcdbd34c33d5e654cda5cda26a", + "version": "4.5.5", + "port-version": 2 + }, { "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", "version": "4.5.5", @@ -76,7 +136,7 @@ "port-version": 0 }, { - "git-tree": "ba164060f8a9e69ccc4c484a24b5e8085d20b3bd", + "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", "version": "4.5.0", "port-version": 1 }, diff --git a/external_imported/vcpkg/versions/o-/openexr.json b/external_imported/vcpkg/versions/o-/openexr.json index 06c0f7620..e19485125 100644 --- a/external_imported/vcpkg/versions/o-/openexr.json +++ b/external_imported/vcpkg/versions/o-/openexr.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "1426fa9af15b03db5bacc50dcdd4569da1c18bde", + "version": "3.1.5", + "port-version": 0 + }, + { + "git-tree": "447c9eae823d9570dfc549995efba4f623ddaae2", + "version": "2.5.8", + "port-version": 1 + }, + { + "git-tree": "1c4594196b46cfaa3d93cd5aff01060acab0ba9f", + "version": "2.5.8", + "port-version": 0 + }, + { + "git-tree": "40df682add8b267e718dac8ea78a2bcb47006048", + "version-string": "2.5.0", + "port-version": 4 + }, { "git-tree": "7589d3f1641e6e63450303e424d966221375109f", "version-string": "2.5.0", diff --git a/external_imported/vcpkg/versions/o-/openfbx.json b/external_imported/vcpkg/versions/o-/openfbx.json new file mode 100644 index 000000000..f7d6d3955 --- /dev/null +++ b/external_imported/vcpkg/versions/o-/openfbx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2ef566bee77c87c4efa26b8c9905e1fb26117f95", + "version-date": "2022-07-18", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/o-/opengl.json b/external_imported/vcpkg/versions/o-/opengl.json index f2e28fba5..2459fe648 100644 --- a/external_imported/vcpkg/versions/o-/opengl.json +++ b/external_imported/vcpkg/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c402a05f67513fe35a8991b8865db4db6181ec7", + "version-date": "2022-03-14", + "port-version": 1 + }, { "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", "version-date": "2022-03-14", diff --git a/external_imported/vcpkg/versions/o-/openimageio.json b/external_imported/vcpkg/versions/o-/openimageio.json index 821542404..cdc6f62e8 100644 --- a/external_imported/vcpkg/versions/o-/openimageio.json +++ b/external_imported/vcpkg/versions/o-/openimageio.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4317b62fd8bf1e11d9da42132ecfdf1ccb03a8af", + "version": "2.3.17.0", + "port-version": 4 + }, + { + "git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818", + "version": "2.3.10.1", + "port-version": 4 + }, { "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", "version": "2.3.10.1", diff --git a/external_imported/vcpkg/versions/o-/openjpeg.json b/external_imported/vcpkg/versions/o-/openjpeg.json index d85518d38..e49ff61f4 100644 --- a/external_imported/vcpkg/versions/o-/openjpeg.json +++ b/external_imported/vcpkg/versions/o-/openjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3451436f9bb5f5ad8946b45868929488fe2c39dd", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "ffb3c981c0026662feded28db73c177a739773d2", "version-semver": "2.4.0", diff --git a/external_imported/vcpkg/versions/o-/openldap.json b/external_imported/vcpkg/versions/o-/openldap.json new file mode 100644 index 000000000..293f8b15a --- /dev/null +++ b/external_imported/vcpkg/versions/o-/openldap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "63f4c67d336142daba83711983e54a8954794331", + "version": "2.5.13", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/o-/openmpi.json b/external_imported/vcpkg/versions/o-/openmpi.json index dc5df6dfa..cbd2baf74 100644 --- a/external_imported/vcpkg/versions/o-/openmpi.json +++ b/external_imported/vcpkg/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcbf51e64ac3e140af58a4279f34fb0e096b27e7", + "version": "4.1.3", + "port-version": 0 + }, { "git-tree": "96a3a8cd636443eaf50648e749ff144cb65ad851", "version": "4.1.0", diff --git a/external_imported/vcpkg/versions/o-/openmvg.json b/external_imported/vcpkg/versions/o-/openmvg.json index beea957ca..5c59d2175 100644 --- a/external_imported/vcpkg/versions/o-/openmvg.json +++ b/external_imported/vcpkg/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a97e175386e994ff24a45911a373450d17fe516", + "version": "2.0", + "port-version": 4 + }, { "git-tree": "f32be4f15d0babca5ba5a6e02b78f4610ab6d2f4", "version": "2.0", diff --git a/external_imported/vcpkg/versions/o-/openmvs.json b/external_imported/vcpkg/versions/o-/openmvs.json index 228825212..e055a2f31 100644 --- a/external_imported/vcpkg/versions/o-/openmvs.json +++ b/external_imported/vcpkg/versions/o-/openmvs.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bf082c0deb661743df2e3c5f658224ccd6375919", + "version": "2.0.1", + "port-version": 0 + }, + { + "git-tree": "b6123f8755c140325b2800c51c6c68e3fb51c668", + "version": "1.1.1", + "port-version": 3 + }, { "git-tree": "a66ad18d59e5ffdd21f5bc1cae0b195ba35aba18", "version": "1.1.1", diff --git a/external_imported/vcpkg/versions/o-/openni2.json b/external_imported/vcpkg/versions/o-/openni2.json index 45f539ce4..36caa8dde 100644 --- a/external_imported/vcpkg/versions/o-/openni2.json +++ b/external_imported/vcpkg/versions/o-/openni2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c61be8515cff93cca9a905969a8292023f0b4e", + "version": "2.2.0.33", + "port-version": 14 + }, { "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea", "version-string": "2.2.0.33", diff --git a/external_imported/vcpkg/versions/o-/openscap.json b/external_imported/vcpkg/versions/o-/openscap.json index 7a5ee2f30..0663f8e32 100644 --- a/external_imported/vcpkg/versions/o-/openscap.json +++ b/external_imported/vcpkg/versions/o-/openscap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6f96365cae0ee049b58b5863a0d59ca32782a9fa", + "version": "1.3.1", + "port-version": 3 + }, + { + "git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f", + "version": "1.3.1", + "port-version": 2 + }, { "git-tree": "ecbc2e72085ae6324948b52314de3b7e701376a5", "version-string": "1.3.1", diff --git a/external_imported/vcpkg/versions/o-/openssl.json b/external_imported/vcpkg/versions/o-/openssl.json index 207c89627..bbcf02ac3 100644 --- a/external_imported/vcpkg/versions/o-/openssl.json +++ b/external_imported/vcpkg/versions/o-/openssl.json @@ -1,5 +1,55 @@ { "versions": [ + { + "git-tree": "557ff31f9a64f01cd0d98dd44793ce3c7fd32893", + "version": "3.0.5", + "port-version": 4 + }, + { + "git-tree": "d4fd408544a2a6635ce994badc226aa945c8f78a", + "version": "3.0.5", + "port-version": 3 + }, + { + "git-tree": "1172be56343ba751b0fe10a0fbb6acedc7871e65", + "version": "3.0.5", + "port-version": 2 + }, + { + "git-tree": "3b7cc4dec346a7593959636aa8cc266240d92b7f", + "version": "3.0.5", + "port-version": 1 + }, + { + "git-tree": "6f3d4db3ea7bcbac9c79e8beb24c0a33c4da3e96", + "version": "3.0.5", + "port-version": 0 + }, + { + "git-tree": "b300461cf187df328c5d2269448840306f64a4e1", + "version": "3.0.4", + "port-version": 0 + }, + { + "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611", + "version": "3.0.3", + "port-version": 2 + }, + { + "git-tree": "1ac5c972c2c6c9af050334b2f7a41de1253c6a5e", + "version": "3.0.3", + "port-version": 1 + }, + { + "git-tree": "973408910bc03c5a350f502080548a0d1ac68352", + "version": "3.0.3", + "port-version": 0 + }, + { + "git-tree": "f521f59b704e7bebbddd28929f61f3911b8c7cb4", + "version": "3.0.2", + "port-version": 3 + }, { "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", "version": "3.0.2", diff --git a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json index f10a1c230..d721e8038 100644 --- a/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json +++ b/external_imported/vcpkg/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "49b229180a92d7c0148fd1c28a691a76c59aea51", + "version-semver": "1.5.0", + "port-version": 1 + }, + { + "git-tree": "6ec3fad654735c88e146be395fd84629c209de6e", + "version-semver": "1.5.0", + "port-version": 0 + }, + { + "git-tree": "614e2f4d01b0a003fe4c6df695eb669b41627736", + "version-semver": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "0ab7ef25acedde2552479fda46f92716afa53c98", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "c8c4bd4f115feaa3faed25dc74c695c1627d4f0d", "version-semver": "1.2.0", diff --git a/external_imported/vcpkg/versions/o-/opentracing.json b/external_imported/vcpkg/versions/o-/opentracing.json index 94c1d40af..c8e944d7a 100644 --- a/external_imported/vcpkg/versions/o-/opentracing.json +++ b/external_imported/vcpkg/versions/o-/opentracing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eae79381338436b815e727eb25885e6c8631eb5f", + "version": "1.6.0", + "port-version": 3 + }, { "git-tree": "6bd6797b313b265c51c85ea2838efcdaa70f87f7", "version": "1.6.0", diff --git a/external_imported/vcpkg/versions/o-/openvdb.json b/external_imported/vcpkg/versions/o-/openvdb.json index 75ee6fac0..a5baec829 100644 --- a/external_imported/vcpkg/versions/o-/openvdb.json +++ b/external_imported/vcpkg/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd83349668c7c8ec38e4850437ec678b44e038f5", + "version": "9.0.0", + "port-version": 1 + }, { "git-tree": "a026562abe75e40d4b60d97108ef057b2e28629a", "version": "9.0.0", diff --git a/external_imported/vcpkg/versions/o-/openvpn3.json b/external_imported/vcpkg/versions/o-/openvpn3.json index 26f6e68e0..7f9fd3361 100644 --- a/external_imported/vcpkg/versions/o-/openvpn3.json +++ b/external_imported/vcpkg/versions/o-/openvpn3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "352f972ff2ff0cfb7305f779253f322ba72e14f5", + "version": "3.7.0", + "port-version": 1 + }, + { + "git-tree": "901a710e937496a572cdb5b64d2401c18919ffde", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "bf20f11ad1fb64e74ebcfda5a3b3c19b8e4770ae", "version-string": "3.4.1", diff --git a/external_imported/vcpkg/versions/o-/opus.json b/external_imported/vcpkg/versions/o-/opus.json index bdd667ec3..bf880e70a 100644 --- a/external_imported/vcpkg/versions/o-/opus.json +++ b/external_imported/vcpkg/versions/o-/opus.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f69aedcd28796dfac85514ee0934e7f91ab05e06", + "version": "1.3.1", + "port-version": 8 + }, + { + "git-tree": "ad2b9149564516603dab6b996af3d4bc7ba29017", + "version": "1.3.1", + "port-version": 7 + }, { "git-tree": "e718de4be5f3dcb0e0c7922a9ef7ef13bf5148b3", "version-string": "1.3.1", diff --git a/external_imported/vcpkg/versions/o-/orc.json b/external_imported/vcpkg/versions/o-/orc.json index 23e58df0a..502e8fa6b 100644 --- a/external_imported/vcpkg/versions/o-/orc.json +++ b/external_imported/vcpkg/versions/o-/orc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8db2855196eeddb1ac131df74e028367480613d5", + "version": "1.7.6", + "port-version": 0 + }, + { + "git-tree": "8c8bc9de897f95a0499e5dc4a49545cda6e496b2", + "version": "1.6.4", + "port-version": 4 + }, + { + "git-tree": "543e83b37120267db3f81b5fdb3d349717b20135", + "version": "1.6.4", + "port-version": 3 + }, { "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", "version-string": "1.6.4", diff --git a/external_imported/vcpkg/versions/o-/osg.json b/external_imported/vcpkg/versions/o-/osg.json index 7f2fadfde..a4264c3c4 100644 --- a/external_imported/vcpkg/versions/o-/osg.json +++ b/external_imported/vcpkg/versions/o-/osg.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "e29f8e57a49cb782817b890b77b3f0ec06afe3c0", + "version": "3.6.5", + "port-version": 17 + }, + { + "git-tree": "9b4ddf02fe84124b58b1ea60dcc9a4f553f32704", + "version": "3.6.5", + "port-version": 16 + }, + { + "git-tree": "219045e2b75fc651860c70dbf97557d543269842", + "version": "3.6.5", + "port-version": 15 + }, + { + "git-tree": "0a38fb280615f72738ab9ec48d92d8bee28017c9", + "version": "3.6.5", + "port-version": 14 + }, + { + "git-tree": "fa03ab64f6d05d837a9ce14419d03b36cc8796ea", + "version": "3.6.5", + "port-version": 13 + }, + { + "git-tree": "f438ec006b58ffd222b0f3bdce8d05b21611204e", + "version": "3.6.5", + "port-version": 12 + }, { "git-tree": "456c4454eee9f4a24916992b0870067f703ef374", "version-string": "3.6.5", diff --git a/external_imported/vcpkg/versions/o-/osgearth.json b/external_imported/vcpkg/versions/o-/osgearth.json index 80893cbe4..b530496b7 100644 --- a/external_imported/vcpkg/versions/o-/osgearth.json +++ b/external_imported/vcpkg/versions/o-/osgearth.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "5a9e3fa28dc78e768ff9ef2ca4ff09b51b774cbb", + "version": "3.3", + "port-version": 2 + }, + { + "git-tree": "1091743df235c6472d30b157723f82e6d3473cc9", + "version": "3.3", + "port-version": 1 + }, + { + "git-tree": "6e95d7000b08e777779b6b0c6d2dbf35686b87a4", + "version": "3.3", + "port-version": 0 + }, + { + "git-tree": "8445895488485c8931b96483e6da43969260855a", + "version": "3.2", + "port-version": 6 + }, + { + "git-tree": "80311fbaa014b84f8cdb3faa8abbdc16e01837d5", + "version": "3.2", + "port-version": 5 + }, { "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", "version": "3.2", diff --git a/external_imported/vcpkg/versions/o-/otl.json b/external_imported/vcpkg/versions/o-/otl.json index 48fe11f98..1da9bd314 100644 --- a/external_imported/vcpkg/versions/o-/otl.json +++ b/external_imported/vcpkg/versions/o-/otl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf3d50a329ecf8149400c6db244ae5793ea1a097", + "version": "4.0.463", + "port-version": 2 + }, { "git-tree": "02a8c353e8a348eb320fdfaf7dfd7d4a40d3d2e1", "version": "4.0.463", diff --git a/external_imported/vcpkg/versions/o-/outcome.json b/external_imported/vcpkg/versions/o-/outcome.json index 269477e3e..ed92afed9 100644 --- a/external_imported/vcpkg/versions/o-/outcome.json +++ b/external_imported/vcpkg/versions/o-/outcome.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "504177d3c3f3d1a063db2ce6d12292141e874d37", + "version": "2.2.4", + "port-version": 1 + }, + { + "git-tree": "9e3ec2f8aff33b12210dc924ff285b3cf23abb2a", + "version": "2.2.4", + "port-version": 0 + }, + { + "git-tree": "527591e7e0e55bc20c74cdc5553c08635b350999", + "version": "2.2.3", + "port-version": 0 + }, { "git-tree": "2abc0cf7913b6db02a17f3b01f6e5744bd43a9ae", "version-string": "2.2.2-20211208", diff --git a/external_imported/vcpkg/versions/p-/pagmo2.json b/external_imported/vcpkg/versions/p-/pagmo2.json index c149fd0f0..9d16ccd32 100644 --- a/external_imported/vcpkg/versions/p-/pagmo2.json +++ b/external_imported/vcpkg/versions/p-/pagmo2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa28deef736ea34bcc41143a960e8be97653ba1d", + "version": "2.18.0", + "port-version": 0 + }, { "git-tree": "ea29ee58051fba73e950597ca2b0109dd6df0dec", "version": "2.16.1", diff --git a/external_imported/vcpkg/versions/p-/paho-mqtt.json b/external_imported/vcpkg/versions/p-/paho-mqtt.json index 91f640060..8bb1182a4 100644 --- a/external_imported/vcpkg/versions/p-/paho-mqtt.json +++ b/external_imported/vcpkg/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9edde45ee5a278ee52bbb1891e9a30cab33669f8", + "version-semver": "1.3.10", + "port-version": 0 + }, { "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427", "version-semver": "1.3.9", diff --git a/external_imported/vcpkg/versions/p-/paho-mqttpp3.json b/external_imported/vcpkg/versions/p-/paho-mqttpp3.json index 9312ab4a2..20df1bcb3 100644 --- a/external_imported/vcpkg/versions/p-/paho-mqttpp3.json +++ b/external_imported/vcpkg/versions/p-/paho-mqttpp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5982f9707bb0222b6694cee8d4a0d23698e20f", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "850cb4a6ccac89062c16dd783ad0631215c1a94b", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/p-/pango.json b/external_imported/vcpkg/versions/p-/pango.json index 4533caaec..de2a65bc1 100644 --- a/external_imported/vcpkg/versions/p-/pango.json +++ b/external_imported/vcpkg/versions/p-/pango.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f5c70fae168a14f944757f55afaeb847f1a0d026", + "version": "1.50.9", + "port-version": 0 + }, + { + "git-tree": "5275b5581f4cfc5ccb547a556f3affc4c92e05cd", + "version": "1.50.7", + "port-version": 0 + }, { "git-tree": "db85fd904e40578950bcc478e2bfad06c70e787a", "version": "1.50.6", diff --git a/external_imported/vcpkg/versions/p-/pangolin.json b/external_imported/vcpkg/versions/p-/pangolin.json index b8e8ef532..d30f7c731 100644 --- a/external_imported/vcpkg/versions/p-/pangolin.json +++ b/external_imported/vcpkg/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d47198a68cd0a92fd6e74d50262dd657d027e217", + "version": "0.6", + "port-version": 3 + }, { "git-tree": "1515f75cbc480addcd0ca12c49c0435a0c9e158c", "version": "0.6", diff --git a/external_imported/vcpkg/versions/p-/pangomm.json b/external_imported/vcpkg/versions/p-/pangomm.json index 1f966eb47..218d43523 100644 --- a/external_imported/vcpkg/versions/p-/pangomm.json +++ b/external_imported/vcpkg/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34d3ec912d605fecbc17c5eee6257db6574c5318", + "version": "2.50.0", + "port-version": 2 + }, { "git-tree": "5aebede0dd324cd7e5db1460e1d9be26d18685ba", "version": "2.50.0", diff --git a/external_imported/vcpkg/versions/p-/paraview.json b/external_imported/vcpkg/versions/p-/paraview.json index d3c3cbbab..91d43f8c5 100644 --- a/external_imported/vcpkg/versions/p-/paraview.json +++ b/external_imported/vcpkg/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f5d22c6754f293f54a360472f78e760f06aae80", + "version": "5.9.1", + "port-version": 2 + }, { "git-tree": "7011d869273b8aa610ef7b302587c614137c73e5", "version-semver": "5.9.1", diff --git a/external_imported/vcpkg/versions/p-/parmetis.json b/external_imported/vcpkg/versions/p-/parmetis.json index f47f478b8..48b9b25f4 100644 --- a/external_imported/vcpkg/versions/p-/parmetis.json +++ b/external_imported/vcpkg/versions/p-/parmetis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16a0bdc9bfe506f67b8204e5f725faa6a026c4c", + "version-date": "2022-07-27", + "port-version": 0 + }, { "git-tree": "28d903df01ef4780a7b02c8a8437ec37be859aba", "version-string": "4.0.3", diff --git a/external_imported/vcpkg/versions/p-/pcapplusplus.json b/external_imported/vcpkg/versions/p-/pcapplusplus.json index c90a7c049..2f03288a1 100644 --- a/external_imported/vcpkg/versions/p-/pcapplusplus.json +++ b/external_imported/vcpkg/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bcf1e7a1ad1f7899adc1c423c248fea6b86553e", + "version-string": "22.05", + "port-version": 0 + }, { "git-tree": "f1f63c9365f0cb128761835ebceeafb6b162c815", "version": "21.11", diff --git a/external_imported/vcpkg/versions/p-/pcre.json b/external_imported/vcpkg/versions/p-/pcre.json index 64af5b411..ce8dc8682 100644 --- a/external_imported/vcpkg/versions/p-/pcre.json +++ b/external_imported/vcpkg/versions/p-/pcre.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7c8089ce40f585844a2ae5b9c80ba095b172d53d", + "version": "8.45", + "port-version": 5 + }, + { + "git-tree": "50ec11ace2145fac2b0b01dae365a6764f716c6e", + "version": "8.45", + "port-version": 4 + }, + { + "git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad", + "version": "8.45", + "port-version": 3 + }, { "git-tree": "693b4da6141be8041f8db0caa1b60ce246b47dcb", "version": "8.45", diff --git a/external_imported/vcpkg/versions/p-/pcre2.json b/external_imported/vcpkg/versions/p-/pcre2.json index bba977373..55d7929cf 100644 --- a/external_imported/vcpkg/versions/p-/pcre2.json +++ b/external_imported/vcpkg/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "725d8f25eea7d10b24944f314db69aa8b29d4932", + "version": "10.40", + "port-version": 0 + }, { "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8", "version": "10.39", diff --git a/external_imported/vcpkg/versions/p-/pdal.json b/external_imported/vcpkg/versions/p-/pdal.json index d9f41bdfc..c7495c99c 100644 --- a/external_imported/vcpkg/versions/p-/pdal.json +++ b/external_imported/vcpkg/versions/p-/pdal.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8b72a995f43fed0287dca94b7f45bc1855b8fa43", + "version": "2.4.3", + "port-version": 0 + }, + { + "git-tree": "0c5321217b19b80c58854e9cd2141633e00c0fc7", + "version": "2.4.0", + "port-version": 1 + }, + { + "git-tree": "674fea8cc4044272fef94a061252c4aeb4e6373c", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", "version": "2.3.0", diff --git a/external_imported/vcpkg/versions/p-/pegtl.json b/external_imported/vcpkg/versions/p-/pegtl.json index dae6a54d3..45bf43ca6 100644 --- a/external_imported/vcpkg/versions/p-/pegtl.json +++ b/external_imported/vcpkg/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed96fd80f2820b9e5ad6f38a9ea24d7aebfb64be", + "version-semver": "3.2.6", + "port-version": 0 + }, { "git-tree": "43adc8ee136a8dd0ea88b54a6a7fdc7325cf7327", "version-semver": "3.2.5", diff --git a/external_imported/vcpkg/versions/p-/pffft.json b/external_imported/vcpkg/versions/p-/pffft.json index 9defc0134..90b53b671 100644 --- a/external_imported/vcpkg/versions/p-/pffft.json +++ b/external_imported/vcpkg/versions/p-/pffft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "525bc1ec4fd9aa77feeaba44fc6f0cf717716ae1", + "version-date": "2021-10-09", + "port-version": 1 + }, { "git-tree": "c425b1091069b34450a9b7e524f1cad202e4e709", "version-date": "2021-10-09", diff --git a/external_imported/vcpkg/versions/p-/physfs.json b/external_imported/vcpkg/versions/p-/physfs.json index 7e719741c..7961b9151 100644 --- a/external_imported/vcpkg/versions/p-/physfs.json +++ b/external_imported/vcpkg/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", + "version-semver": "3.0.2", + "port-version": 7 + }, { "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", "version-semver": "3.0.2", diff --git a/external_imported/vcpkg/versions/p-/physx.json b/external_imported/vcpkg/versions/p-/physx.json index 5cbbdf356..b780cd523 100644 --- a/external_imported/vcpkg/versions/p-/physx.json +++ b/external_imported/vcpkg/versions/p-/physx.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ebfd4955bdff06becb259bc91575143bc9866dcc", + "version": "4.1.2", + "port-version": 4 + }, + { + "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", + "version": "4.1.2", + "port-version": 3 + }, + { + "git-tree": "8e20a94664b966271a5e7684e73b2efab2461ba8", + "version-semver": "4.1.2", + "port-version": 2 + }, { "git-tree": "3efd7a1c7727eec4a15ba3ac6f8f013550750760", "version-semver": "4.1.2", diff --git a/external_imported/vcpkg/versions/p-/pipewire.json b/external_imported/vcpkg/versions/p-/pipewire.json new file mode 100644 index 000000000..1ac99b14f --- /dev/null +++ b/external_imported/vcpkg/versions/p-/pipewire.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "c3fc407ec59160e15daff40a26eb60515840763e", + "version": "0.3.52", + "port-version": 1 + }, + { + "git-tree": "4ec746fd8458f073339bf953335742b2abb0ac53", + "version": "0.3.52", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/p-/pixel.json b/external_imported/vcpkg/versions/p-/pixel.json index f0bfad783..3e2ca86e6 100644 --- a/external_imported/vcpkg/versions/p-/pixel.json +++ b/external_imported/vcpkg/versions/p-/pixel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54bad3e5b7d0455972d0cc84fa90e5d6549b6203", + "version-date": "2022-03-15", + "port-version": 1 + }, { "git-tree": "dbf76415a78802e7dc2717280e2a44123a04df69", "version-date": "2022-03-15", diff --git a/external_imported/vcpkg/versions/p-/pixman.json b/external_imported/vcpkg/versions/p-/pixman.json index 0faacd4b5..9944061c0 100644 --- a/external_imported/vcpkg/versions/p-/pixman.json +++ b/external_imported/vcpkg/versions/p-/pixman.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d0209cb23d5ca18cd74fa4a67e7ca80f7e81c0cd", + "version": "0.40.0", + "port-version": 4 + }, + { + "git-tree": "f6930f7300af86c20679b38f53bbdbc1a1310eed", + "version": "0.40.0", + "port-version": 3 + }, { "git-tree": "85d5aa0bbd91cff8853d0767bc9dc73e97156291", "version": "0.40.0", diff --git a/external_imported/vcpkg/versions/p-/pkgconf.json b/external_imported/vcpkg/versions/p-/pkgconf.json index 87f63902c..d602da96d 100644 --- a/external_imported/vcpkg/versions/p-/pkgconf.json +++ b/external_imported/vcpkg/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0408f161d8a23907635840add678d5946024d09", + "version": "1.8.0", + "port-version": 3 + }, { "git-tree": "5b599bd7dbbbc7837f7dbcf1b111478da076e2a4", "version": "1.8.0", diff --git a/external_imported/vcpkg/versions/p-/plog.json b/external_imported/vcpkg/versions/p-/plog.json index 640358487..fae370de9 100644 --- a/external_imported/vcpkg/versions/p-/plog.json +++ b/external_imported/vcpkg/versions/p-/plog.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b16507d8b9cbf419b2923d55de7ddfdf013f0267", + "version": "1.1.8", + "port-version": 0 + }, + { + "git-tree": "aaca8cb03c90bca09c7bf83b393521dce2719686", + "version": "1.1.6", + "port-version": 0 + }, { "git-tree": "7cbf2ab91e484ee21e8c62316558e11b3a49f288", "version-string": "1.1.5", diff --git a/external_imported/vcpkg/versions/p-/pmdk.json b/external_imported/vcpkg/versions/p-/pmdk.json index 762bd4b32..89f2fd710 100644 --- a/external_imported/vcpkg/versions/p-/pmdk.json +++ b/external_imported/vcpkg/versions/p-/pmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5b1d48503eab5f709ccc7cb62630817275f93e5", + "version": "1.12.0", + "port-version": 0 + }, { "git-tree": "a6a893e78e485b907148252308a5ea11befde1d9", "version": "1.11.0", diff --git a/external_imported/vcpkg/versions/p-/poco.json b/external_imported/vcpkg/versions/p-/poco.json index 9a6677049..e6d2e5f90 100644 --- a/external_imported/vcpkg/versions/p-/poco.json +++ b/external_imported/vcpkg/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de13e6b66833cb816a0f85528697c7ee63be89ae", + "version": "1.11.2", + "port-version": 0 + }, { "git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190", "version": "1.11.1", diff --git a/external_imported/vcpkg/versions/p-/podofo.json b/external_imported/vcpkg/versions/p-/podofo.json index 58c25a330..8d6ab7135 100644 --- a/external_imported/vcpkg/versions/p-/podofo.json +++ b/external_imported/vcpkg/versions/p-/podofo.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e302c730989d9f85b236c00b51e44dd067af7e6d", + "version": "0.9.8", + "port-version": 0 + }, + { + "git-tree": "f7f44c3594a2850412f1cb33ef1feaa78d35b7f9", + "version": "0.9.7", + "port-version": 2 + }, + { + "git-tree": "494b98ef9f42c9e4bafe58feff7d5738bb20f44e", + "version": "0.9.7", + "port-version": 1 + }, { "git-tree": "5dd647995b24991182eb684029b8629eb6d66e43", "version": "0.9.7", diff --git a/external_imported/vcpkg/versions/p-/polymorphic-value.json b/external_imported/vcpkg/versions/p-/polymorphic-value.json index aa4f3ba72..0def53380 100644 --- a/external_imported/vcpkg/versions/p-/polymorphic-value.json +++ b/external_imported/vcpkg/versions/p-/polymorphic-value.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "439fca88a0bc0bf3bb8639dafe418eed9b21214b", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "5eeefe34f5fbc12cbf9c7b1a6cd231bf0c455d6e", "version-string": "1.3.0", diff --git a/external_imported/vcpkg/versions/p-/poppler.json b/external_imported/vcpkg/versions/p-/poppler.json index 275069c77..065661508 100644 --- a/external_imported/vcpkg/versions/p-/poppler.json +++ b/external_imported/vcpkg/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8551fcec6635c82fba6fc51d817e788dfae0a387", + "version": "22.8.0", + "port-version": 0 + }, { "git-tree": "2d14bc508abd0861bda1a16290ad65b061a82b7c", "version": "22.3.0", diff --git a/external_imported/vcpkg/versions/p-/portable-snippets.json b/external_imported/vcpkg/versions/p-/portable-snippets.json index 18be8b9f5..80d2d3d39 100644 --- a/external_imported/vcpkg/versions/p-/portable-snippets.json +++ b/external_imported/vcpkg/versions/p-/portable-snippets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c955bc2bba510d1fd09122a7b16f8eff1284d922", + "version-date": "2019-09-20", + "port-version": 2 + }, { "git-tree": "7a24a15b684910521e29c4b5e2c6660329f306c9", "version-string": "2019-09-20", diff --git a/external_imported/vcpkg/versions/p-/proj.json b/external_imported/vcpkg/versions/p-/proj.json index 59f4dd4bc..7ca1c2bbf 100644 --- a/external_imported/vcpkg/versions/p-/proj.json +++ b/external_imported/vcpkg/versions/p-/proj.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7c8c2418c56d4f5b5dfd6e1d8e95b008f03ea63f", + "version": "9.1.0", + "port-version": 0 + }, + { + "git-tree": "d533a2d58a17e3074d52ec045604b32ed049eacb", + "version": "9.0.1", + "port-version": 1 + }, + { + "git-tree": "55c13547b4c812fc8bbb32a09260b3e54bc0a352", + "version": "9.0.1", + "port-version": 0 + }, { "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", "version": "9.0.0", diff --git a/external_imported/vcpkg/versions/p-/prometheus-cpp.json b/external_imported/vcpkg/versions/p-/prometheus-cpp.json index 9ca74e847..142866b1a 100644 --- a/external_imported/vcpkg/versions/p-/prometheus-cpp.json +++ b/external_imported/vcpkg/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99e611dca8f7a6f529e867a6c6f6f88bae8705a6", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "8f679ed963f525e155342a6be082d02e03c96856", "version-semver": "1.0.0", diff --git a/external_imported/vcpkg/versions/p-/protobuf.json b/external_imported/vcpkg/versions/p-/protobuf.json index fab9f2a67..4897c20ca 100644 --- a/external_imported/vcpkg/versions/p-/protobuf.json +++ b/external_imported/vcpkg/versions/p-/protobuf.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "1d2c32252e568decb813b1109f1d86e6023af6dd", + "version": "3.21.6", + "port-version": 0 + }, + { + "git-tree": "b66573195da9e32b3396e253b520ad498617405b", + "version": "3.21.4", + "port-version": 0 + }, + { + "git-tree": "3ed82c1c5eef7b766d472f71c5ccebcff30cb7bd", + "version": "3.21.3", + "port-version": 0 + }, + { + "git-tree": "57fe8d3a4fa3bc97f942ce38f103b324f4665685", + "version-semver": "3.21.2", + "port-version": 1 + }, + { + "git-tree": "8ae2a5d57f7d3bf934e4d773406cd0a323600031", + "version-semver": "3.21.2", + "port-version": 0 + }, { "git-tree": "984039810172eb397ca0ec6d426d60764d6dfe46", "version-semver": "3.19.4", diff --git a/external_imported/vcpkg/versions/p-/protopuf.json b/external_imported/vcpkg/versions/p-/protopuf.json index 05a2ede01..27b29d0ea 100644 --- a/external_imported/vcpkg/versions/p-/protopuf.json +++ b/external_imported/vcpkg/versions/p-/protopuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e9aca8dbbf9df6ab5034e57ca3d8e983f55ba05", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "57399a25b20d4f3a437118a4bc2fe9a639972bb4", "version-semver": "2.1.0", diff --git a/external_imported/vcpkg/versions/p-/protozero.json b/external_imported/vcpkg/versions/p-/protozero.json index 55c02b1a1..867cda73c 100644 --- a/external_imported/vcpkg/versions/p-/protozero.json +++ b/external_imported/vcpkg/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4", + "version-semver": "1.7.1", + "port-version": 0 + }, { "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767", "version-semver": "1.7.0", diff --git a/external_imported/vcpkg/versions/p-/proxy.json b/external_imported/vcpkg/versions/p-/proxy.json new file mode 100644 index 000000000..3b2270661 --- /dev/null +++ b/external_imported/vcpkg/versions/p-/proxy.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0e6617956cb7c1b38369086d9615ccaad354729", + "version": "1.0.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/p-/proxygen.json b/external_imported/vcpkg/versions/p-/proxygen.json index 3b9e34252..6c1060086 100644 --- a/external_imported/vcpkg/versions/p-/proxygen.json +++ b/external_imported/vcpkg/versions/p-/proxygen.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f8e28d0d1ec8591df5cdfa602d60e0efaa8ee7a", + "version-string": "2022.07.11.00", + "port-version": 0 + }, + { + "git-tree": "27f0950fcf11ac8f561591363715ddf581146325", + "version-string": "2022.03.21.00", + "port-version": 2 + }, { "git-tree": "fb9493259e80636642c06b40479c36b6b4c9cba2", "version-string": "2022.03.21.00", diff --git a/external_imported/vcpkg/versions/p-/pthread-stubs.json b/external_imported/vcpkg/versions/p-/pthread-stubs.json new file mode 100644 index 000000000..395c6164d --- /dev/null +++ b/external_imported/vcpkg/versions/p-/pthread-stubs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4d74216d737ed231dafb8c53f2617ce7836d96fa", + "version": "0.4", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/p-/pthreadpool.json b/external_imported/vcpkg/versions/p-/pthreadpool.json index 8e89e584d..2311710b6 100644 --- a/external_imported/vcpkg/versions/p-/pthreadpool.json +++ b/external_imported/vcpkg/versions/p-/pthreadpool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb803332761faba74d3a5d83ca25b73d3285d397", + "version-date": "2020-04-10", + "port-version": 2 + }, { "git-tree": "37e004fa65e21e9ffb647d6ff92cd834a46777cf", "version-date": "2020-04-10", diff --git a/external_imported/vcpkg/versions/p-/pthreads.json b/external_imported/vcpkg/versions/p-/pthreads.json index 78edfdfed..324dfb304 100644 --- a/external_imported/vcpkg/versions/p-/pthreads.json +++ b/external_imported/vcpkg/versions/p-/pthreads.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05aad80a1b8fa9b224b736efb6f5f06baddfb0ec", + "version": "3.0.0", + "port-version": 11 + }, { "git-tree": "ab9d25f08115355ea2d4e4c6eae94626fa86fded", "version": "3.0.0", diff --git a/external_imported/vcpkg/versions/p-/pugixml.json b/external_imported/vcpkg/versions/p-/pugixml.json index a9e37f4b1..b2fc0a32d 100644 --- a/external_imported/vcpkg/versions/p-/pugixml.json +++ b/external_imported/vcpkg/versions/p-/pugixml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0af6c22cb58a218893ca193a5f5d29d7d1753355", + "version": "1.12.1", + "port-version": 1 + }, + { + "git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c", + "version": "1.12.1", + "port-version": 0 + }, { "git-tree": "2af3faa6e86d241d2d6845f27c21afa51741f391", "version-string": "1.11.4", diff --git a/external_imported/vcpkg/versions/p-/pybind11.json b/external_imported/vcpkg/versions/p-/pybind11.json index 9340b71f1..e71c1029e 100644 --- a/external_imported/vcpkg/versions/p-/pybind11.json +++ b/external_imported/vcpkg/versions/p-/pybind11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4c6350f32b68fc7216251526449e5d6b5342b2a9", + "version": "2.10.0", + "port-version": 1 + }, + { + "git-tree": "84251d247cc46bde6696ad9043326981370e1a79", + "version": "2.10.0", + "port-version": 0 + }, { "git-tree": "0723f5ac350935e5d68d8087c82883dffa706812", "version": "2.9.2", diff --git a/external_imported/vcpkg/versions/p-/pystring.json b/external_imported/vcpkg/versions/p-/pystring.json index 7fef6450f..ab15494a5 100644 --- a/external_imported/vcpkg/versions/p-/pystring.json +++ b/external_imported/vcpkg/versions/p-/pystring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0b08ff66f53aeb63ab3797212c667a822c88a3e", + "version-semver": "1.1.3", + "port-version": 5 + }, { "git-tree": "ed5bf60bd6e1720457de5eaa39f01f5b3a414f01", "version-semver": "1.1.3", diff --git a/external_imported/vcpkg/versions/p-/python2.json b/external_imported/vcpkg/versions/p-/python2.json index 60a67697b..8460f2562 100644 --- a/external_imported/vcpkg/versions/p-/python2.json +++ b/external_imported/vcpkg/versions/p-/python2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33912f36bba22e343da793d7de1a2dde41ab9da0", + "version": "2.7.18", + "port-version": 5 + }, { "git-tree": "355e949adaecb1603d0cdc3d690101e49ad9fb13", "version": "2.7.18", diff --git a/external_imported/vcpkg/versions/p-/python3.json b/external_imported/vcpkg/versions/p-/python3.json index a89a02eb1..39d13ed7e 100644 --- a/external_imported/vcpkg/versions/p-/python3.json +++ b/external_imported/vcpkg/versions/p-/python3.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "6e7ddcd01a8341a906d5dde6b3d221c955571684", + "version": "3.10.5", + "port-version": 2 + }, + { + "git-tree": "c345c4a8ad91847522188517c68e8f83637f4440", + "version": "3.10.5", + "port-version": 1 + }, + { + "git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2", + "version": "3.10.5", + "port-version": 0 + }, + { + "git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9", + "version": "3.10.2", + "port-version": 2 + }, { "git-tree": "4e348bd50d8c4252bda83903ce22f1e60d34be88", "version": "3.10.2", diff --git a/external_imported/vcpkg/versions/q-/qca.json b/external_imported/vcpkg/versions/q-/qca.json index bbba4bbf3..d79041bf3 100644 --- a/external_imported/vcpkg/versions/q-/qca.json +++ b/external_imported/vcpkg/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f719790dc5863b3724d0fed5a7179cb1ca41c871", + "version": "2.3.4", + "port-version": 3 + }, { "git-tree": "41239863ffd0059d8688502f6d6284785c6c8633", "version": "2.3.4", diff --git a/external_imported/vcpkg/versions/q-/qnnpack.json b/external_imported/vcpkg/versions/q-/qnnpack.json index 802a45951..e5789c3c2 100644 --- a/external_imported/vcpkg/versions/q-/qnnpack.json +++ b/external_imported/vcpkg/versions/q-/qnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cee68bf91e46cc783fe3f03d4525e02c0793389c", + "version-date": "2021-02-26", + "port-version": 3 + }, { "git-tree": "907c113d0c35b674976b5c3b7dc96b2c71084061", "version-date": "2021-02-26", diff --git a/external_imported/vcpkg/versions/q-/qpid-proton.json b/external_imported/vcpkg/versions/q-/qpid-proton.json index f96fe6984..3a79b51b0 100644 --- a/external_imported/vcpkg/versions/q-/qpid-proton.json +++ b/external_imported/vcpkg/versions/q-/qpid-proton.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "32527f3a05b41a04ad42ab2e0827dfee69b18ec0", + "version": "0.37.0", + "port-version": 3 + }, + { + "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6", + "version": "0.37.0", + "port-version": 2 + }, + { + "git-tree": "543baa82530f5eb5ed9b3d6348a14b5e24ccda64", + "version": "0.37.0", + "port-version": 1 + }, + { + "git-tree": "720cc65a7b408878662ce7c749211fa7edaf25fd", + "version": "0.37.0", + "port-version": 0 + }, + { + "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", + "version": "0.32.0", + "port-version": 5 + }, { "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", "version": "0.32.0", diff --git a/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json b/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json index 9d7d702fc..9924a6603 100644 --- a/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json +++ b/external_imported/vcpkg/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faedc79b62016f2cfc3c47ecc16db714448daa48", + "version": "3.8.2", + "port-version": 0 + }, { "git-tree": "427efb4851b6f81f6301f6418d0e8d04bebbf557", "version": "3.8.0", diff --git a/external_imported/vcpkg/versions/q-/qt.json b/external_imported/vcpkg/versions/q-/qt.json index 8d7d76610..ba8db8735 100644 --- a/external_imported/vcpkg/versions/q-/qt.json +++ b/external_imported/vcpkg/versions/q-/qt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "17bba488ae744a514ee214f30d0bdb1bd6da6831", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "0a008830e0a624fce731b50046e8f3b89c46c340", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "8b4a7a1d86d93bd16d897b76cdf85abeac8e67d3", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qt5-3d.json b/external_imported/vcpkg/versions/q-/qt5-3d.json index f1bdb8731..098c96169 100644 --- a/external_imported/vcpkg/versions/q-/qt5-3d.json +++ b/external_imported/vcpkg/versions/q-/qt5-3d.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "a085f6772db0df5dfe00fb16194b857a9f6bdba3", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "47a71a5fc9720cda647f0d1693f95024b434b5d3", + "version": "5.15.5", + "port-version": 1 + }, + { + "git-tree": "bdd0dea463c7b380c2747fcd45336712c4a381a5", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "ad54e2c1049e5ec47c24815f9b1a1039588c4017", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5538f55e5cb938c965447c3a5ce67b243f5d97f1", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-activeqt.json b/external_imported/vcpkg/versions/q-/qt5-activeqt.json index 35044981c..5abb55997 100644 --- a/external_imported/vcpkg/versions/q-/qt5-activeqt.json +++ b/external_imported/vcpkg/versions/q-/qt5-activeqt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "3229267d9f245462b0cae0632505cc2d3ceefc69", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "dac80735405e39d0a83de3d46e9462045062da11", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "d849c962c3692fa2177966c6ac225eefe7306001", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "ebae9d515816c48a9bbb2550acd02d02bfcfddc7", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-androidextras.json b/external_imported/vcpkg/versions/q-/qt5-androidextras.json index 1c72b66ea..9955c8edf 100644 --- a/external_imported/vcpkg/versions/q-/qt5-androidextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-androidextras.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "368c21ed42b41f6fcde054661465a3152e67cdff", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "2695f2680a28a32235de0bf07cfd8a4230b2b2ac", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "c014160f25591285ae1b0274e7d4453a152e9fed", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "b0e32e6213649f8645b05c868b81dc3c982bfb30", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-base.json b/external_imported/vcpkg/versions/q-/qt5-base.json index a14cf4e64..b37d83c7a 100644 --- a/external_imported/vcpkg/versions/q-/qt5-base.json +++ b/external_imported/vcpkg/versions/q-/qt5-base.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "7881b89de5ec007d8ea1cd868fd76dd74a2f08ad", + "version": "5.15.6", + "port-version": 1 + }, + { + "git-tree": "432a70f67a01e3348d79cd158563b033a0304452", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "21a6678f36c765307bd8d36052790ab2d59a494d", + "version": "5.15.5", + "port-version": 1 + }, + { + "git-tree": "27c23b887623e05b6a536e0f5d587c8c98f70278", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "64b643c8e9f807cdfdba86d59f39e1b19e747d62", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7", + "version": "5.15.3", + "port-version": 3 + }, { "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-charts.json b/external_imported/vcpkg/versions/q-/qt5-charts.json index 4a69f2305..70fe64f3b 100644 --- a/external_imported/vcpkg/versions/q-/qt5-charts.json +++ b/external_imported/vcpkg/versions/q-/qt5-charts.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5f3a916cb0dfbd6e0ea62d8b62466cb89fd6ae3e", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "588bdf1227f8682fc19986b88b0b3e68190c2e00", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "7ab20682c7d2ce50527abe1e4a41830a57635f65", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "a4fa404a600c749529faae7807d2f24f5a6f8673", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-connectivity.json b/external_imported/vcpkg/versions/q-/qt5-connectivity.json index 9e4118aed..e572ec424 100644 --- a/external_imported/vcpkg/versions/q-/qt5-connectivity.json +++ b/external_imported/vcpkg/versions/q-/qt5-connectivity.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b31cd7440b3016f1bfd883394622da941f0d791d", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "25e38041d8b557befa01eb6d3eaa9e62fba0ab58", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "1388a9a144fb9766f4f8a6a0e6bc5a0224b1487e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8929178e2d3f0d544b21ed4bd1ad635e81fdefc5", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json index db45fe7b3..77406fd50 100644 --- a/external_imported/vcpkg/versions/q-/qt5-datavis3d.json +++ b/external_imported/vcpkg/versions/q-/qt5-datavis3d.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8b43afc9dd3b040a70a4410d0b12958302b23168", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "1f678398846a4542168355a9b857168edf7ce36f", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "e87b00cc75098f24a1b23bbb567996d0bc2ac4ae", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8300805371f9fb2d98a2a2ace37e9e93149483e7", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-declarative.json b/external_imported/vcpkg/versions/q-/qt5-declarative.json index 734ecb969..62e17231a 100644 --- a/external_imported/vcpkg/versions/q-/qt5-declarative.json +++ b/external_imported/vcpkg/versions/q-/qt5-declarative.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "9e8f967f4192fc2902d88bdda402d70253d7c4cb", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "713673abbea4c2f934d48fc95833758fc595f88f", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "0afa58af62ea8090c207a56f417280b856aced78", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "51388bc681cd6616f0d2ecb29b1f3901b2e66613", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-doc.json b/external_imported/vcpkg/versions/q-/qt5-doc.json index df590ce00..ce45698f8 100644 --- a/external_imported/vcpkg/versions/q-/qt5-doc.json +++ b/external_imported/vcpkg/versions/q-/qt5-doc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4f23a84b9637b652b2109fee8a47f0e0d1f7315c", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "9281cb973df81d6e58551695de177c309d2bc7e8", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "9b3cf5737faae5d92d5fd379da81a63257ca13ab", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5cecc56a1a87cf86f87dcde5bc650f8de1e53b60", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-gamepad.json b/external_imported/vcpkg/versions/q-/qt5-gamepad.json index d937d0954..cc98cf8d6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-gamepad.json +++ b/external_imported/vcpkg/versions/q-/qt5-gamepad.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "aca12953a747c1746052786f5bfc5a61914d8221", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "1570d7b61ed6170ff2e844a1cd575f1d671832ce", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "95df0183bac4852f40548ff3b973ad15535f184f", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "53e4e7090cc36a827b518f376c485aacade15d37", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json index fc40fa163..e13d2af23 100644 --- a/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json +++ b/external_imported/vcpkg/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a60d1b4c3416cd44b1f6f0082e748e984f5677f8", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "2a98bf1e90586c3f0b8f75f40c3a048bfbe5a0e7", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "ac4547abb371e952a7f87e72a4c8db590ec08345", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "9bb49ed2d96c2ad0d18a0508f2c170a0ef0a51cf", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-imageformats.json b/external_imported/vcpkg/versions/q-/qt5-imageformats.json index d04465539..f50c7dd41 100644 --- a/external_imported/vcpkg/versions/q-/qt5-imageformats.json +++ b/external_imported/vcpkg/versions/q-/qt5-imageformats.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "46f87c0dc7ec464b65997a361d2f7df19f81c11e", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "a82ad93d08d83fcf90c4803f142585ac1f27c0da", + "version": "5.15.5", + "port-version": 1 + }, + { + "git-tree": "40ed4f94629b611c253af93bdd3fe7cad0245717", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "4e0f8ff607322745113d3b7de494b81a54173320", + "version": "5.15.4", + "port-version": 0 + }, + { + "git-tree": "6035880bd5e6bd0954d738de1bb2e2b79f66953c", + "version": "5.15.3", + "port-version": 1 + }, { "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-location.json b/external_imported/vcpkg/versions/q-/qt5-location.json index a3db41f5a..4f2a709b4 100644 --- a/external_imported/vcpkg/versions/q-/qt5-location.json +++ b/external_imported/vcpkg/versions/q-/qt5-location.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "428ea508b4b239cbc827fcc2066cc5c71a481ba2", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "1359ca0e6b8f97eccbd81ff9732be896b0572096", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "50e02b320624cc5b4be62d2b209d4d0abe1e05fb", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "374ad16cce9ae4eee7c91f701a72c21ede178794", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-macextras.json b/external_imported/vcpkg/versions/q-/qt5-macextras.json index b342d08f9..722ede103 100644 --- a/external_imported/vcpkg/versions/q-/qt5-macextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-macextras.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "35e6445fde079f5a65e3375e58ee1ab096ae797c", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "a32dfee89a54742bd6002b64d1274ff250598179", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "7e6ba9a1b53eb509b3ffc5ae091b51464e94aa94", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "35696a5675057de9b50f3bbb2215b3f0879d3261", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-mqtt.json b/external_imported/vcpkg/versions/q-/qt5-mqtt.json index 6d45e47f2..1e8388fcb 100644 --- a/external_imported/vcpkg/versions/q-/qt5-mqtt.json +++ b/external_imported/vcpkg/versions/q-/qt5-mqtt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6be2f9cb73c5adff57d996453797bf1a7c5b029c", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "44ae7444966ab5f243fd2cd0028b403fdcb286d7", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "f29a8cf672c3aad83d34ee1dd6c9e659cfd4f588", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c8622cf28b900e34394e7c67ee272a0f0ae1a945", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-multimedia.json b/external_imported/vcpkg/versions/q-/qt5-multimedia.json index 924826349..3948f8234 100644 --- a/external_imported/vcpkg/versions/q-/qt5-multimedia.json +++ b/external_imported/vcpkg/versions/q-/qt5-multimedia.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "11a822009048b4b827650ef003c229b2c3baf241", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "a607da4681ec2a2e5c8916bcc588bcf656192583", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "fa127acc620f472f3ba8726783ccfb44d93d95af", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8336d9a40e956b24f846b25c7b017cfac417f1d8", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-networkauth.json b/external_imported/vcpkg/versions/q-/qt5-networkauth.json index 71860f30e..d2e734639 100644 --- a/external_imported/vcpkg/versions/q-/qt5-networkauth.json +++ b/external_imported/vcpkg/versions/q-/qt5-networkauth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c549ddc8096118245602526ac247deb1c2092e5c", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "ebb8a14f6282f9fc7b576b36133210b9027fd8a0", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "b50130d7dcfb78270c759b6ad397ccdb4eb42f4c", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "fed32ceb703389b16ddbf6843597358c92ff27e2", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-purchasing.json b/external_imported/vcpkg/versions/q-/qt5-purchasing.json index e95c72dd4..47b6bf298 100644 --- a/external_imported/vcpkg/versions/q-/qt5-purchasing.json +++ b/external_imported/vcpkg/versions/q-/qt5-purchasing.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f44ac5872f60dba0fbb31d07944a32b87d788a49", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "a65c16c77f8df1595cdd0045263f15499b46ecd5", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "86878fc58b27e1f6f2e8cad31f27aadf3bf77fb2", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c1507aeba5c46c35cccbf662602be9bcfe6d4bc1", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json index cf1e69cbd..251cb01e4 100644 --- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json +++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2c660d5cf5bc79f926233b3a11f9e8413d0e3135", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "2692aa4bc8d7c32494df72815bf952c403afe2af", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "5c24b1552fada859bf5061ab7c004ea12edca056", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "0023d4eae57568295996c372c262c746fce54cd1", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json index c499391c8..16f106fa6 100644 --- a/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json +++ b/external_imported/vcpkg/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7ee332712ba27d51d95908475b239279079d8140", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "16b3a5092e0e2f5db01b402b6d31d6713b70fa61", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "0e491e24d5c90d6de8efed680903b4f37445ddc0", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "da9577fcd83a97070fbb31e9723645e1a353e780", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json index f51c7a4ac..ca11f92a5 100644 --- a/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json +++ b/external_imported/vcpkg/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "ae646bdc592795629b986e08b765c6b450a44079", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "d9bb1305dbf952aeb74dfb504105c73699df16e1", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "1d41a95abf4f754152c887c40057c54c4ffcacc1", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cc4b1cc8e132e4c53c32401e8eaea14140f39906", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-script.json b/external_imported/vcpkg/versions/q-/qt5-script.json index 491fdc3d4..c7733844c 100644 --- a/external_imported/vcpkg/versions/q-/qt5-script.json +++ b/external_imported/vcpkg/versions/q-/qt5-script.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7bd82b3745af7ac2eea950abdc919794516de10a", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "6ea49f33c3a82afeff14d62385b01be448590f2f", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "9bccc52e9aa61f98d1d15e818dd67652012275a9", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "450d4c10bbd324c74ddca59e7d16c6cb215aa077", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-scxml.json b/external_imported/vcpkg/versions/q-/qt5-scxml.json index 8ed279f7e..1090be3b8 100644 --- a/external_imported/vcpkg/versions/q-/qt5-scxml.json +++ b/external_imported/vcpkg/versions/q-/qt5-scxml.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2f3d66073c10915d5900e5cd86cc60b53c619028", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "9e68f9a7ae89d042c84bb3ec32f330914291c009", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "079580ac857fbceeecbcdab6677ff32cb7f78858", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "894ab2a120cd88e276b795234c66715ac787e4ab", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-sensors.json b/external_imported/vcpkg/versions/q-/qt5-sensors.json index 8604dd80b..d3d13c8ca 100644 --- a/external_imported/vcpkg/versions/q-/qt5-sensors.json +++ b/external_imported/vcpkg/versions/q-/qt5-sensors.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5cdf3d0d022434bec187e052a21525573119e2d8", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "12a80269ffe2959c8c32a3a45322b319e1ea4e42", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "7b395d40c215c61a382c9dd411675bb6b1eb5bc1", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "d7faff943ee0ed0c4be86730ded240b322d2b829", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-serialbus.json b/external_imported/vcpkg/versions/q-/qt5-serialbus.json index 70492fed0..11030ba64 100644 --- a/external_imported/vcpkg/versions/q-/qt5-serialbus.json +++ b/external_imported/vcpkg/versions/q-/qt5-serialbus.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "96cae052cc1dadf32a238d0e6764f0c529ac288d", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "ba84a7f42c2b9d8d68172d5a78680ccfcf1d83d7", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "8a6f465b80e92aa05547bf139fa964e8488ab154", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "e16c9b0f5f3bb86c3fe988f049069901ae578d0e", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-serialport.json b/external_imported/vcpkg/versions/q-/qt5-serialport.json index dbe096719..9bf6601d9 100644 --- a/external_imported/vcpkg/versions/q-/qt5-serialport.json +++ b/external_imported/vcpkg/versions/q-/qt5-serialport.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b7d397d9c51a80f70d242913c67dfa671f82634a", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "82f215875bee2312091ab88c2136adc5bf6aac89", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "8b93f29b611b30ac02780e3136af4f4699074446", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cc7ba67e09a801eca90691b7c7db4baf43369a09", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-speech.json b/external_imported/vcpkg/versions/q-/qt5-speech.json index 07c2e5ae9..1419e0ed7 100644 --- a/external_imported/vcpkg/versions/q-/qt5-speech.json +++ b/external_imported/vcpkg/versions/q-/qt5-speech.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "249a91927a349fac1d1568ac1e8c633327d82697", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "92c9d91bc48823b05c940313c18fa5fbce6ce4de", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "c9b3f529af35b50682be46af4b5937b1425f60da", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "bf21b1bb4dc124cba22d170e77ceb78315ab7de2", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-svg.json b/external_imported/vcpkg/versions/q-/qt5-svg.json index f57f54bc1..16723a412 100644 --- a/external_imported/vcpkg/versions/q-/qt5-svg.json +++ b/external_imported/vcpkg/versions/q-/qt5-svg.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4447da6172d30437f1577d746cb4b8e02cf1bc95", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "97b04510d3c94d68e1a46e891ae27ce98e112ad0", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "3052785787495ab14b0fc4b25aa480d18a906bb4", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "6a43bcf48e884abdd82502f747342962e2a2c4b8", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-tools.json b/external_imported/vcpkg/versions/q-/qt5-tools.json index a5deb8aa6..e71db8340 100644 --- a/external_imported/vcpkg/versions/q-/qt5-tools.json +++ b/external_imported/vcpkg/versions/q-/qt5-tools.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b0037e21d33817b94a17874a9fbaafd0b9d9228b", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "40aebcfa61ced5500429ccc3533c7f294510ab0e", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "6025c1997ce5b8bf0ebb131b0628641e8e550d6d", + "version": "5.15.4", + "port-version": 1 + }, + { + "git-tree": "b8a761a89f1f3aabb2c3e990b40cc69d0b7ea543", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "0f3066692eacc724dde9d8f17d4cb67f019ecc75", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-translations.json b/external_imported/vcpkg/versions/q-/qt5-translations.json index b2f540c9e..a5e84d08a 100644 --- a/external_imported/vcpkg/versions/q-/qt5-translations.json +++ b/external_imported/vcpkg/versions/q-/qt5-translations.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b06e77b9da2dd117f4a948e66d9e0253f7b3f019", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "726f0e5f2b92624ad638686cdf6c3c76a0a60c84", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "19e19e3a353b093bfbc1ffb94beeea19f94c6a00", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "4a0df59e14f9c24d2584e7f0424424f50eb4c9f7", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json index 81eb34974..d9da07e1f 100644 --- a/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json +++ b/external_imported/vcpkg/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "dec6f196b45dbf68cd4b9f987c551ed95e3750c7", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "4ff73811f0c4030472b036babb8f5d1fd0425cd8", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "96468c13c2c783e1a63d16877de3c88228ca3f36", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "8c8514424cbc1c746ec7149ec383fbdd5174a0e4", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-wayland.json b/external_imported/vcpkg/versions/q-/qt5-wayland.json index 77179d15c..a865814d7 100644 --- a/external_imported/vcpkg/versions/q-/qt5-wayland.json +++ b/external_imported/vcpkg/versions/q-/qt5-wayland.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6aa87ec473aec6885891eb84d84c506c019b3b3d", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "31180bab6e373741da2e2527e60a9515908754b8", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "6b9afbc817fbb9ea46c53398b1db93331792913f", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "4e8f0ffa97c7f3d1dfe627808bcafc4d4a77d3e2", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-webchannel.json b/external_imported/vcpkg/versions/q-/qt5-webchannel.json index 28d7cc5a6..9bd1a43c0 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webchannel.json +++ b/external_imported/vcpkg/versions/q-/qt5-webchannel.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "211eb036ef0264f4f1baa61feac460def0954a61", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "0c3272e390c783bcdd740392077b124b4786d49a", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "214b6e50c9919b3aca6b9d7b18a49707a6f78cc8", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "cd0f8bbb8bb85bc208907a24c82fe9db0b902922", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-webengine.json b/external_imported/vcpkg/versions/q-/qt5-webengine.json index 159af0652..6854d0f6a 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webengine.json +++ b/external_imported/vcpkg/versions/q-/qt5-webengine.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "cc917e5d2d2394fea8b0617ed4cf6f6bb1adad23", + "version": "5.15.6", + "port-version": 1 + }, + { + "git-tree": "271be6655c1ca2a56c800353ee0db4c906ec04e4", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "afcb720c703b3ae92374d971e8a4047f589430c0", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "71d241727d07ed646d0f34c1d29d4173c1087233", + "version": "5.15.4", + "port-version": 2 + }, + { + "git-tree": "ac21a058fe59c5b0272cdfc2cc1791b9b9901a79", + "version": "5.15.4", + "port-version": 1 + }, + { + "git-tree": "f210713d4af04f690a79188949467c8ba9b2597e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json index 0c8b2fb9e..7238b5d42 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webglplugin.json +++ b/external_imported/vcpkg/versions/q-/qt5-webglplugin.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e4ba6a5b78ae3319296f29a0d21b70add16960f5", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "a58546017a29746294932e5f21d1b1077407f53e", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "618744f2944d1d1d8acfc4bf018a11306f515316", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "3d081435832cdf86757d280e7fbf1bf2b5780199", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-websockets.json b/external_imported/vcpkg/versions/q-/qt5-websockets.json index ec5af0ba6..4cb3c284d 100644 --- a/external_imported/vcpkg/versions/q-/qt5-websockets.json +++ b/external_imported/vcpkg/versions/q-/qt5-websockets.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "47083d05c3a15c58ed56b058e206d8f772cbb13d", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "0ca101ba6c7820798fce809358f6a5a6daad3146", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "6c2886a76834ca95953a47fcf460fd14970c10a4", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "c0380195d2431d25311a4fa542d3437d05f339da", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-webview.json b/external_imported/vcpkg/versions/q-/qt5-webview.json index d1dac375d..ce83c50fa 100644 --- a/external_imported/vcpkg/versions/q-/qt5-webview.json +++ b/external_imported/vcpkg/versions/q-/qt5-webview.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "735f17c73004fe1415cd47fcb5d71d95eb20b9ee", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "db57029476ead2ed6bada3ee98efdc9933685d5c", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "e6f90b47550c95897af8ca9a2508d54d918bad6e", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "bb6129ae1fa4b8945885ca352eca1bde34e1a345", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-winextras.json b/external_imported/vcpkg/versions/q-/qt5-winextras.json index 144d13db8..117020313 100644 --- a/external_imported/vcpkg/versions/q-/qt5-winextras.json +++ b/external_imported/vcpkg/versions/q-/qt5-winextras.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "80498973e03d07a6bb603913a8e5ed43e93a8289", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "ffc879425da05407e5079b8e86870dd1bc6d64e4", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "030018d2b9c2466e483af9dd86fea69ae46f72ee", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5a7881475902048fa453bff04c347caa7e9a615b", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-x11extras.json b/external_imported/vcpkg/versions/q-/qt5-x11extras.json index 2a5fc9c44..941d1ec9c 100644 --- a/external_imported/vcpkg/versions/q-/qt5-x11extras.json +++ b/external_imported/vcpkg/versions/q-/qt5-x11extras.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d143a32da0dc634058405b2553d48337a1014175", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "56678d6bfe2f27b14f7790464721400c1b05c1ff", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "446335809ddbe1ca22e25789061b4fbe7c931583", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "5321c86715348b879cee60dc4323c2e1d8fc9fe9", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json index 27f8c21d6..c32b10ab0 100644 --- a/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json +++ b/external_imported/vcpkg/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0684fc4d4cdfd2f6019e4657fb9d9ca9c8f3a704", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "41265adfd2c35f7d5c56be696ae57e2d63dd4634", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "1452531e0230ac6fc5e7a16f4f7c43fc167c747b", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "b87833daca4ff1492a4890d0f73bcbb416dfc615", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5.json b/external_imported/vcpkg/versions/q-/qt5.json index 2f4ee258a..443060cd9 100644 --- a/external_imported/vcpkg/versions/q-/qt5.json +++ b/external_imported/vcpkg/versions/q-/qt5.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1be1c7149cfbdf1af817b70e2d32d2648d34af78", + "version": "5.15.6", + "port-version": 0 + }, + { + "git-tree": "5a71d754b8b0e033e9588dfc5d84b0b1d81a8c45", + "version": "5.15.5", + "port-version": 0 + }, + { + "git-tree": "15bce9bdfce0d88dafafa166be4f56c2c4883877", + "version": "5.15.4", + "port-version": 0 + }, { "git-tree": "979ef9acc281793cef4f43f1e1eaed177ed9b408", "version": "5.15.3", diff --git a/external_imported/vcpkg/versions/q-/qt5compat.json b/external_imported/vcpkg/versions/q-/qt5compat.json index b88ffd90d..053fcb7b7 100644 --- a/external_imported/vcpkg/versions/q-/qt5compat.json +++ b/external_imported/vcpkg/versions/q-/qt5compat.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "489933bcd5868bf6310ed40d5044c9bba7ab6010", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "7272e6150222d29108fa00089066f55ceab215ea", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "0de65b9a2c56a557ec23d71c0f9eb83d1814d01f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtactiveqt.json b/external_imported/vcpkg/versions/q-/qtactiveqt.json index ef6edccc2..a15d6b1d5 100644 --- a/external_imported/vcpkg/versions/q-/qtactiveqt.json +++ b/external_imported/vcpkg/versions/q-/qtactiveqt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "465d2e5e0439ba13fb1f7e86d76be47aa146ab28", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "9c415044d8f956b7f08dd627bbe1afb172ea83bb", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "774c1e6820a5c0271d4f228f7f680664e3407641", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json index 2e6fdb2a1..666fac0cb 100644 --- a/external_imported/vcpkg/versions/q-/qtapplicationmanager.json +++ b/external_imported/vcpkg/versions/q-/qtapplicationmanager.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "6be65136ec1e0356c284a37a5908f6bcf78215d9", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "154acc25a743ab1e454fc9c2a801f6eb2d28c8e1", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "0a0462497e72897f08a1220703103e874822af44", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "31b3d7a098e8f98ad1ee4d897c164236bfef040c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtbase.json b/external_imported/vcpkg/versions/q-/qtbase.json index 42f90f865..ee7226a28 100644 --- a/external_imported/vcpkg/versions/q-/qtbase.json +++ b/external_imported/vcpkg/versions/q-/qtbase.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "0b34c02c8bbcd997c6f65d11a4d01012f0441de1", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "3fa8531e9f444076cc6e73b979bcaaa3e665a7a5", + "version": "6.3.1", + "port-version": 2 + }, + { + "git-tree": "53f9f138ffa51742c27c5e44606f86b6b70b2734", + "version": "6.3.1", + "port-version": 1 + }, + { + "git-tree": "436e3f3fbaac28eabd4199c4ac97407bb701e929", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "bad99835f1e2cf63bc1ddcd9d5871e3081964bbc", + "version": "6.3.0", + "port-version": 2 + }, + { + "git-tree": "32ffa659c93542477ed0f0ee90f3a7f99c0035f0", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "8a107123c1e35b7e5fc0df157026d7fde8a42632", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtcharts.json b/external_imported/vcpkg/versions/q-/qtcharts.json index b840a15b6..4d9b5a584 100644 --- a/external_imported/vcpkg/versions/q-/qtcharts.json +++ b/external_imported/vcpkg/versions/q-/qtcharts.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "748f1d3bee95e095d18eb8cf86840bcdab5b1f0e", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "a15b7d019195f7598c982e0e04c3af1854c9f2e1", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "5a6b0d90d87f22b85e513ae3aec86a31da8ba345", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtcoap.json b/external_imported/vcpkg/versions/q-/qtcoap.json index 3473d9933..139fe6012 100644 --- a/external_imported/vcpkg/versions/q-/qtcoap.json +++ b/external_imported/vcpkg/versions/q-/qtcoap.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c4d1e5ebb1598edbb9861dce84997b10e66fc769", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "ffcdc27a6814e5a08af5c618b230c2c144a49c7e", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "9d43d6c903f6d72b54187e9f6657a346929ab515", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtconnectivity.json b/external_imported/vcpkg/versions/q-/qtconnectivity.json index b4b4e9741..d25cde68d 100644 --- a/external_imported/vcpkg/versions/q-/qtconnectivity.json +++ b/external_imported/vcpkg/versions/q-/qtconnectivity.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "df953810cdfbfa1516ad5f7a03d0577f97de03e6", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "84a17dffda30f3239e065b5776ff972098613dd7", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "6c7069034cb39a6450178d52a58a0ddffda07b5d", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtdatavis3d.json b/external_imported/vcpkg/versions/q-/qtdatavis3d.json index ebd18f8b5..4b4540a3d 100644 --- a/external_imported/vcpkg/versions/q-/qtdatavis3d.json +++ b/external_imported/vcpkg/versions/q-/qtdatavis3d.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "88f09be59dad78b84bd41c01520f9fcfb5052b46", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "e7aa59175c94525ec18c988c866356882c730cb5", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "a1fd864c050d29e79b16f84029402fcb3840d1a9", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtdeclarative.json b/external_imported/vcpkg/versions/q-/qtdeclarative.json index 5d3827b0e..9c7580644 100644 --- a/external_imported/vcpkg/versions/q-/qtdeclarative.json +++ b/external_imported/vcpkg/versions/q-/qtdeclarative.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "0f10c6273faf539ccacefdd271f80f71d37426ff", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "f07ed79d7c1a7c616539e8243126143cf202b706", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "551991d8ec2c004a196cc0c3e6acc8babe34546f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "ea64315431fd028d453a27e999d7e696f48923d4", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json index 2b269d377..a8e9c7943 100644 --- a/external_imported/vcpkg/versions/q-/qtdeviceutilities.json +++ b/external_imported/vcpkg/versions/q-/qtdeviceutilities.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "a1651713cf1f37a37a03d0d9a49c589dc0328363", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "02a1198b628b04d7969fbf1f8214428da635555e", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "4945df086d916c7aa24e9ed44ac983b1ef65c84b", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtdoc.json b/external_imported/vcpkg/versions/q-/qtdoc.json index 5edb3f9b8..1f16ae374 100644 --- a/external_imported/vcpkg/versions/q-/qtdoc.json +++ b/external_imported/vcpkg/versions/q-/qtdoc.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7bb265a825524a2184d6f0d9ee81bc258a5dd7f4", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "78caa376b251d8d5cdd40c5128a2a657308c6d10", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "cb9dbafdcf670a693bbdfb8c9d9f3a6282e8a455", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtimageformats.json b/external_imported/vcpkg/versions/q-/qtimageformats.json index 52ba49b71..addeace8f 100644 --- a/external_imported/vcpkg/versions/q-/qtimageformats.json +++ b/external_imported/vcpkg/versions/q-/qtimageformats.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b124b9d71de95557c5024f6ba1d3328b553ce35f", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "fc60f798c304673e062010dcf4b1c3b27bc5d46b", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "8be93de3e45f5a409cb6606b1f9e240468513506", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json index 33909a951..6899db930 100644 --- a/external_imported/vcpkg/versions/q-/qtinterfaceframework.json +++ b/external_imported/vcpkg/versions/q-/qtinterfaceframework.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "06bd4310e48e978c281804ba2bce2fc37d1b4fa1", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "5ddae3f893d3147528593a2b05ad2012416a6a26", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "fdc3b41d77a6ee6160cfc442ddacf03aa91d0481", + "version": "6.3.0", + "port-version": 0 + }, + { + "git-tree": "b54a54283fd7e3a5929b1d67721675ee1c8d5234", + "version": "6.2.4", + "port-version": 2 + }, + { + "git-tree": "e4969db9a78db8b04d4d803e4494a9f98007396a", + "version": "6.2.4", + "port-version": 1 + }, { "git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json b/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json index 685b1083d..aa49b7faf 100644 --- a/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json +++ b/external_imported/vcpkg/versions/q-/qtkeychain-qt6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3733fba48696a40e64b18c2d52d4adc04e6eb22d", + "version": "0.13.2", + "port-version": 1 + }, { "git-tree": "b3df36df3c274f528e53cd1f8366811231b15151", "version": "0.13.2", diff --git a/external_imported/vcpkg/versions/q-/qtkeychain.json b/external_imported/vcpkg/versions/q-/qtkeychain.json index 3016ce87b..f949e3cad 100644 --- a/external_imported/vcpkg/versions/q-/qtkeychain.json +++ b/external_imported/vcpkg/versions/q-/qtkeychain.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "eda48d2b83676b8209a40d68b286c570aeed785e", + "version": "0.13.2", + "port-version": 3 + }, + { + "git-tree": "6311d9dd13b97c8a01a980d7b42ea6cfecc4f765", + "version": "0.13.2", + "port-version": 2 + }, { "git-tree": "ef01f1d6401814e50c0438d3a8a7770568ac93ca", "version": "0.13.2", diff --git a/external_imported/vcpkg/versions/q-/qtlocation.json b/external_imported/vcpkg/versions/q-/qtlocation.json index de75ba18c..6e7450a06 100644 --- a/external_imported/vcpkg/versions/q-/qtlocation.json +++ b/external_imported/vcpkg/versions/q-/qtlocation.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "66543e50c8d248760af29f9d0389b317718cf77d", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "a05ac67b49b7e904ecfbe1f717de1d958f534732", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtlottie.json b/external_imported/vcpkg/versions/q-/qtlottie.json index cf263c8b0..bd4d4e83d 100644 --- a/external_imported/vcpkg/versions/q-/qtlottie.json +++ b/external_imported/vcpkg/versions/q-/qtlottie.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c4cec2002c75d7f5ccee8a209145070ec41d4683", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "b817b1b9d2907f2eff4b3720adaf5e57d3ba58d8", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "ea1df3762dec91c8fb7709297007be459484e89c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtmqtt.json b/external_imported/vcpkg/versions/q-/qtmqtt.json index b62a83680..2839a41b6 100644 --- a/external_imported/vcpkg/versions/q-/qtmqtt.json +++ b/external_imported/vcpkg/versions/q-/qtmqtt.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "32ec622f0241df9bb4fd5aaf31525fb3a1046167", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "dac98dff234119fbebcd0ad9fa5aba66f331fa67", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "0f29ef7a81aacf9d33e6741138f80be59f69a8a2", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "0b09100a4e32240e79258ab69386b77370d916a0", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtmultimedia.json b/external_imported/vcpkg/versions/q-/qtmultimedia.json index fc552d130..fe7866268 100644 --- a/external_imported/vcpkg/versions/q-/qtmultimedia.json +++ b/external_imported/vcpkg/versions/q-/qtmultimedia.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "f538a967236f91129b70c8cf335746242e0cacbd", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "e820875b5bc53163ca6af245c6874ce366dac52a", + "version": "6.3.1", + "port-version": 1 + }, + { + "git-tree": "aa389d9b2b938058dda0c787072eb791a7c6032e", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "21bab604cd34ebe659fdc7b12249d1e69359d939", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtnetworkauth.json b/external_imported/vcpkg/versions/q-/qtnetworkauth.json index a524dc86a..83e604cc5 100644 --- a/external_imported/vcpkg/versions/q-/qtnetworkauth.json +++ b/external_imported/vcpkg/versions/q-/qtnetworkauth.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "dfe2f0d819c3e2f405710056f692d2a72675a26a", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "73fb3aef5bcda38a39d0e75b6a64193beea261ce", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "2449ff55a2b817d0f651aa00b2cadc914c0b68ae", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtopcua.json b/external_imported/vcpkg/versions/q-/qtopcua.json index 47a362cff..968ef5679 100644 --- a/external_imported/vcpkg/versions/q-/qtopcua.json +++ b/external_imported/vcpkg/versions/q-/qtopcua.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "83f22dc97ea1097dc2aab93b0b468de4cd5927a4", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "fb153569181c4723a0c2c2811e1d9e74e13c75e1", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "8083780556aa4e951599cc798aa4a64a3ccf7341", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7a9e72b88e14594db1752854941cb95174565be6", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtpositioning.json b/external_imported/vcpkg/versions/q-/qtpositioning.json index 88693a1df..1f1ea42da 100644 --- a/external_imported/vcpkg/versions/q-/qtpositioning.json +++ b/external_imported/vcpkg/versions/q-/qtpositioning.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "917a949915180a1c09998f917a44a3026f721889", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "05f02aa08ead77446d353e181062fd78b2253b7b", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "47fd199ee3c949ade116a3c070f2aaaedd2aa91f", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtquick3d.json b/external_imported/vcpkg/versions/q-/qtquick3d.json index bcbffd2c7..0abd95cff 100644 --- a/external_imported/vcpkg/versions/q-/qtquick3d.json +++ b/external_imported/vcpkg/versions/q-/qtquick3d.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "250c2b1d8bb5d0dbecc4ecceb6269f2c50a6b0f5", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "cd80e49b7976333f599d55bd5b186b2605f17700", + "version": "6.3.1", + "port-version": 1 + }, + { + "git-tree": "c3b68a69ca91b7485ada2416293d0a9447d0ba95", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "d5c67539ad28c84e99778aa173cda5950873a6ee", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtquickcontrols2.json b/external_imported/vcpkg/versions/q-/qtquickcontrols2.json index babcf6e31..2ac3400b9 100644 --- a/external_imported/vcpkg/versions/q-/qtquickcontrols2.json +++ b/external_imported/vcpkg/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f018726e72742c98506b024d91adef2e4b95c6e", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "cc6552504db6a9b651a65d98fbeb232152b7a8fe", "version-semver": "6.2.0", diff --git a/external_imported/vcpkg/versions/q-/qtquicktimeline.json b/external_imported/vcpkg/versions/q-/qtquicktimeline.json index b546a117c..2369b8a91 100644 --- a/external_imported/vcpkg/versions/q-/qtquicktimeline.json +++ b/external_imported/vcpkg/versions/q-/qtquicktimeline.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "33432efb529b2a9452488d400e63bd15785a1382", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "d92d8af81e01f106e680d66ad1d1a698f40c01d9", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "28a8faa45cb13b376cd881be9494826bb9556009", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtremoteobjects.json b/external_imported/vcpkg/versions/q-/qtremoteobjects.json index 2866acc00..2cd716b00 100644 --- a/external_imported/vcpkg/versions/q-/qtremoteobjects.json +++ b/external_imported/vcpkg/versions/q-/qtremoteobjects.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8d720b92e53f722ebf9f0624f5c4ba8a8ba465cf", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "f9ab5c76eacdd4f7352ff1be88c221335057c91a", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "ce8e5b5c4570cf489ea6dd4e19c454e2e3ab54bb", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "c9f576479ffa0be9262702030362c0b030b1497b", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtscxml.json b/external_imported/vcpkg/versions/q-/qtscxml.json index 1073b8826..534a68351 100644 --- a/external_imported/vcpkg/versions/q-/qtscxml.json +++ b/external_imported/vcpkg/versions/q-/qtscxml.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "f694bf4523736b0a8871468d2f890c0170eadf0d", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "dad48d019ccaba8f0a7579d903cd99c901c74fc5", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "3b64cdc43d7e83cb693720f28c13408a39ad0afa", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "82cfc4f68723b511524573f7492e44c0326378f7", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtsensors.json b/external_imported/vcpkg/versions/q-/qtsensors.json index 34a1cbb8c..a946bb705 100644 --- a/external_imported/vcpkg/versions/q-/qtsensors.json +++ b/external_imported/vcpkg/versions/q-/qtsensors.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "2005a1cbf056aab0a5919d2c0b184ff25a289fe4", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "10b934af8bbfa5f960391ab2bd121194c9aee494", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "8eefc49c6f1c874ba871cbb811e13b54a0fdf7ff", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtserialbus.json b/external_imported/vcpkg/versions/q-/qtserialbus.json index aab2381f8..025c36934 100644 --- a/external_imported/vcpkg/versions/q-/qtserialbus.json +++ b/external_imported/vcpkg/versions/q-/qtserialbus.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "d08e9a633ec502000dcd1c0a31b31b5fd85cdab7", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "ac0f2168badd930acb29ef160c7bc408cf0e062c", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "8df6a16221d7abc2af7d76a7c809901e5ae45484", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtserialport.json b/external_imported/vcpkg/versions/q-/qtserialport.json index 67aa32223..85f4c036b 100644 --- a/external_imported/vcpkg/versions/q-/qtserialport.json +++ b/external_imported/vcpkg/versions/q-/qtserialport.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b7442cfd0d14aa6ef8e7614aa28a340c509848d1", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "7974343d211dd12cb91e9cca217e8f9b04783182", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "c74684c9a5e6b20ae4066a5f1b7af2decec2ced7", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtshadertools.json b/external_imported/vcpkg/versions/q-/qtshadertools.json index 0c4363ce2..a4192fded 100644 --- a/external_imported/vcpkg/versions/q-/qtshadertools.json +++ b/external_imported/vcpkg/versions/q-/qtshadertools.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "7358894ceda32f4d35603e4d525e1fbd805fbc60", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "f1ee6d4dc6fe612733391a78b4149393ab82c78b", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "75ac0d075ab14c918db6e38e398fca4bc877c146", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtsvg.json b/external_imported/vcpkg/versions/q-/qtsvg.json index 763ca70f6..b48d09937 100644 --- a/external_imported/vcpkg/versions/q-/qtsvg.json +++ b/external_imported/vcpkg/versions/q-/qtsvg.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8a331df9dc56e835f16c8266d9b6eabb94ac2c86", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "cc44ba493ec11d3b32c272c115add826353cb707", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "3bc8989c9c61cc741186f5dc7fc4eda94f20f6a4", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qttools.json b/external_imported/vcpkg/versions/q-/qttools.json index 8f8275463..af2642d3b 100644 --- a/external_imported/vcpkg/versions/q-/qttools.json +++ b/external_imported/vcpkg/versions/q-/qttools.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "6ca68dc3285690ce0de5a23ce4d9d664310d1626", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "f7fb1deea8bfdc96c67528333b47b1ffc9c4ad60", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "4bef4075be6e9e33ada53f0e2b3a37329187fa5a", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "002b7b9432d4c1f49de7a486f70a673285cd98a8", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qttranslations.json b/external_imported/vcpkg/versions/q-/qttranslations.json index c702c0ccd..1a45c8037 100644 --- a/external_imported/vcpkg/versions/q-/qttranslations.json +++ b/external_imported/vcpkg/versions/q-/qttranslations.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "34380b3429538f411c5742822674328365697ef3", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "4a11055fa2395cf5885d2f064ae5bead129cd815", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "09befbf6b2bd7001465003cbdd49ae138b754316", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json index e95d822c8..906c6f8ac 100644 --- a/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json +++ b/external_imported/vcpkg/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8fbd6f4e78576ea2a3bf3389d36a400ebf8fff1f", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "dd49b655ecb0526706a5aaa81ffdaa05ef74c031", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "5804d29790d75c7a40c1fe9c4f54c3cfd03a5eaa", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtwayland.json b/external_imported/vcpkg/versions/q-/qtwayland.json index eb7c39687..76ee45f85 100644 --- a/external_imported/vcpkg/versions/q-/qtwayland.json +++ b/external_imported/vcpkg/versions/q-/qtwayland.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8618a325913a4e94ea4d9ae25aae993211a049a3", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "bbcba20baf4e7189691d19cea523b0c23b837749", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "9e7c6ecb71e8b4c3b8277f97f461d6f8b017ef1c", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtwebchannel.json b/external_imported/vcpkg/versions/q-/qtwebchannel.json index 55122a8db..24dac10b5 100644 --- a/external_imported/vcpkg/versions/q-/qtwebchannel.json +++ b/external_imported/vcpkg/versions/q-/qtwebchannel.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "530a2818778c7e6a7a89aa960f725d024983f85a", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "9f8c92c126be424363d4de120e17dae54ada0b6b", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "b8c14bb3f3297e816d3f0df2bc0377fce7963c55", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtwebengine.json b/external_imported/vcpkg/versions/q-/qtwebengine.json index edb49ebc8..38cd9fde5 100644 --- a/external_imported/vcpkg/versions/q-/qtwebengine.json +++ b/external_imported/vcpkg/versions/q-/qtwebengine.json @@ -1,5 +1,35 @@ { "versions": [ + { + "git-tree": "ec3282a08fee4cdadb156aa5389d33d39d507ebc", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "a44c1faf17e5e071b28369731c24b766656a8a8e", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "29b6cc23c91540debb74a38874cdd5985e7dbf59", + "version": "6.3.0", + "port-version": 3 + }, + { + "git-tree": "fb2bc02591f25285ed7e085bce22001d42ec5d87", + "version": "6.3.0", + "port-version": 2 + }, + { + "git-tree": "6562d0a0294290afd20da039ff60602c1f3f4701", + "version": "6.3.0", + "port-version": 1 + }, + { + "git-tree": "47cd0b321b5eda832afbb46e58159ca3adb65ce9", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtwebsockets.json b/external_imported/vcpkg/versions/q-/qtwebsockets.json index 459c87c45..5b6003974 100644 --- a/external_imported/vcpkg/versions/q-/qtwebsockets.json +++ b/external_imported/vcpkg/versions/q-/qtwebsockets.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e5294e25b8339515231c57b5e4bf7b429a6d21e1", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "da354bd4fff935834b6b2b68e7956f9087b5f64d", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "615c601a62d67874adfb14ae7f1d9859f87a6719", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "78911113c7407ff6403479ace90d0f4b2656e517", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/qtwebview.json b/external_imported/vcpkg/versions/q-/qtwebview.json index f4da583d9..7af7dc26e 100644 --- a/external_imported/vcpkg/versions/q-/qtwebview.json +++ b/external_imported/vcpkg/versions/q-/qtwebview.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8e93248b1057ff1e417b25871fe37775a3714f25", + "version": "6.3.2", + "port-version": 0 + }, + { + "git-tree": "66528f9f10385e04a300e217aa15aa8fd8a82677", + "version": "6.3.1", + "port-version": 0 + }, + { + "git-tree": "248b7ff0cd48d36410f9fde1119d2624260a4c6a", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165", "version": "6.2.4", diff --git a/external_imported/vcpkg/versions/q-/quantlib.json b/external_imported/vcpkg/versions/q-/quantlib.json index c8bb6a47b..14ea49faa 100644 --- a/external_imported/vcpkg/versions/q-/quantlib.json +++ b/external_imported/vcpkg/versions/q-/quantlib.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "1b757843f94ec0950f693324ea419498a12e415f", + "version": "1.27", + "port-version": 0 + }, + { + "git-tree": "f5eb0f25fa5fdff2d0fd4b5cc1f1bb2e98033b59", + "version": "1.26", + "port-version": 1 + }, + { + "git-tree": "3af9ced73240dfb4e1ec776c5f9a16ac277d1c27", + "version": "1.26", + "port-version": 0 + }, { "git-tree": "4d702f6d14c1a91b83a4950dd05e3b200700cfd8", "version": "1.25", diff --git a/external_imported/vcpkg/versions/q-/quazip.json b/external_imported/vcpkg/versions/q-/quazip.json index 3aaff18d3..3c97a6643 100644 --- a/external_imported/vcpkg/versions/q-/quazip.json +++ b/external_imported/vcpkg/versions/q-/quazip.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "41bc9e2c011d91275f6b44d638257f88ee6223c8", + "version": "1.3", + "port-version": 1 + }, + { + "git-tree": "92000bba1473465da5e5de8864acc0e49250b2f2", + "version": "1.3", + "port-version": 0 + }, { "git-tree": "7e1b1da3a71a9e98c52bad16aef6c0666d993b56", "version": "1.1", diff --git a/external_imported/vcpkg/versions/q-/quill.json b/external_imported/vcpkg/versions/q-/quill.json index fdd44a202..1f4d9814e 100644 --- a/external_imported/vcpkg/versions/q-/quill.json +++ b/external_imported/vcpkg/versions/q-/quill.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "cf93531e147436f75761409a5148fbd6cc1969f8", + "version": "2.1.0", + "port-version": 0 + }, + { + "git-tree": "fb911c05f1ad501f9b87ea3918d4badef41d16e4", + "version": "2.0.0", + "port-version": 0 + }, + { + "git-tree": "d663be1266a5e973411f7bf422d3b901609098e8", + "version": "1.7.2", + "port-version": 0 + }, + { + "git-tree": "bfe7d0bbdf62856534c0d3783135b2bca1fea312", + "version": "1.7.1", + "port-version": 0 + }, + { + "git-tree": "a267f26f50e991400ca01b2dd40dec6a71cefee3", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "19f0208595bbec6d64a4e34e351b530d091212bd", "version-semver": "1.6.3", diff --git a/external_imported/vcpkg/versions/q-/quirc.json b/external_imported/vcpkg/versions/q-/quirc.json index dc70374be..4b237f44c 100644 --- a/external_imported/vcpkg/versions/q-/quirc.json +++ b/external_imported/vcpkg/versions/q-/quirc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85b17d675bbbb05448d16af79d434bc5fca51f7b", + "version": "1.1", + "port-version": 3 + }, { "git-tree": "15bad29ef4d2466b236311ce7af075dbb9507ed9", "version": "1.1", diff --git a/external_imported/vcpkg/versions/r-/random123.json b/external_imported/vcpkg/versions/r-/random123.json new file mode 100644 index 000000000..37fb262d5 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/random123.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c4e7e093d8eabdc89b0634e4a361e4a982c7cbe5", + "version": "1.14.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/range-v3.json b/external_imported/vcpkg/versions/r-/range-v3.json index 07a0fffa3..5b242a4cf 100644 --- a/external_imported/vcpkg/versions/r-/range-v3.json +++ b/external_imported/vcpkg/versions/r-/range-v3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f7f986d35e34cf810a966f9695ad094736de9de", + "version": "0.12.0", + "port-version": 0 + }, { "git-tree": "78edaab693f001b38b155c3ef35a85036fd938ae", "version-date": "2021-11-02", diff --git a/external_imported/vcpkg/versions/r-/rapidcsv.json b/external_imported/vcpkg/versions/r-/rapidcsv.json index 4785f328c..a018f1a7e 100644 --- a/external_imported/vcpkg/versions/r-/rapidcsv.json +++ b/external_imported/vcpkg/versions/r-/rapidcsv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1842f5ea6077feea4ef5d07bb43e2fd648763718", + "version": "8.64", + "port-version": 0 + }, { "git-tree": "712023c784b983f8f85088dedc94c0d6fa53907e", "version": "8.53", diff --git a/external_imported/vcpkg/versions/r-/rapidjson.json b/external_imported/vcpkg/versions/r-/rapidjson.json index 0199e789a..0837af0b5 100644 --- a/external_imported/vcpkg/versions/r-/rapidjson.json +++ b/external_imported/vcpkg/versions/r-/rapidjson.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "b33122751fc9d722f05cc50538aa9b6d08e2d105", + "version-date": "2022-06-28", + "port-version": 3 + }, + { + "git-tree": "f3770e13ddf21ddf223c84dab78f3d04d4f25750", + "version-date": "2022-06-28", + "port-version": 2 + }, + { + "git-tree": "bf72eff187a248a24485011d16b0a8259e40ed59", + "version-date": "2022-06-28", + "port-version": 1 + }, + { + "git-tree": "36ea3aaadfb5ae8186ef4ab68c231203743e9c3f", + "version-date": "2022-06-28", + "port-version": 0 + }, { "git-tree": "14f78d728ea7cd8b0872521a88e71162325a103f", "version-date": "2020-09-14", diff --git a/external_imported/vcpkg/versions/r-/raylib.json b/external_imported/vcpkg/versions/r-/raylib.json index 91b54dde0..6ba27d5f7 100644 --- a/external_imported/vcpkg/versions/r-/raylib.json +++ b/external_imported/vcpkg/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84270f09d9ecfed2207ea866910905fdfcf8b229", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/r-/rbdl-orb.json b/external_imported/vcpkg/versions/r-/rbdl-orb.json index ad446aa6e..7efcfecd9 100644 --- a/external_imported/vcpkg/versions/r-/rbdl-orb.json +++ b/external_imported/vcpkg/versions/r-/rbdl-orb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43ffd107db5a63e5c663a98259e3bdcb932fca10", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "8471512e28002dc4d68bac4b43769172c22db5dd", "version": "3.1.2", diff --git a/external_imported/vcpkg/versions/r-/rbdl.json b/external_imported/vcpkg/versions/r-/rbdl.json index cc9bc2e16..1a4a35f22 100644 --- a/external_imported/vcpkg/versions/r-/rbdl.json +++ b/external_imported/vcpkg/versions/r-/rbdl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "70c51c8d79d0dab6a483d160024c6bc68a8169c3", + "version": "3.2.0", + "port-version": 4 + }, + { + "git-tree": "9d0f94e12844bb594f54986246e876569cfca0c1", + "version": "2.6.0", + "port-version": 3 + }, { "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137", "version": "2.6.0", diff --git a/external_imported/vcpkg/versions/r-/readline-unix.json b/external_imported/vcpkg/versions/r-/readline-unix.json index a0284c726..442ccc2df 100644 --- a/external_imported/vcpkg/versions/r-/readline-unix.json +++ b/external_imported/vcpkg/versions/r-/readline-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e81a9fe4baa7c437b6e6d9636ae7c291e2ed81e9", + "version": "8.1", + "port-version": 2 + }, { "git-tree": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", "version": "8.1", diff --git a/external_imported/vcpkg/versions/r-/readline-win32.json b/external_imported/vcpkg/versions/r-/readline-win32.json index cfba59150..9776c9f0b 100644 --- a/external_imported/vcpkg/versions/r-/readline-win32.json +++ b/external_imported/vcpkg/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19f9684f55a9aa01b5612a5ebec47960f51bacdd", + "version": "5.0", + "port-version": 5 + }, { "git-tree": "b1ed33b8ec37a1cf44926c9954b6943bce302b70", "version": "5.0", diff --git a/external_imported/vcpkg/versions/r-/readosm.json b/external_imported/vcpkg/versions/r-/readosm.json index 79eeaa116..9275bf7ea 100644 --- a/external_imported/vcpkg/versions/r-/readosm.json +++ b/external_imported/vcpkg/versions/r-/readosm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e04328cccd78bf8d4ec57d70059d49501b361292", + "version-string": "1.1.0a", + "port-version": 3 + }, { "git-tree": "4a5f7efaec651bab56e95ba4db4e8d9316050b9c", "version-string": "1.1.0a", diff --git a/external_imported/vcpkg/versions/r-/realsense2.json b/external_imported/vcpkg/versions/r-/realsense2.json index 8a9edfebc..be6b01935 100644 --- a/external_imported/vcpkg/versions/r-/realsense2.json +++ b/external_imported/vcpkg/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdb245079161fee11eba3127b11c27e539c8a13d", + "version": "2.51.1", + "port-version": 0 + }, { "git-tree": "1b967b8979ae93b95b16a7021348e04f534f28c0", "version": "2.50.0", diff --git a/external_imported/vcpkg/versions/r-/recast.json b/external_imported/vcpkg/versions/r-/recast.json index 82f778cd7..76bccf1b4 100644 --- a/external_imported/vcpkg/versions/r-/recast.json +++ b/external_imported/vcpkg/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe2b42ef737e0b51a58bb9f56340e324ab8f82c3", + "version": "1.5.1", + "port-version": 5 + }, { "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", "version": "1.5.1", diff --git a/external_imported/vcpkg/versions/r-/redis-plus-plus.json b/external_imported/vcpkg/versions/r-/redis-plus-plus.json index de899f3b7..cfe71b9ca 100644 --- a/external_imported/vcpkg/versions/r-/redis-plus-plus.json +++ b/external_imported/vcpkg/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfb560234e651a06204f44976997b21466ba6a9d", + "version-semver": "1.3.2", + "port-version": 1 + }, { "git-tree": "a58c88604be6da2e638127442cc413c0504e2f51", "version-semver": "1.3.2", diff --git a/external_imported/vcpkg/versions/r-/refl-cpp.json b/external_imported/vcpkg/versions/r-/refl-cpp.json index 83d6be7ad..349e371cd 100644 --- a/external_imported/vcpkg/versions/r-/refl-cpp.json +++ b/external_imported/vcpkg/versions/r-/refl-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "cb8d6fa4720dd349ab60b95ad01380b55d0d4e1c", + "version": "0.12.3", + "port-version": 1 + }, + { + "git-tree": "7018b2c10e3c2e2be8dd774fb43d2f04fa520a02", + "version": "0.12.3", + "port-version": 0 + }, { "git-tree": "f5aea911f8cfd7c6eecadb50142f00205a2e7f57", "version": "0.12.2", diff --git a/external_imported/vcpkg/versions/r-/rendergraph.json b/external_imported/vcpkg/versions/r-/rendergraph.json index 8bc394ff1..44a8b8681 100644 --- a/external_imported/vcpkg/versions/r-/rendergraph.json +++ b/external_imported/vcpkg/versions/r-/rendergraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d76c6d57a40e1c6e5035e7bef12f6777523de738", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "d9a3f94947632fcba47a0110eecbbc8a72f5f908", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/r-/restinio.json b/external_imported/vcpkg/versions/r-/restinio.json index 43569965b..8e177cb71 100644 --- a/external_imported/vcpkg/versions/r-/restinio.json +++ b/external_imported/vcpkg/versions/r-/restinio.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7b285cfa0e43e1964ca4a91d2375516aa8121d79", + "version": "0.6.17", + "port-version": 0 + }, + { + "git-tree": "d203c65a6c07e890c752ab69d981546bc208763e", + "version": "0.6.16", + "port-version": 0 + }, + { + "git-tree": "07fadf731052fa7900593db32c0515cba8c45138", + "version": "0.6.15", + "port-version": 0 + }, + { + "git-tree": "ea4d99d764e913dd233ac8d1df27c6720f5ccbd9", + "version": "0.6.14", + "port-version": 1 + }, { "git-tree": "65493f16b394fd5a61f908afc058dae965a60989", "version": "0.6.14", diff --git a/external_imported/vcpkg/versions/r-/rhash.json b/external_imported/vcpkg/versions/r-/rhash.json index 5645f7458..194462b1b 100644 --- a/external_imported/vcpkg/versions/r-/rhash.json +++ b/external_imported/vcpkg/versions/r-/rhash.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "85de223344c08a1efc2f9f6ec6bcb69529851199", + "version": "1.4.2", + "port-version": 1 + }, + { + "git-tree": "385025c1a8f84dfaf6035c2d730fb4ae0d8b16fd", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "db6e2fc777b1ffb5257989484d303fc52e9b39f5", "version": "1.4.0", diff --git a/external_imported/vcpkg/versions/r-/rioki-glow.json b/external_imported/vcpkg/versions/r-/rioki-glow.json new file mode 100644 index 000000000..1b46f5b29 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/rioki-glow.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c7d83181fde1e5535022c2dc3fccfaa38c37c3ab", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/rmlui.json b/external_imported/vcpkg/versions/r-/rmlui.json index 2c292a49c..07524e0ac 100644 --- a/external_imported/vcpkg/versions/r-/rmlui.json +++ b/external_imported/vcpkg/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d98cdd5cd06d9640e908e0b08f81c35a07e36b18", + "version": "4.4", + "port-version": 0 + }, { "git-tree": "aaaaf8e01725428c22bcd3f6dcfef56568433dec", "version": "4.3", diff --git a/external_imported/vcpkg/versions/r-/roaring.json b/external_imported/vcpkg/versions/r-/roaring.json index 4ec4c7616..469d922ab 100644 --- a/external_imported/vcpkg/versions/r-/roaring.json +++ b/external_imported/vcpkg/versions/r-/roaring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53f447b8e40bdaef2d1e693942505f95357e7279", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "bd4d38440852b0d89e5bb4f1248f4090dcca5b8e", "version-string": "2019-03-05", diff --git a/external_imported/vcpkg/versions/r-/robin-map.json b/external_imported/vcpkg/versions/r-/robin-map.json index 94e2dbd7e..0d92e0349 100644 --- a/external_imported/vcpkg/versions/r-/robin-map.json +++ b/external_imported/vcpkg/versions/r-/robin-map.json @@ -1,12 +1,22 @@ { "versions": [ + { + "git-tree": "c9028bfe2eb66beaa1a44bf4816223fed81d6657", + "version-semver": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "3d169ebe25cc931f31bc343d6b21e734070902ed", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "95d49e16c7a8ef523608ef8e7d8fb019085789b8", "version-semver": "0.6.3", "port-version": 1 }, { - "git-tree": "3a6eb0ea067edf2d06baa7706281caf96df4216a", + "git-tree": "84f1433234bb4813feee71e4042174ec9e8d5a7a", "version-semver": "0.6.3", "port-version": 0 }, diff --git a/external_imported/vcpkg/versions/r-/rsig.json b/external_imported/vcpkg/versions/r-/rsig.json new file mode 100644 index 000000000..53e603776 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/rsig.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "525def3216ac409d83ec19c46ac670dc3f74bb8a", + "version-semver": "0.1.1", + "port-version": 0 + }, + { + "git-tree": "ead8c39f676072093b0b65df27d2f34414ef056a", + "version-semver": "0.1.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/rsm-binary-io.json b/external_imported/vcpkg/versions/r-/rsm-binary-io.json index 34c422faf..213de95d5 100644 --- a/external_imported/vcpkg/versions/r-/rsm-binary-io.json +++ b/external_imported/vcpkg/versions/r-/rsm-binary-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a170dd2013d45c86b272169552cf4ac52a5d1c79", + "version-semver": "2.0.5", + "port-version": 0 + }, { "git-tree": "954debdfb4b8f785728e7c263ea3ea3ee7093253", "version-semver": "2.0.4", diff --git a/external_imported/vcpkg/versions/r-/rtabmap.json b/external_imported/vcpkg/versions/r-/rtabmap.json index 1ef4831fd..aeaf4087c 100644 --- a/external_imported/vcpkg/versions/r-/rtabmap.json +++ b/external_imported/vcpkg/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b51506f789882022d1af0556521079694ce5cf62", + "version": "0.20.13", + "port-version": 4 + }, { "git-tree": "cf41f524585ec0c2dd5b8c7d8b455a79265b62ea", "version": "0.20.13", diff --git a/external_imported/vcpkg/versions/r-/rtmidi.json b/external_imported/vcpkg/versions/r-/rtmidi.json index ebda6dd64..ec95ea91a 100644 --- a/external_imported/vcpkg/versions/r-/rtmidi.json +++ b/external_imported/vcpkg/versions/r-/rtmidi.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "70873823ce910dcf80078a94f12191371523d84c", + "version": "5.0.0", + "port-version": 2 + }, + { + "git-tree": "30614a92baff91c2d2790029179dbb37122ca331", + "version": "5.0.0", + "port-version": 1 + }, + { + "git-tree": "4eb19141251ff7759838e0ab10f35876583d367b", + "version-semver": "5.0.0", + "port-version": 0 + }, + { + "git-tree": "1d922425c684e2dd87ea1691b2ac8f1c0fd808e4", + "version-semver": "4.0.0", + "port-version": 5 + }, { "git-tree": "9d72ff2345f2c1b08f4808cedaa0caf87156d295", "version-semver": "4.0.0", diff --git a/external_imported/vcpkg/versions/r-/rttr.json b/external_imported/vcpkg/versions/r-/rttr.json index ca08fdf0b..a3dccce79 100644 --- a/external_imported/vcpkg/versions/r-/rttr.json +++ b/external_imported/vcpkg/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14ae0cb613a9536333e7463b862276ad0e2e89ee", + "version": "0.9.6", + "port-version": 4 + }, { "git-tree": "ce9e17ebafad158458c38697b246601e00b61ae8", "version-string": "0.9.6", diff --git a/external_imported/vcpkg/versions/r-/rubberband.json b/external_imported/vcpkg/versions/r-/rubberband.json new file mode 100644 index 000000000..378a1dfe3 --- /dev/null +++ b/external_imported/vcpkg/versions/r-/rubberband.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "75aeab834246d0e2ba7de5f07901e5d7131397f7", + "version": "2.0.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/r-/rxcpp.json b/external_imported/vcpkg/versions/r-/rxcpp.json index d545b8340..53ed12b1e 100644 --- a/external_imported/vcpkg/versions/r-/rxcpp.json +++ b/external_imported/vcpkg/versions/r-/rxcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92ae6c5ff3c5a9f81dda630c0b6cc4e69766ee61", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "69044b3fc33b35dab3f62471daf96a2a2b27dc0a", "version-string": "4.1.0", diff --git a/external_imported/vcpkg/versions/r-/rxspencer.json b/external_imported/vcpkg/versions/r-/rxspencer.json index 1d4df6e4b..66d8180da 100644 --- a/external_imported/vcpkg/versions/r-/rxspencer.json +++ b/external_imported/vcpkg/versions/r-/rxspencer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "423d711ba8013c78f3ca4931bf2d6c8a5ecc8ba0", + "version": "3.9.0", + "port-version": 2 + }, { "git-tree": "d0db813c47fd33b7e6f5ffb95790b66aafcaa53e", "version": "3.9.0", diff --git a/external_imported/vcpkg/versions/r-/ryml.json b/external_imported/vcpkg/versions/r-/ryml.json index 13c188a17..8c7cd857f 100644 --- a/external_imported/vcpkg/versions/r-/ryml.json +++ b/external_imported/vcpkg/versions/r-/ryml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d8fb44c056a4bea4e4ba19d34cf26a320eb2599", + "version": "0.4.1", + "port-version": 0 + }, { "git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e", "version-date": "2021-07-24", diff --git a/external_imported/vcpkg/versions/s-/sail.json b/external_imported/vcpkg/versions/s-/sail.json index 7ee6592ba..1ed673596 100644 --- a/external_imported/vcpkg/versions/s-/sail.json +++ b/external_imported/vcpkg/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a3beda67ffe57e68f882d59f7f5c33bf726f2c8", + "version-semver": "0.9.0-rc1", + "port-version": 0 + }, { "git-tree": "5604acc45bd6e7fc2123a52f3742ffa674a0c2f7", "version-semver": "0.9.0-pre21", diff --git a/external_imported/vcpkg/versions/s-/saucer.json b/external_imported/vcpkg/versions/s-/saucer.json new file mode 100644 index 000000000..4957071ec --- /dev/null +++ b/external_imported/vcpkg/versions/s-/saucer.json @@ -0,0 +1,24 @@ +{ + "versions": [ + { + "git-tree": "ce7e88eac61c5e370dbf6d5dc7ad56dbdded879d", + "version": "1.0.1", + "port-version": 2 + }, + { + "git-tree": "3738770dd615f4e229cc0bf1e6704d3c0e9e001a", + "version": "1.0.1", + "port-version": 1 + }, + { + "git-tree": "66e466405fa3632e2b1539329a3ce71a65db5598", + "version": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "3c2191312af1f74d46d991b955b6c7071dba82d2", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/sciplot.json b/external_imported/vcpkg/versions/s-/sciplot.json index ff250aea1..68f4f46e2 100644 --- a/external_imported/vcpkg/versions/s-/sciplot.json +++ b/external_imported/vcpkg/versions/s-/sciplot.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4069ab412d4fc194df6d704213a41b1faa310ab7", + "version": "0.3.1", + "port-version": 1 + }, + { + "git-tree": "aac1c6064d43d5166bfe8bb2f65864fb9261c417", + "version": "0.3.1", + "port-version": 0 + }, + { + "git-tree": "e28065774395839bda6f9bc898b6214141fcb746", + "version": "0.2.2", + "port-version": 1 + }, { "git-tree": "6d01187d3c940b9bf5b3f35902469959fe640a6c", "version": "0.2.2", diff --git a/external_imported/vcpkg/versions/s-/sdformat9.json b/external_imported/vcpkg/versions/s-/sdformat9.json index 547317e56..a4b2c78df 100644 --- a/external_imported/vcpkg/versions/s-/sdformat9.json +++ b/external_imported/vcpkg/versions/s-/sdformat9.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "32a06104ef8500390db26865dbc6f887de83f1ee", + "version": "9.8.0", + "port-version": 0 + }, + { + "git-tree": "0a599309f16afe5d3163ec1eb131eed575880ae4", + "version": "9.4.0", + "port-version": 6 + }, { "git-tree": "d050d624faf72f8dcb62fdb7a5378ae5d8e8b5d8", "version": "9.4.0", diff --git a/external_imported/vcpkg/versions/s-/sdl1.json b/external_imported/vcpkg/versions/s-/sdl1.json index eaa05de79..65c464975 100644 --- a/external_imported/vcpkg/versions/s-/sdl1.json +++ b/external_imported/vcpkg/versions/s-/sdl1.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "45b686784ad1b01e7cfa7988bc3f95bf9aff6b6a", + "version": "1.2.15", + "port-version": 17 + }, + { + "git-tree": "5ffe0bac6645cd0fe0c98a0c33cf86a6bc2ddcfc", + "version": "1.2.15", + "port-version": 16 + }, { "git-tree": "4a3aba1bba75ee6d613144dbd6b2c64cbe6a090c", "version": "1.2.15", diff --git a/external_imported/vcpkg/versions/s-/sdl2-image.json b/external_imported/vcpkg/versions/s-/sdl2-image.json index 9e0ed9100..67d171b01 100644 --- a/external_imported/vcpkg/versions/s-/sdl2-image.json +++ b/external_imported/vcpkg/versions/s-/sdl2-image.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4890f12d4639bf57d7eac19097b5903c06574184", + "version": "2.0.5", + "port-version": 7 + }, + { + "git-tree": "e1ed993b97bc76d5a8abdf4e9e8e148903078a70", + "version": "2.0.5", + "port-version": 6 + }, + { + "git-tree": "623548e8c929f2160320bf9644e2cd5a75d4a608", + "version": "2.0.5", + "port-version": 5 + }, { "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34", "version-string": "2.0.5", diff --git a/external_imported/vcpkg/versions/s-/sdl2-mixer.json b/external_imported/vcpkg/versions/s-/sdl2-mixer.json index dc799edf6..9651f7b61 100644 --- a/external_imported/vcpkg/versions/s-/sdl2-mixer.json +++ b/external_imported/vcpkg/versions/s-/sdl2-mixer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c06711b92dfd4c048f6a56c0236697012094a6e5", + "version": "2.6.1", + "port-version": 1 + }, + { + "git-tree": "7e802cb751276e60dc8046e2b6219dd9dae4c13a", + "version": "2.6.1", + "port-version": 0 + }, { "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa", "version": "2.0.4", diff --git a/external_imported/vcpkg/versions/s-/sdl2-ttf.json b/external_imported/vcpkg/versions/s-/sdl2-ttf.json index 65d49c1b0..632a3278b 100644 --- a/external_imported/vcpkg/versions/s-/sdl2-ttf.json +++ b/external_imported/vcpkg/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85feef1fd925955c314616f7dbb934a401b4a9d1", + "version": "2.20.0", + "port-version": 0 + }, { "git-tree": "cefc95479a9fa2c8a8c4f5539952978f77e3de99", "version-string": "2.0.15", diff --git a/external_imported/vcpkg/versions/s-/sdl2.json b/external_imported/vcpkg/versions/s-/sdl2.json index 16b746b1f..f47842658 100644 --- a/external_imported/vcpkg/versions/s-/sdl2.json +++ b/external_imported/vcpkg/versions/s-/sdl2.json @@ -1,5 +1,40 @@ { "versions": [ + { + "git-tree": "dbd3f6b2c738602adc3b3aa7c314212bff79b620", + "version": "2.24.0", + "port-version": 0 + }, + { + "git-tree": "69c64474577715f87366d9374b0483256f305f1e", + "version": "2.0.22", + "port-version": 3 + }, + { + "git-tree": "c14a0021322c01cb256a4a54ea48a9ddf8023622", + "version": "2.0.22", + "port-version": 2 + }, + { + "git-tree": "879012d1bbd3ae67fc697109eedbe6ff713c2c34", + "version": "2.0.22", + "port-version": 1 + }, + { + "git-tree": "6d875fe2feac0480f61fcf890136e045c12429f1", + "version": "2.0.22", + "port-version": 0 + }, + { + "git-tree": "24fc8b7ae34a3a363c76820d4ca50f715648a0b2", + "version": "2.0.20", + "port-version": 3 + }, + { + "git-tree": "abf71c19917402dddef261e80d55c8ec04e9bf54", + "version": "2.0.20", + "port-version": 2 + }, { "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", "version": "2.0.20", diff --git a/external_imported/vcpkg/versions/s-/sdl2pp.json b/external_imported/vcpkg/versions/s-/sdl2pp.json index f009fb9ac..c759c94bf 100644 --- a/external_imported/vcpkg/versions/s-/sdl2pp.json +++ b/external_imported/vcpkg/versions/s-/sdl2pp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "89665ed749a05bebacf76088e7781d0f1ef4c06a", + "version": "0.16.1", + "port-version": 5 + }, + { + "git-tree": "0d0efed99dd39ca3bbf35b1b601b7aec4a82b55b", + "version": "0.16.1", + "port-version": 4 + }, + { + "git-tree": "d5730ae91038160f97ba206548f86d3fbda63d7c", + "version": "0.16.1", + "port-version": 3 + }, { "git-tree": "99074ba7a6f080e0b9c74dde8254875c95c7d9ea", "version": "0.16.1", diff --git a/external_imported/vcpkg/versions/s-/seal.json b/external_imported/vcpkg/versions/s-/seal.json index 5fd1786ea..c7ea11730 100644 --- a/external_imported/vcpkg/versions/s-/seal.json +++ b/external_imported/vcpkg/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "323502a09f055a964f6b501aed82701570b96cba", + "version-semver": "3.7.2", + "port-version": 3 + }, { "git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a", "version-semver": "3.7.2", diff --git a/external_imported/vcpkg/versions/s-/secp256k1.json b/external_imported/vcpkg/versions/s-/secp256k1.json index f6b28c37d..0d095d4f5 100644 --- a/external_imported/vcpkg/versions/s-/secp256k1.json +++ b/external_imported/vcpkg/versions/s-/secp256k1.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "deb0a4b2cf9d3e5a0d4c3c8475a6851b7345d39d", + "version-date": "2022-07-11", + "port-version": 1 + }, + { + "git-tree": "31de2b5d2286595ff7771a30dee3c68d04e78082", + "version-date": "2022-07-11", + "port-version": 0 + }, { "git-tree": "a0ba39af9284d60d41166c4f546975e9f2b2d9df", "version-string": "2017-19-10", diff --git a/external_imported/vcpkg/versions/s-/sentry-native.json b/external_imported/vcpkg/versions/s-/sentry-native.json index 20d816302..ba5042172 100644 --- a/external_imported/vcpkg/versions/s-/sentry-native.json +++ b/external_imported/vcpkg/versions/s-/sentry-native.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "731787acd156ff3881f9ee1cc7c17d70bc1a8ce0", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "2d63a9c2ec32267974a30485bf6f64ca57f1a2f8", + "version": "0.4.18", + "port-version": 0 + }, + { + "git-tree": "2d6b1817e6134faaf9a3f85d1719c925dd15a3a9", + "version": "0.4.17", + "port-version": 0 + }, { "git-tree": "3dff7be1b47155d1580f43be48d8b95761251883", "version-semver": "0.4.15", diff --git a/external_imported/vcpkg/versions/s-/septag-dmon.json b/external_imported/vcpkg/versions/s-/septag-dmon.json new file mode 100644 index 000000000..ed29d1fd1 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/septag-dmon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "377b8711ab595b704c7beb3dd9972b7bb6d75c62", + "version-date": "2022-02-08", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/sfgui.json b/external_imported/vcpkg/versions/s-/sfgui.json index 979801a72..639b8bc94 100644 --- a/external_imported/vcpkg/versions/s-/sfgui.json +++ b/external_imported/vcpkg/versions/s-/sfgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50f11f13413cb93d73d44bd0c00787363a00c98c", + "version": "0.4.0", + "port-version": 5 + }, { "git-tree": "64f6f7ee9963a096a2b4260c55be6228a22846e5", "version-string": "0.4.0", diff --git a/external_imported/vcpkg/versions/s-/sfml.json b/external_imported/vcpkg/versions/s-/sfml.json index d9360682b..dc814d0bf 100644 --- a/external_imported/vcpkg/versions/s-/sfml.json +++ b/external_imported/vcpkg/versions/s-/sfml.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "8ab010b7ce899203149c75197c19380506984683", + "version": "2.5.1", + "port-version": 14 + }, + { + "git-tree": "ca14334e4fdf097424958412912356dc2c186b9d", + "version": "2.5.1", + "port-version": 13 + }, { "git-tree": "bc9b03c639a91f2deff1fb78ab943cce64876ffe", "version": "2.5.1", diff --git a/external_imported/vcpkg/versions/s-/shaderc.json b/external_imported/vcpkg/versions/s-/shaderc.json index 840e9fe99..768c33960 100644 --- a/external_imported/vcpkg/versions/s-/shaderc.json +++ b/external_imported/vcpkg/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d93e78fd464f2f378c8faf94e40e16410e1c41e0", + "version": "2021.1", + "port-version": 3 + }, { "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", "version": "2021.1", diff --git a/external_imported/vcpkg/versions/s-/shaderwriter.json b/external_imported/vcpkg/versions/s-/shaderwriter.json index 1e295e8e7..8ad430dec 100644 --- a/external_imported/vcpkg/versions/s-/shaderwriter.json +++ b/external_imported/vcpkg/versions/s-/shaderwriter.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d38b73de38449904ef8e9803b632e08bb86a6a88", + "version": "2.4.0", + "port-version": 0 + }, + { + "git-tree": "a5b9552631eef5dc2f4fc3bb2056730dc164981c", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "09802faaae65b3f6ac6adfe5687bf581f0189dba", "version": "2.2.0", diff --git a/external_imported/vcpkg/versions/s-/shiftmedia-libgcrypt.json b/external_imported/vcpkg/versions/s-/shiftmedia-libgcrypt.json new file mode 100644 index 000000000..f0f6d053b --- /dev/null +++ b/external_imported/vcpkg/versions/s-/shiftmedia-libgcrypt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f69b9722e8207f50879ed85697253223eb014a9c", + "version": "1.10.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json b/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json new file mode 100644 index 000000000..82eeb9204 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/shiftmedia-libgnutls.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c204a889320c521ef348d1108a3f665be0bbe07a", + "version": "3.7.6", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/simage.json b/external_imported/vcpkg/versions/s-/simage.json index 6f298cfd7..1bbd0a518 100644 --- a/external_imported/vcpkg/versions/s-/simage.json +++ b/external_imported/vcpkg/versions/s-/simage.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d877e927cdad3e67542b5c66c26bdc0bda9f5ade", + "version-semver": "1.8.2", + "port-version": 1 + }, + { + "git-tree": "9a3815e60349ce152d08a7f02abab301e3b6bceb", + "version-semver": "1.8.2", + "port-version": 0 + }, { "git-tree": "6c2ccc36f5c1ebb27f820fe4f6e89df014e4bafa", "version-semver": "1.8.1", diff --git a/external_imported/vcpkg/versions/s-/simbody.json b/external_imported/vcpkg/versions/s-/simbody.json index d3c76f8e0..df589c447 100644 --- a/external_imported/vcpkg/versions/s-/simbody.json +++ b/external_imported/vcpkg/versions/s-/simbody.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "077f05087ad6704e1febb44e27273550028c5729", + "version-date": "2022-01-04", + "port-version": 2 + }, { "git-tree": "09ced08b16274ddf38f64031b659a76b8aea2e85", "version-date": "2022-01-04", diff --git a/external_imported/vcpkg/versions/s-/simdjson.json b/external_imported/vcpkg/versions/s-/simdjson.json index afbd92eda..99a811342 100644 --- a/external_imported/vcpkg/versions/s-/simdjson.json +++ b/external_imported/vcpkg/versions/s-/simdjson.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5c24527f443a4881e16cb242e4b323904c0318d4", + "version-semver": "2.2.2", + "port-version": 0 + }, + { + "git-tree": "2bc3bd74a2cb0719ba123f23538e9e974f88c320", + "version-semver": "2.2.0", + "port-version": 0 + }, + { + "git-tree": "18a23d4f86c9f4d0db8feb5bb7eeb32ebcc3a3f2", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "0e7df8e0a4eb94c9825ee054fa91c7222568749f", "version-semver": "1.0.2", diff --git a/external_imported/vcpkg/versions/s-/skia.json b/external_imported/vcpkg/versions/s-/skia.json index 168d625e7..759ae504a 100644 --- a/external_imported/vcpkg/versions/s-/skia.json +++ b/external_imported/vcpkg/versions/s-/skia.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "960a3abb9c3b4736a73b06e65a47123798bf29f9", + "version": "0.36.0", + "port-version": 0 + }, + { + "git-tree": "99590977282f5689ae6f9d6e6f6b13fc8cbfd625", + "version-date": "2022-04-15", + "port-version": 1 + }, + { + "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", + "version-date": "2022-04-15", + "port-version": 0 + }, + { + "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", + "version-date": "2020-05-18", + "port-version": 9 + }, { "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", "version-date": "2020-05-18", diff --git a/external_imported/vcpkg/versions/s-/sleepy-discord.json b/external_imported/vcpkg/versions/s-/sleepy-discord.json index 1105f0b27..78559640b 100644 --- a/external_imported/vcpkg/versions/s-/sleepy-discord.json +++ b/external_imported/vcpkg/versions/s-/sleepy-discord.json @@ -14,11 +14,6 @@ "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", "version-date": "2021-07-07", "port-version": 0 - }, - { - "git-tree": "0d9d62b7213333d04c90878bb1e6573ad3f5316f", - "version-date": "2021-05-02", - "port-version": 0 } ] } diff --git a/external_imported/vcpkg/versions/s-/snappy.json b/external_imported/vcpkg/versions/s-/snappy.json index 5e6b9bad1..cd35443c6 100644 --- a/external_imported/vcpkg/versions/s-/snappy.json +++ b/external_imported/vcpkg/versions/s-/snappy.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "00bd59377f162448da6b19382a7ca392b1761f22", + "version": "1.1.9", + "port-version": 3 + }, + { + "git-tree": "7122115f0f35f7f90f7a7adc1d15a4b6f7af5315", + "version": "1.1.9", + "port-version": 2 + }, { "git-tree": "c92c17d378451a07e9cc974fa31893d1cae61b66", "version": "1.1.9", diff --git a/external_imported/vcpkg/versions/s-/so5extra.json b/external_imported/vcpkg/versions/s-/so5extra.json index 5f0124506..f9490aa71 100644 --- a/external_imported/vcpkg/versions/s-/so5extra.json +++ b/external_imported/vcpkg/versions/s-/so5extra.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "37cb69203bc26a671b5b9ccaa0dc6c486c35ddb4", + "version": "1.5.2", + "port-version": 0 + }, + { + "git-tree": "66d53f9403902601af81144cfe017b3576617643", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "a25bef02c9cea8f01ec3066d423b4f4ca6615959", "version": "1.5.0", diff --git a/external_imported/vcpkg/versions/s-/sobjectizer.json b/external_imported/vcpkg/versions/s-/sobjectizer.json index 9edb247a2..246303007 100644 --- a/external_imported/vcpkg/versions/s-/sobjectizer.json +++ b/external_imported/vcpkg/versions/s-/sobjectizer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a77d86943e98697db670f9ee10fd24e8d19f08ce", + "version": "5.7.4.2", + "port-version": 0 + }, + { + "git-tree": "0434420bf7122407a1efe2ae663f5d09d70ce775", + "version": "5.7.4", + "port-version": 0 + }, { "git-tree": "6d0c49d93ac92669376ad08293de921d9e36352e", "version": "5.7.3", diff --git a/external_imported/vcpkg/versions/s-/socket-io-client.json b/external_imported/vcpkg/versions/s-/socket-io-client.json index b809e765a..fd92a4d62 100644 --- a/external_imported/vcpkg/versions/s-/socket-io-client.json +++ b/external_imported/vcpkg/versions/s-/socket-io-client.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f4f6bebb98623c2bf8602d7538ae4c1d7de6c0ad", + "version-date": "2022-08-19", + "port-version": 0 + }, + { + "git-tree": "f31e0afc883eef287abf9b7914563cd10b331b86", + "version": "3.1.0", + "port-version": 1 + }, { "git-tree": "3844cb4dc084c2fe9ddd4a15a77d0c06e391c744", "version": "3.1.0", diff --git a/external_imported/vcpkg/versions/s-/sockpp.json b/external_imported/vcpkg/versions/s-/sockpp.json index d54217a9c..792eb3f5d 100644 --- a/external_imported/vcpkg/versions/s-/sockpp.json +++ b/external_imported/vcpkg/versions/s-/sockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608151660b414b2bbcdec35bdd622fdce5620abb", + "version": "0.7.1", + "port-version": 1 + }, { "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917", "version": "0.7.1", diff --git a/external_imported/vcpkg/versions/s-/soil2.json b/external_imported/vcpkg/versions/s-/soil2.json index 849a933db..187420ec9 100644 --- a/external_imported/vcpkg/versions/s-/soil2.json +++ b/external_imported/vcpkg/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287", "version-date": "2021-05-01", diff --git a/external_imported/vcpkg/versions/s-/sol2.json b/external_imported/vcpkg/versions/s-/sol2.json index 1aa7ab94a..b84e76483 100644 --- a/external_imported/vcpkg/versions/s-/sol2.json +++ b/external_imported/vcpkg/versions/s-/sol2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "115cb8217bb876cfb71fadec889faa25954db8b1", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "fca1a728c9f2ff6db12a00fafeae82f69a903b48", "version-string": "3.2.2", diff --git a/external_imported/vcpkg/versions/s-/solid3.json b/external_imported/vcpkg/versions/s-/solid3.json index 5f64fce64..6ef8f4382 100644 --- a/external_imported/vcpkg/versions/s-/solid3.json +++ b/external_imported/vcpkg/versions/s-/solid3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d02f4f19962318fca6af9450781fcd281af86652", + "version": "3.5.8", + "port-version": 2 + }, { "git-tree": "1f494d1d6f610d9c26444a12f2b9952f7485601d", "version-string": "3.5.8", diff --git a/external_imported/vcpkg/versions/s-/soxr.json b/external_imported/vcpkg/versions/s-/soxr.json index 5f0f63d39..84790c0df 100644 --- a/external_imported/vcpkg/versions/s-/soxr.json +++ b/external_imported/vcpkg/versions/s-/soxr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eaa72e750312e0bacbd2a02e1a16fcc680489dd", + "version": "0.1.3", + "port-version": 7 + }, { "git-tree": "fca92eeca8f38c1662193dd443e401c5fe7fbfc7", "version": "0.1.3", diff --git a/external_imported/vcpkg/versions/s-/spdk-isal.json b/external_imported/vcpkg/versions/s-/spdk-isal.json index 7439aac29..585b96374 100644 --- a/external_imported/vcpkg/versions/s-/spdk-isal.json +++ b/external_imported/vcpkg/versions/s-/spdk-isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41bee637d2dbd80179b39bb1c5b84ec1afce7304", + "version-date": "2018-10-06", + "port-version": 3 + }, { "git-tree": "de270891534b1e4332e4cfbd67437653a9217823", "version-string": "20181006", diff --git a/external_imported/vcpkg/versions/s-/spdlog.json b/external_imported/vcpkg/versions/s-/spdlog.json old mode 100644 new mode 100755 index 7f9464fa0..4c363c1fb --- a/external_imported/vcpkg/versions/s-/spdlog.json +++ b/external_imported/vcpkg/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3256ea88cc375fda2f977a2eb18435e23d498572", + "version-semver": "1.10.0", + "port-version": 1 + }, { "git-tree": "1ac795913d88241171b45d796d3fe5dd38519d5a", "version-semver": "1.10.0", diff --git a/external_imported/vcpkg/versions/s-/spectra.json b/external_imported/vcpkg/versions/s-/spectra.json index 93fa47676..191ee1f5e 100644 --- a/external_imported/vcpkg/versions/s-/spectra.json +++ b/external_imported/vcpkg/versions/s-/spectra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f0c59842a36bd2be452ce3b9f1f7de0a17f01aa", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "1ba33cde480488a9a7d4f98f6f2f26e591feb019", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/s-/speex.json b/external_imported/vcpkg/versions/s-/speex.json index 87a027137..0b5a6a462 100644 --- a/external_imported/vcpkg/versions/s-/speex.json +++ b/external_imported/vcpkg/versions/s-/speex.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "83710ad0fb1dfab0d1de32a44d440abca53f1f6e", + "version": "1.2.1", + "port-version": 1 + }, + { + "git-tree": "0520509fd60e20c5362959a7549dd29f7d04d54b", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "7cbe163c0a5fabd08cb6665c092d6b13dfa51d69", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/s-/speexdsp.json b/external_imported/vcpkg/versions/s-/speexdsp.json index c97f95cd7..a598b990f 100644 --- a/external_imported/vcpkg/versions/s-/speexdsp.json +++ b/external_imported/vcpkg/versions/s-/speexdsp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d3a05d75970beec385a36ceb592f9f9e928d62f", + "version": "1.2.1", + "port-version": 0 + }, + { + "git-tree": "602238d14eef169fff22244c05d364c55177bdbc", + "version": "1.2.0", + "port-version": 8 + }, { "git-tree": "6606b66ecc502c89de6a1e570c1407bf1f8b2d03", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/s-/spirv-headers.json b/external_imported/vcpkg/versions/s-/spirv-headers.json index 99267955d..db313aa0a 100644 --- a/external_imported/vcpkg/versions/s-/spirv-headers.json +++ b/external_imported/vcpkg/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b17fe28f5ada58a1a3e1435c20d59410b82e501", + "version": "1.3.216.0", + "port-version": 0 + }, { "git-tree": "2b51afa759a0312e325533a909418ed5b7803cda", "version": "1.3.204.1", diff --git a/external_imported/vcpkg/versions/s-/spirv-tools.json b/external_imported/vcpkg/versions/s-/spirv-tools.json index 7d6a5510b..79ee76f33 100644 --- a/external_imported/vcpkg/versions/s-/spirv-tools.json +++ b/external_imported/vcpkg/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "337e34849b8c1c574890350394069279f1a0ccad", + "version": "2022.2", + "port-version": 0 + }, { "git-tree": "459985359177e0c0774ac341db9721650499844b", "version": "2022.1", diff --git a/external_imported/vcpkg/versions/s-/spix.json b/external_imported/vcpkg/versions/s-/spix.json index a3ab08a13..926c75f68 100644 --- a/external_imported/vcpkg/versions/s-/spix.json +++ b/external_imported/vcpkg/versions/s-/spix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d26875159ee21430be1cff1f64ebe8dacdcbf7b", + "version": "0.4", + "port-version": 0 + }, { "git-tree": "703bc0f66a7cb23368f4230a35451356b92e5c75", "version": "0.3", diff --git a/external_imported/vcpkg/versions/s-/sqlcipher.json b/external_imported/vcpkg/versions/s-/sqlcipher.json index 391a0ed1d..44b5caf0e 100644 --- a/external_imported/vcpkg/versions/s-/sqlcipher.json +++ b/external_imported/vcpkg/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c606b11bcc5de6e0a93cde32b9c876539d6df4", + "version": "4.5.2", + "port-version": 0 + }, { "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", "version": "4.5.1", diff --git a/external_imported/vcpkg/versions/s-/sqlite3.json b/external_imported/vcpkg/versions/s-/sqlite3.json index 419fec4f3..342a37d26 100644 --- a/external_imported/vcpkg/versions/s-/sqlite3.json +++ b/external_imported/vcpkg/versions/s-/sqlite3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b673cfda60055677c42fe66cdd0655ad4a1110dd", + "version": "3.39.2", + "port-version": 0 + }, + { + "git-tree": "ccab102efea1120dc2140b4c0519676a65c055b6", + "version": "3.39.1", + "port-version": 0 + }, + { + "git-tree": "8b96d4235bae7daf0cf3f65f66f9c28f9290628a", + "version": "3.37.2", + "port-version": 2 + }, { "git-tree": "f49ad405225c6326558adb79f2082814002a8cda", "version": "3.37.2", diff --git a/external_imported/vcpkg/versions/s-/sqlitecpp.json b/external_imported/vcpkg/versions/s-/sqlitecpp.json index 8ad9ced31..7bddf2ede 100644 --- a/external_imported/vcpkg/versions/s-/sqlitecpp.json +++ b/external_imported/vcpkg/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b16a053ff6df932be1e7b02ad0b34dff2a03cf5", + "version-string": "3.1.1", + "port-version": 2 + }, { "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", "version-string": "3.1.1", diff --git a/external_imported/vcpkg/versions/s-/sqlpp11-connector-mysql.json b/external_imported/vcpkg/versions/s-/sqlpp11-connector-mysql.json index 5ecd3b6d4..4d0489c5e 100644 --- a/external_imported/vcpkg/versions/s-/sqlpp11-connector-mysql.json +++ b/external_imported/vcpkg/versions/s-/sqlpp11-connector-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e15caf6d82c3e2b8ad27294a18ea745d7713b28", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "be46edaef7e1c02783398222e4e73f288848e537", "version-string": "0.29", diff --git a/external_imported/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json b/external_imported/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json index ca49980d3..6daff1e52 100644 --- a/external_imported/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json +++ b/external_imported/vcpkg/versions/s-/sqlpp11-connector-sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2465fd92079797d39eddc691a6938933e0b6624", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "476b94c2a6be8d48ef3360793ed0b4569b4614d4", "version-string": "0.30", diff --git a/external_imported/vcpkg/versions/s-/sqlpp11.json b/external_imported/vcpkg/versions/s-/sqlpp11.json index ee0e440c8..e86af3eac 100644 --- a/external_imported/vcpkg/versions/s-/sqlpp11.json +++ b/external_imported/vcpkg/versions/s-/sqlpp11.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d7384489fec593161753c46383d26f666a751847", + "version": "0.61", + "port-version": 1 + }, + { + "git-tree": "0013607524d7c0803705193bbf09b1254fab14ff", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "572562b44cd15b26fd8cdf68dff2c53d6ec0619d", "version-string": "0.60", diff --git a/external_imported/vcpkg/versions/s-/srell.json b/external_imported/vcpkg/versions/s-/srell.json index 7f8cafc29..3ae37e418 100644 --- a/external_imported/vcpkg/versions/s-/srell.json +++ b/external_imported/vcpkg/versions/s-/srell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f09d9751be1fbf4ca223d8755ef6fb7acedde1fa", + "version-string": "3.010", + "port-version": 0 + }, { "git-tree": "b687fe2dff873db6884f3eacb1b756579bee8e0e", "version-string": "3.001", diff --git a/external_imported/vcpkg/versions/s-/status-code.json b/external_imported/vcpkg/versions/s-/status-code.json index ab25f04dc..dc729bc92 100644 --- a/external_imported/vcpkg/versions/s-/status-code.json +++ b/external_imported/vcpkg/versions/s-/status-code.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b6862c7199dafad1c85c5fabb09a4842c3fa1fa3", + "version-date": "2022-09-08", + "port-version": 0 + }, + { + "git-tree": "acf45fde7be9ba87dd72d79d3d8f79bc639e8530", + "version-string": "1.0.0-20220104", + "port-version": 0 + }, { "git-tree": "c71af3efa61ec9c5bbb91287b610bcc561e95a47", "version-string": "1.0.0-20211208", diff --git a/external_imported/vcpkg/versions/s-/stb.json b/external_imported/vcpkg/versions/s-/stb.json index 750f114e6..390edd8c2 100644 --- a/external_imported/vcpkg/versions/s-/stb.json +++ b/external_imported/vcpkg/versions/s-/stb.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "9ebadca0be90431f35a8d20b44f40b07285eb33d", + "version-date": "2021-09-10", + "port-version": 1 + }, + { + "git-tree": "2da639ecba7048e0f722dc01fae6cef32d671991", + "version-date": "2021-09-10", + "port-version": 0 + }, + { + "git-tree": "41ce7d73e93526a943f08e5e4601c6b2325ba527", + "version": "2020-09-14", + "port-version": 2 + }, { "git-tree": "fa6d7e998f98f122efa37f456ffa498d546185b9", "version-string": "2020-09-14", diff --git a/external_imported/vcpkg/versions/s-/stduuid.json b/external_imported/vcpkg/versions/s-/stduuid.json new file mode 100644 index 000000000..c89c5a626 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/stduuid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd235773c953e5636a7b9f6356437daef6e5010c", + "version": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/stftpitchshift.json b/external_imported/vcpkg/versions/s-/stftpitchshift.json new file mode 100644 index 000000000..1ebb0bc55 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/stftpitchshift.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "36932b4bd7c57fdc63ae75ec5117f6321e3c2ca6", + "version": "1.4.1", + "port-version": 0 + }, + { + "git-tree": "1f4a495416b6e2e3a830c8ba72eb5cf9034c68cc", + "version": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/string-theory.json b/external_imported/vcpkg/versions/s-/string-theory.json index c10d12089..6408f4135 100644 --- a/external_imported/vcpkg/versions/s-/string-theory.json +++ b/external_imported/vcpkg/versions/s-/string-theory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3c6df91d194be6ca56d8f4044cf0137041d4f04", + "version": "3.6", + "port-version": 0 + }, { "git-tree": "6c02a14bfc014ccb0e31c944aac072ed64eb1136", "version": "3.5", diff --git a/external_imported/vcpkg/versions/s-/stronk.json b/external_imported/vcpkg/versions/s-/stronk.json new file mode 100644 index 000000000..c2b72f7a7 --- /dev/null +++ b/external_imported/vcpkg/versions/s-/stronk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e4a44d9b4174532927a658b7762122b06ad2f663", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/s-/stxxl.json b/external_imported/vcpkg/versions/s-/stxxl.json index 25fcc439f..2ad709587 100644 --- a/external_imported/vcpkg/versions/s-/stxxl.json +++ b/external_imported/vcpkg/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "769f42922523b172d890b697a65096ca47e06ff8", + "version-date": "2018-11-15", + "port-version": 5 + }, { "git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a", "version-string": "2018-11-15", diff --git a/external_imported/vcpkg/versions/s-/sundials.json b/external_imported/vcpkg/versions/s-/sundials.json index f9d1be6be..48ada8c7e 100644 --- a/external_imported/vcpkg/versions/s-/sundials.json +++ b/external_imported/vcpkg/versions/s-/sundials.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c95957f06e56f03fb6336a30a984ff7273a36c5a", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "206df7509167e6e89bdac2e9252e9e57615e18a4", "version-semver": "5.8.0", diff --git a/external_imported/vcpkg/versions/s-/superlu.json b/external_imported/vcpkg/versions/s-/superlu.json index c048cc9ae..05a897d68 100644 --- a/external_imported/vcpkg/versions/s-/superlu.json +++ b/external_imported/vcpkg/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b8a53560265803d6b0b5b284b88abf0ae48650d", + "version-date": "2020-01-07", + "port-version": 6 + }, { "git-tree": "5bee1e0197c0e768c6ee8b9acdf815b4d46b5978", "version-date": "2020-01-07", diff --git a/external_imported/vcpkg/versions/s-/symengine.json b/external_imported/vcpkg/versions/s-/symengine.json index 5006516fc..3ac8fdb54 100644 --- a/external_imported/vcpkg/versions/s-/symengine.json +++ b/external_imported/vcpkg/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd28d6549b4c7db81ef2ee9e91a4e41b0c739191", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "b0ac6670bebc9a0903adaae9b35f9f444c4e8806", "version": "0.7.0", diff --git a/external_imported/vcpkg/versions/s-/szip.json b/external_imported/vcpkg/versions/s-/szip.json index 83945853f..3cd779910 100644 --- a/external_imported/vcpkg/versions/s-/szip.json +++ b/external_imported/vcpkg/versions/s-/szip.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f07c4350652c50e80bc78edb3db20a1c748d99ec", + "version": "2.1.1", + "port-version": 9 + }, + { + "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828", + "version": "2.1.1", + "port-version": 8 + }, { "git-tree": "6f810fcedf9469940a80e5c343d983a55134332b", "version": "2.1.1", diff --git a/external_imported/vcpkg/versions/t-/taglib.json b/external_imported/vcpkg/versions/t-/taglib.json index 4c35acb64..74616d0a2 100644 --- a/external_imported/vcpkg/versions/t-/taglib.json +++ b/external_imported/vcpkg/versions/t-/taglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68a57ea8641a01a2a1c353f91acb5a3020c0769b", + "version-semver": "1.12.0", + "port-version": 3 + }, { "git-tree": "246255cab48b434b3c78aaa315f5f62b4692f255", "version-semver": "1.12.0", diff --git a/external_imported/vcpkg/versions/t-/taskflow.json b/external_imported/vcpkg/versions/t-/taskflow.json index 7bfe3dd2b..4391da709 100644 --- a/external_imported/vcpkg/versions/t-/taskflow.json +++ b/external_imported/vcpkg/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b736d1ff659f4dd121b9af15b27ca659770ec9f4", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "68130a893501e5e9bbe48c41ad00ef5de0a0a060", "version": "3.3.0", diff --git a/external_imported/vcpkg/versions/t-/tbb.json b/external_imported/vcpkg/versions/t-/tbb.json index bc96b9383..c18242ed4 100644 --- a/external_imported/vcpkg/versions/t-/tbb.json +++ b/external_imported/vcpkg/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2d94c971f648a21fa3068485c590b70bfa8b716", + "version": "2021.5.0", + "port-version": 0 + }, { "git-tree": "016aeb70aa2dfba55a141a928863a0191314d4a9", "version-string": "2020_U3", diff --git a/external_imported/vcpkg/versions/t-/tclap.json b/external_imported/vcpkg/versions/t-/tclap.json index b9991c21b..c440ca2bc 100644 --- a/external_imported/vcpkg/versions/t-/tclap.json +++ b/external_imported/vcpkg/versions/t-/tclap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f02ffdbe328a2df58a554ba83269ec09bd47a6ad", + "version": "1.2.5", + "port-version": 0 + }, { "git-tree": "787d1698947778edfecc2aa104ca7d09fb7d7415", "version-string": "1.2.2", diff --git a/external_imported/vcpkg/versions/t-/teemo.json b/external_imported/vcpkg/versions/t-/teemo.json index f06a0abfe..d45946f79 100644 --- a/external_imported/vcpkg/versions/t-/teemo.json +++ b/external_imported/vcpkg/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d7f598471297c1dad7372349f2c5a66c118659", + "version": "2.7", + "port-version": 0 + }, { "git-tree": "6eff96ba13b50bd8a7b7b3d1197fdbda11c09712", "version": "2.6", diff --git a/external_imported/vcpkg/versions/t-/tensorpipe.json b/external_imported/vcpkg/versions/t-/tensorpipe.json index 7ecdfe6e7..4233d9f58 100644 --- a/external_imported/vcpkg/versions/t-/tensorpipe.json +++ b/external_imported/vcpkg/versions/t-/tensorpipe.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4b982c4ade4582a5728384f2871610b107fe1b9f", + "version-date": "2022-03-16", + "port-version": 1 + }, + { + "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011", + "version-date": "2022-03-16", + "port-version": 0 + }, { "git-tree": "fc442cfbc144a4fc95ca41d9349ef04564d7ce5a", "version-date": "2021-04-26", diff --git a/external_imported/vcpkg/versions/t-/termcolor.json b/external_imported/vcpkg/versions/t-/termcolor.json index f0438dc33..b561e18ea 100644 --- a/external_imported/vcpkg/versions/t-/termcolor.json +++ b/external_imported/vcpkg/versions/t-/termcolor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15926920dc728ce16644bdb00bcca056efb293e8", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "a357134080b4f2553d91d289f167cc23ddc8c102", "version-semver": "2.0.0", diff --git a/external_imported/vcpkg/versions/t-/tesseract.json b/external_imported/vcpkg/versions/t-/tesseract.json index e13ddd025..713e368b7 100644 --- a/external_imported/vcpkg/versions/t-/tesseract.json +++ b/external_imported/vcpkg/versions/t-/tesseract.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "9d9b7d5ba2e222ee4fb62d4d5f03992e9232a97d", + "version": "5.2.0", + "port-version": 2 + }, + { + "git-tree": "ea93f36603ca265da43ef28d6583871ef3d97b43", + "version": "5.2.0", + "port-version": 1 + }, + { + "git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc", + "version": "5.2.0", + "port-version": 0 + }, + { + "git-tree": "24c99e73eaf335a9abedcfd42163c4968ca07ec3", + "version": "4.1.1", + "port-version": 11 + }, { "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", "version": "4.1.1", diff --git a/external_imported/vcpkg/versions/t-/tgui.json b/external_imported/vcpkg/versions/t-/tgui.json index c808cac11..846a6dd11 100644 --- a/external_imported/vcpkg/versions/t-/tgui.json +++ b/external_imported/vcpkg/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71f51f9739edd1af085fd0b0c401b5e2bc297a84", + "version-date": "2021-04-19", + "port-version": 4 + }, { "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543", "version-date": "2021-04-19", diff --git a/external_imported/vcpkg/versions/t-/theia.json b/external_imported/vcpkg/versions/t-/theia.json index 4ce29911e..6d0fcd41f 100644 --- a/external_imported/vcpkg/versions/t-/theia.json +++ b/external_imported/vcpkg/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8a6f763efb9bd7657a6be700493a95ab32d1cb6", + "version": "0.8", + "port-version": 7 + }, { "git-tree": "f19561fe41ab71864fbf9640e491cc6a567c06b8", "version-string": "0.8", diff --git a/external_imported/vcpkg/versions/t-/thor.json b/external_imported/vcpkg/versions/t-/thor.json index 708cdd803..7a5b299f3 100644 --- a/external_imported/vcpkg/versions/t-/thor.json +++ b/external_imported/vcpkg/versions/t-/thor.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d337ec42ced0695748c94113eb08515810e3408f", + "version": "2.0", + "port-version": 6 + }, + { + "git-tree": "45ba80aa43a83b1c810d757922428538f82d8123", + "version": "2.0", + "port-version": 5 + }, { "git-tree": "cada171d405874f848790c8e10a7f332bbed1e6c", "version": "2.0", diff --git a/external_imported/vcpkg/versions/t-/thrift.json b/external_imported/vcpkg/versions/t-/thrift.json index 2461b1285..1f9daf0e2 100644 --- a/external_imported/vcpkg/versions/t-/thrift.json +++ b/external_imported/vcpkg/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "075afb4c9f18e75caa0eb4b07609324fa35b5ca5", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "5db8f1e2a1a482177c2ff99e74d34e25b60fb7f4", "version-string": "0.13.0", diff --git a/external_imported/vcpkg/versions/t-/tidy-html5.json b/external_imported/vcpkg/versions/t-/tidy-html5.json index 8a48d8d42..adbb220c8 100644 --- a/external_imported/vcpkg/versions/t-/tidy-html5.json +++ b/external_imported/vcpkg/versions/t-/tidy-html5.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e16455cbec8214de37e3deb0ad41fe57323a7dd0", + "version": "5.8.0", + "port-version": 0 + }, + { + "git-tree": "2e4c85fc988591dc5b25baac22c4e83dde7b7f64", + "version": "5.7.28", + "port-version": 6 + }, { "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de", "version": "5.7.28", diff --git a/external_imported/vcpkg/versions/t-/tiff.json b/external_imported/vcpkg/versions/t-/tiff.json index 8882dafc3..8176f1db7 100644 --- a/external_imported/vcpkg/versions/t-/tiff.json +++ b/external_imported/vcpkg/versions/t-/tiff.json @@ -1,5 +1,25 @@ { "versions": [ + { + "git-tree": "7d5e9083d0072a4370b44f434cd4dac7b3bee7bc", + "version": "4.4.0", + "port-version": 1 + }, + { + "git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6", + "version": "4.4.0", + "port-version": 0 + }, + { + "git-tree": "e2cafe3465d7c00233114c75abd86ed11538c186", + "version": "4.3.0", + "port-version": 8 + }, + { + "git-tree": "4f05b5c8b426ce84fbc8930c8f935b792feeb1f4", + "version": "4.3.0", + "port-version": 7 + }, { "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", "version": "4.3.0", diff --git a/external_imported/vcpkg/versions/t-/tinydir.json b/external_imported/vcpkg/versions/t-/tinydir.json index 61a10051e..e128c0a5a 100644 --- a/external_imported/vcpkg/versions/t-/tinydir.json +++ b/external_imported/vcpkg/versions/t-/tinydir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15a20b060889d83539141c2b42ee7d856e9ab76f", + "version": "1.2.5", + "port-version": 0 + }, { "git-tree": "ce7697b2c8be56998fc7b97681fcd6e1d66cf49f", "version-string": "1.2.4", diff --git a/external_imported/vcpkg/versions/t-/tinyobjloader.json b/external_imported/vcpkg/versions/t-/tinyobjloader.json index b7f2aac5b..a7f2611ab 100644 --- a/external_imported/vcpkg/versions/t-/tinyobjloader.json +++ b/external_imported/vcpkg/versions/t-/tinyobjloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1e6a1c3ddc75a72ea801b5d0980a73e14358e5e", + "version": "2.0.0-rc9", + "port-version": 0 + }, { "git-tree": "1e64b6f58d80d1ff9b43cd9700c8996d0b5b764d", "version-string": "2.0.0-rc2", diff --git a/external_imported/vcpkg/versions/t-/tinyspline.json b/external_imported/vcpkg/versions/t-/tinyspline.json index 428ffdf0f..45d5fdc3b 100644 --- a/external_imported/vcpkg/versions/t-/tinyspline.json +++ b/external_imported/vcpkg/versions/t-/tinyspline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "231dcdd1e689138e14cb5c1d4250a224f580cdd7", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "6ad4ac2f1aa4dc253ada4023358286ab6bdc24a6", "version": "0.3.0", diff --git a/external_imported/vcpkg/versions/t-/tinyutf8.json b/external_imported/vcpkg/versions/t-/tinyutf8.json index d0437bdce..7c4bf906f 100644 --- a/external_imported/vcpkg/versions/t-/tinyutf8.json +++ b/external_imported/vcpkg/versions/t-/tinyutf8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68f68a99c01bfa1afbb04e680667e665330028ce", + "version": "4.4.3", + "port-version": 0 + }, { "git-tree": "2217decdd5160c93c9b4f92269b32a9d414670ee", "version-string": "4.0.2", diff --git a/external_imported/vcpkg/versions/t-/tinyxml2.json b/external_imported/vcpkg/versions/t-/tinyxml2.json index aebfd80f0..9b78a67da 100644 --- a/external_imported/vcpkg/versions/t-/tinyxml2.json +++ b/external_imported/vcpkg/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ef0e856167ad66665f51776d78fcffb1fcc1cb1", + "version-semver": "9.0.0", + "port-version": 1 + }, { "git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94", "version-semver": "9.0.0", diff --git a/external_imported/vcpkg/versions/t-/tmx.json b/external_imported/vcpkg/versions/t-/tmx.json index 862004cd4..1f74b06a6 100644 --- a/external_imported/vcpkg/versions/t-/tmx.json +++ b/external_imported/vcpkg/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad73505d8e08d0252406303852df5916e44209f6", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "1b0ec7979f9a75aab71e9488940a4beff74bd745", "version": "1.2.0", diff --git a/external_imported/vcpkg/versions/t-/tmxlite.json b/external_imported/vcpkg/versions/t-/tmxlite.json index 09092bb6a..2469531f2 100644 --- a/external_imported/vcpkg/versions/t-/tmxlite.json +++ b/external_imported/vcpkg/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "a60946b8d791faf0936b14f7ad9868d74b0dd872", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/t-/toml11.json b/external_imported/vcpkg/versions/t-/toml11.json index 6012bfd51..5a4ae69e5 100644 --- a/external_imported/vcpkg/versions/t-/toml11.json +++ b/external_imported/vcpkg/versions/t-/toml11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "978b00b8d4801b25272df9c650958ce7112e3f45", + "version": "3.7.1", + "port-version": 0 + }, { "git-tree": "ab8e69aef0551e2e862e74ec70b5c2dd58aac36b", "version": "3.7.0", diff --git a/external_imported/vcpkg/versions/t-/tomlplusplus.json b/external_imported/vcpkg/versions/t-/tomlplusplus.json index 6cbfc7a3c..a5947f3b1 100644 --- a/external_imported/vcpkg/versions/t-/tomlplusplus.json +++ b/external_imported/vcpkg/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf80fe2b73187c7a5ae1ea2d32cba894c13f7224", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "815508399a10ce972d933aa3f5b4f751c37c64d2", "version": "3.0.1", diff --git a/external_imported/vcpkg/versions/t-/tracy.json b/external_imported/vcpkg/versions/t-/tracy.json index 8274402c9..c0f531e2f 100644 --- a/external_imported/vcpkg/versions/t-/tracy.json +++ b/external_imported/vcpkg/versions/t-/tracy.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4fac1fe3f245ef69b648a6846e631795fe4ee5eb", + "version-semver": "0.8.2", + "port-version": 0 + }, + { + "git-tree": "a703a83cacfbb242afd294baeb87ca1a497c5bf1", + "version-semver": "0.8.1", + "port-version": 0 + }, + { + "git-tree": "65aeedc7adaa4e1b13998f781e702d7672b2aca5", + "version-semver": "0.8.0", + "port-version": 1 + }, { "git-tree": "b34c2e1fb20aa7f46e350fbf5b90e8dda71aaf3a", "version": "0.8.0", diff --git a/external_imported/vcpkg/versions/t-/trantor.json b/external_imported/vcpkg/versions/t-/trantor.json index 7f1733fc8..56cc41162 100644 --- a/external_imported/vcpkg/versions/t-/trantor.json +++ b/external_imported/vcpkg/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f72c33fe2ab8b7d6b89cf48402c3cb550233abe", + "version-semver": "1.5.6", + "port-version": 0 + }, { "git-tree": "9d602ca62a711669efb9d496f9644334fecd8c9d", "version-semver": "1.5.5", diff --git a/external_imported/vcpkg/versions/t-/tre.json b/external_imported/vcpkg/versions/t-/tre.json index fcf4bef79..ee9ab2b0c 100644 --- a/external_imported/vcpkg/versions/t-/tre.json +++ b/external_imported/vcpkg/versions/t-/tre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "576df391c1e53ba1d3e8895ce7965d71b78d8236", + "version": "0.8.0", + "port-version": 4 + }, { "git-tree": "9a43049be2abc5f27fa5b1f77eaeda7a3a63d4a0", "version-string": "0.8.0", diff --git a/external_imported/vcpkg/versions/t-/tree-sitter.json b/external_imported/vcpkg/versions/t-/tree-sitter.json new file mode 100644 index 000000000..9e57b626e --- /dev/null +++ b/external_imported/vcpkg/versions/t-/tree-sitter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a96085943d7eb28c30fa8d53eb5452e4dccdfd93", + "version-semver": "0.20.6", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/t-/triton.json b/external_imported/vcpkg/versions/t-/triton.json index 2bc406362..a47de6a99 100644 --- a/external_imported/vcpkg/versions/t-/triton.json +++ b/external_imported/vcpkg/versions/t-/triton.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6b86390804efe4afb7989e40a4cf84ad7877e85a", + "version": "0.9", + "port-version": 4 + }, + { + "git-tree": "dd0d283c09ee98abf32a81d0833e81a9e5222028", + "version": "0.9", + "port-version": 3 + }, { "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa", "version": "0.9", diff --git a/external_imported/vcpkg/versions/t-/turbobase64.json b/external_imported/vcpkg/versions/t-/turbobase64.json index 761a503da..e0f08c21c 100644 --- a/external_imported/vcpkg/versions/t-/turbobase64.json +++ b/external_imported/vcpkg/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d23821ef39944689c9ec0e8cf02d17c7b68901", + "version-date": "2020-01-12", + "port-version": 3 + }, { "git-tree": "1077b7996d7d22e798b337bc29177a566ec64e4b", "version-date": "2020-01-12", diff --git a/external_imported/vcpkg/versions/u-/unixodbc.json b/external_imported/vcpkg/versions/u-/unixodbc.json index 6b6e135c3..394daa07c 100644 --- a/external_imported/vcpkg/versions/u-/unixodbc.json +++ b/external_imported/vcpkg/versions/u-/unixodbc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d5bf2c65c912060aaebaba66eb6ce1544d6dd7e6", + "version": "2.3.11", + "port-version": 1 + }, + { + "git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03", + "version": "2.3.11", + "port-version": 0 + }, { "git-tree": "68ea55f1c4679d7585ab6482d1641bfb6b106b23", "version": "2.3.9", diff --git a/external_imported/vcpkg/versions/u-/unrar.json b/external_imported/vcpkg/versions/u-/unrar.json index 0aa96d38a..b617014a8 100644 --- a/external_imported/vcpkg/versions/u-/unrar.json +++ b/external_imported/vcpkg/versions/u-/unrar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0181c013ed7f278c6e62725516dbb65b103fa7d7", + "version": "6.1.7", + "port-version": 0 + }, { "git-tree": "d2ade299ed837817b3d02522f990af3a64cb938b", "version": "5.8.1", diff --git a/external_imported/vcpkg/versions/u-/upb.json b/external_imported/vcpkg/versions/u-/upb.json index 50641b629..46a2d02d4 100644 --- a/external_imported/vcpkg/versions/u-/upb.json +++ b/external_imported/vcpkg/versions/u-/upb.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "4a5b5306d38f1a58f65c98c236b84ca297501ab1", + "version-date": "2022-06-21", + "port-version": 0 + }, + { + "git-tree": "de1d8718e4ea42428b87f4275352c4f3bbb6ac11", + "version-date": "2022-04-04", + "port-version": 0 + }, { "git-tree": "7c61b435b6136ae6539c3991b9f6b81bfd6811dc", "version-date": "2021-10-19", diff --git a/external_imported/vcpkg/versions/u-/urdfdom-headers.json b/external_imported/vcpkg/versions/u-/urdfdom-headers.json index 149af41f3..c3b80c1b1 100644 --- a/external_imported/vcpkg/versions/u-/urdfdom-headers.json +++ b/external_imported/vcpkg/versions/u-/urdfdom-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd11423fb71779a21a08de42cc5e0486478ad959", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "557188bd804b7c57c882f39710ca21deb1b91db5", "version-string": "1.0.5", diff --git a/external_imported/vcpkg/versions/u-/urdfdom.json b/external_imported/vcpkg/versions/u-/urdfdom.json index 8c71cc56c..391d13c43 100644 --- a/external_imported/vcpkg/versions/u-/urdfdom.json +++ b/external_imported/vcpkg/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "a74450532028f2079b8ea0b20bb82ded93e951d6", "version": "1.0.4", diff --git a/external_imported/vcpkg/versions/u-/usd.json b/external_imported/vcpkg/versions/u-/usd.json index f32c455a8..f1d76f10e 100644 --- a/external_imported/vcpkg/versions/u-/usd.json +++ b/external_imported/vcpkg/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c241a36daa1c8695be5e0d4a8a29f2cc304dd6b1", + "version-string": "20.08", + "port-version": 3 + }, { "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb", "version-string": "20.08", diff --git a/external_imported/vcpkg/versions/u-/usockets.json b/external_imported/vcpkg/versions/u-/usockets.json index efac4caed..4482b7ef1 100644 --- a/external_imported/vcpkg/versions/u-/usockets.json +++ b/external_imported/vcpkg/versions/u-/usockets.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f5f1af355335cdcd1c055cdbcdd574b146116942", + "version": "0.8.1", + "port-version": 2 + }, + { + "git-tree": "bf42304e17879df7e100c97d4487adaeaadfd87e", + "version": "0.8.1", + "port-version": 1 + }, { "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2", "version": "0.8.1", diff --git a/external_imported/vcpkg/versions/u-/utf8proc.json b/external_imported/vcpkg/versions/u-/utf8proc.json index bfe00d352..0f465e849 100644 --- a/external_imported/vcpkg/versions/u-/utf8proc.json +++ b/external_imported/vcpkg/versions/u-/utf8proc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d0c3ece179c9fc0e59c5573b91bc23ff3124c37", + "version": "2.7.0", + "port-version": 1 + }, + { + "git-tree": "e50e6a4b5de0d3eab7fe13920d1358b83230fd36", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "659423c8c76de9194980ba25a2755bde258ed173", "version": "2.6.1", diff --git a/external_imported/vcpkg/versions/u-/utfcpp.json b/external_imported/vcpkg/versions/u-/utfcpp.json index dc7b6b2ef..15a53abd5 100644 --- a/external_imported/vcpkg/versions/u-/utfcpp.json +++ b/external_imported/vcpkg/versions/u-/utfcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c47a0911020f386e46e4f920a55fec656976d2ef", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "27a1e587de353ed0d9559d5e4627ed2811960c07", "version": "3.2.1", diff --git a/external_imported/vcpkg/versions/u-/uvatlas.json b/external_imported/vcpkg/versions/u-/uvatlas.json index c1980b048..c8df6e2b0 100644 --- a/external_imported/vcpkg/versions/u-/uvatlas.json +++ b/external_imported/vcpkg/versions/u-/uvatlas.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b8e6b720b8515e7b966c76785e54d31f97d32261", + "version-date": "2022-07-30", + "port-version": 1 + }, + { + "git-tree": "bb57b16dfc29cefbae6f35fd3e09376e0291b2bd", + "version-date": "2022-07-30", + "port-version": 0 + }, + { + "git-tree": "2ac8444f59bd76ba38a620d4e0fe1a6a64969873", + "version-date": "2022-05-09", + "port-version": 0 + }, { "git-tree": "100ee1b04f5da317153da9c52eb0c0def30e9b49", "version-date": "2022-03-24", diff --git a/external_imported/vcpkg/versions/u-/uvw.json b/external_imported/vcpkg/versions/u-/uvw.json index 95a51f901..048053fbc 100644 --- a/external_imported/vcpkg/versions/u-/uvw.json +++ b/external_imported/vcpkg/versions/u-/uvw.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c36c66a8d5f4a6eed4aa9fe4399f32a516d3883c", + "version": "2.12.1", + "port-version": 2 + }, + { + "git-tree": "609b48de110aa8763d8f4a674ac3aa7c5821382f", + "version": "2.12.1", + "port-version": 1 + }, + { + "git-tree": "eac81a2d74241ded58a1c503d91f226f86ca09c6", + "version": "2.12.1", + "port-version": 0 + }, { "git-tree": "fc9230cd12ff7d556e700053798f20e07283954d", "version-string": "2.7.0", diff --git a/external_imported/vcpkg/versions/u-/uwebsockets.json b/external_imported/vcpkg/versions/u-/uwebsockets.json index ce1397846..9863751eb 100644 --- a/external_imported/vcpkg/versions/u-/uwebsockets.json +++ b/external_imported/vcpkg/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f25a78232935faad44896203386f3c282301805a", + "version-semver": "20.14.0", + "port-version": 0 + }, { "git-tree": "5b1e062e56cf8ea0bdfe07414a11791e62c964fe", "version-semver": "20.11.0", diff --git a/external_imported/vcpkg/versions/v-/v8.json b/external_imported/vcpkg/versions/v-/v8.json index 9583dc8d4..3be97ab88 100644 --- a/external_imported/vcpkg/versions/v-/v8.json +++ b/external_imported/vcpkg/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57ec75cb9169900555359752c65e8e4c79c34ec", + "version": "9.1.269.39", + "port-version": 4 + }, { "git-tree": "3abf0953ae7dcf4bb4b4ede21adb27ad850b1e1c", "version": "9.1.269.39", diff --git a/external_imported/vcpkg/versions/v-/vamp-sdk.json b/external_imported/vcpkg/versions/v-/vamp-sdk.json index 153a9e1f0..97b6ae4f7 100644 --- a/external_imported/vcpkg/versions/v-/vamp-sdk.json +++ b/external_imported/vcpkg/versions/v-/vamp-sdk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "be6c66cbbf45af0e78aa4456832c04bbe301b951", + "version": "2.10", + "port-version": 4 + }, + { + "git-tree": "ac0236fcb60d389d21fe96a9c96c5f21f9e905b0", + "version": "2.10", + "port-version": 3 + }, { "git-tree": "9d2b2ab057b4e31d833668e82f95283c7afbc551", "version": "2.10", diff --git a/external_imported/vcpkg/versions/v-/vc.json b/external_imported/vcpkg/versions/v-/vc.json index 2d7db7426..f1232fc14 100644 --- a/external_imported/vcpkg/versions/v-/vc.json +++ b/external_imported/vcpkg/versions/v-/vc.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67", + "version": "1.4.3", + "port-version": 0 + }, + { + "git-tree": "98b96fa582424d700421161838544f1daf738467", + "version": "1.4.2", + "port-version": 3 + }, { "git-tree": "57204c2b095452a828860a6476b8b997463ee36d", "version": "1.4.2", diff --git a/external_imported/vcpkg/versions/v-/vcglib.json b/external_imported/vcpkg/versions/v-/vcglib.json index 0fde71fa6..bab35eab3 100644 --- a/external_imported/vcpkg/versions/v-/vcglib.json +++ b/external_imported/vcpkg/versions/v-/vcglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1170b49b3d2980357ba10d68769b0bcfaeda42f7", + "version-string": "2022.02", + "port-version": 0 + }, { "git-tree": "4ed58c0ed176662ca418315c77fb0137c2cf7769", "version-string": "1.0.1", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json index 208504f94..a354d8732 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d54cc4f487d51b655abec5f9c9c3f86ca83311f", + "version-date": "2022-02-06", + "port-version": 1 + }, { "git-tree": "24dc7dfc704406e9f745f033643dc25f56e4ca18", "version-date": "2022-02-06", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json new file mode 100644 index 000000000..362bbdce7 --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake-get-vars.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b50ca3d20736304215fbd82c102d4552457255bb", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "181f509cdab757511233106aa44c529e04c0c29f", + "version-date": "2022-05-10", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json index fb83ccdf3..93f0c6697 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-cmake.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-cmake.json @@ -1,5 +1,55 @@ { "versions": [ + { + "git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078", + "version-date": "2022-08-18", + "port-version": 0 + }, + { + "git-tree": "a7b618b7782f3c841d7fd2d84a6ba3619815362a", + "version-date": "2022-07-18", + "port-version": 0 + }, + { + "git-tree": "94abbd71a7fe495e883b13c077312f6d419cbc41", + "version-date": "2022-07-02", + "port-version": 0 + }, + { + "git-tree": "819e45a14fb875ec7e8373143c994b7bd8d8f7cb", + "version-date": "2022-06-07", + "port-version": 0 + }, + { + "git-tree": "8b07d914c90cf8f611973318c85d3af13201e3f9", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "e8db2f70aa8b584aac932fcff65d91bf52d57731", + "version-date": "2022-05-10", + "port-version": 0 + }, + { + "git-tree": "46a5686341cf9136053ff01b9f213dbd2dbea8a6", + "version-date": "2022-05-06", + "port-version": 0 + }, + { + "git-tree": "ecfb2282f599a9c1f3a9ad98eac9d2b35690850f", + "version-date": "2022-05-05", + "port-version": 0 + }, + { + "git-tree": "8273918a04a5822ad7cc21ea5249402f2e999a7a", + "version-date": "2022-04-21", + "port-version": 0 + }, + { + "git-tree": "ef4a9463f802c1cd6f8b31e560529aeaee0faff4", + "version-date": "2022-04-12", + "port-version": 0 + }, { "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", "version-date": "2022-04-07", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json index 6101d3fc2..e9eced18e 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "e65762bfef05a4d380bb171409c48a694fb35435", + "version-date": "2022-06-30", + "port-version": 0 + }, + { + "git-tree": "ffe13ab59e3e2f4f003498035bc1fbc06b64e164", + "version-date": "2022-04-11", + "port-version": 1 + }, + { + "git-tree": "f03d459d365b604decb720f7da79b3f7d7127670", + "version-date": "2022-04-11", + "port-version": 0 + }, { "git-tree": "e429a4c957711115ea1b795327843acb05fc8b29", "version-date": "2022-02-12", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-gn.json b/external_imported/vcpkg/versions/v-/vcpkg-gn.json index b1802e0e8..c4a418c49 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-gn.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-gn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "119e620029e0579165590b4656882bd6c3ce297c", + "version-date": "2021-11-16", + "port-version": 2 + }, { "git-tree": "ba02b5d9d66b0e227762e6aeac0851fd8fb4314e", "version-date": "2021-11-16", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json b/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json index 1b3b6360a..3bb85c48b 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48bfa748f78837921860329547ed6e5799665698", + "version-date": "2022-02-10", + "port-version": 1 + }, { "git-tree": "d4f1fd82fd733b622ed83f5f502b8483e5b2ca3b", "version-date": "2022-02-10", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json index 5a33b4006..92995e206 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-qmake.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-qmake.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "546491787b275bfae887457a5eb17a7b502ae891", + "version-date": "2022-05-10", + "port-version": 1 + }, + { + "git-tree": "7f5f5955d901ed2c7caac9e3681d23338d8fe845", + "version-date": "2022-05-10", + "port-version": 0 + }, { "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425", "version-date": "2022-02-14", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-gn.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-gn.json new file mode 100644 index 000000000..cd79c22ef --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-gn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "811d8c3a4d4489a291c69cde7788c620f950eb9e", + "version-date": "2022-04-16", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json index c5143684d..742ccaecd 100644 --- a/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", + "version": "0.63", + "port-version": 0 + }, + { + "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398", + "version": "0.62.1", + "port-version": 0 + }, { "git-tree": "6fe7cf1649af5d90c1e88765411a463cac55e99c", "version": "0.60.2", diff --git a/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json b/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json new file mode 100644 index 000000000..989abb5d8 --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vcpkg-tool-ninja.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c", + "version-date": "2022-03-31", + "port-version": 1 + }, + { + "git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05", + "version-date": "2022-03-31", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vectorclass.json b/external_imported/vcpkg/versions/v-/vectorclass.json index dc472b4a1..41c725d8f 100644 --- a/external_imported/vcpkg/versions/v-/vectorclass.json +++ b/external_imported/vcpkg/versions/v-/vectorclass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0c5a8f550d59e8a92becd672d9d0a029faf4ac", + "version-string": "2.02.00", + "port-version": 0 + }, { "git-tree": "a1c1b1ca0e0ddb9d5c27129234b2c22c9b73bd16", "version-string": "2.00.01", diff --git a/external_imported/vcpkg/versions/v-/vkfft.json b/external_imported/vcpkg/versions/v-/vkfft.json new file mode 100644 index 000000000..bc864103c --- /dev/null +++ b/external_imported/vcpkg/versions/v-/vkfft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cefb73461bdbaf1e71eefa7bb7a9dce7352fd3b3", + "version": "1.2.17", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/v-/vlpp.json b/external_imported/vcpkg/versions/v-/vlpp.json index 37a6699ba..31ead26bd 100644 --- a/external_imported/vcpkg/versions/v-/vlpp.json +++ b/external_imported/vcpkg/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4f56db04c13b5bf335e4e5939617596e15e89ac", + "version": "0.11.0.0", + "port-version": 3 + }, { "git-tree": "cfa763a8d53142b93748fde4a578ddbd95431ac2", "version-string": "0.11.0.0", diff --git a/external_imported/vcpkg/versions/v-/volk.json b/external_imported/vcpkg/versions/v-/volk.json index c5394f454..56d3b2b12 100644 --- a/external_imported/vcpkg/versions/v-/volk.json +++ b/external_imported/vcpkg/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3c879b8f9516e71bcad0365c64b9c993ec6b254", + "version": "1.3.204", + "port-version": 1 + }, { "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", "version": "1.3.204", diff --git a/external_imported/vcpkg/versions/v-/vtk-m.json b/external_imported/vcpkg/versions/v-/vtk-m.json index a08928b0e..d96689fa0 100644 --- a/external_imported/vcpkg/versions/v-/vtk-m.json +++ b/external_imported/vcpkg/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfd540dbdb5d0684ea4e5363e3b32cfceadcb542", + "version-semver": "1.6.0", + "port-version": 2 + }, { "git-tree": "4732af1d6b93dd170e8340039ed4c111e32ff224", "version-semver": "1.6.0", diff --git a/external_imported/vcpkg/versions/v-/vtk.json b/external_imported/vcpkg/versions/v-/vtk.json index d73625635..f4afbd9dd 100644 --- a/external_imported/vcpkg/versions/v-/vtk.json +++ b/external_imported/vcpkg/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3193e1219e09f8f67d2762fa4fe823f4327a1c93", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 11 + }, { "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", "version-semver": "9.0.3-pv5.9.1", diff --git a/external_imported/vcpkg/versions/v-/vulkan-headers.json b/external_imported/vcpkg/versions/v-/vulkan-headers.json index e1f105254..c8bff9bd2 100644 --- a/external_imported/vcpkg/versions/v-/vulkan-headers.json +++ b/external_imported/vcpkg/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91d99bf9fe3492ffda0fbb13befda47b00ae388a", + "version": "1.3.224", + "port-version": 0 + }, { "git-tree": "b5192b1575959f03e204edc4712351461b6a2c23", "version": "1.2.203", diff --git a/external_imported/vcpkg/versions/w-/wavpack.json b/external_imported/vcpkg/versions/w-/wavpack.json index a723cf110..c61aee9d8 100644 --- a/external_imported/vcpkg/versions/w-/wavpack.json +++ b/external_imported/vcpkg/versions/w-/wavpack.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "36c8b50ac4693a68a3ecceea8e96bb1abe852089", + "version": "5.5.0", + "port-version": 0 + }, + { + "git-tree": "39c514f313b4bc2fc7af0f3a889425bb78aca9e3", + "version": "5.4.0", + "port-version": 2 + }, { "git-tree": "77b8c9ab85776abb2d049d562db7350525ddf7e2", "version": "5.4.0", diff --git a/external_imported/vcpkg/versions/w-/wayland-protocols.json b/external_imported/vcpkg/versions/w-/wayland-protocols.json new file mode 100644 index 000000000..8407bb223 --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wayland-protocols.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c50a34c552f4b5bc2b867c5732ad0c27cfa8996a", + "version": "1.23", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/wayland.json b/external_imported/vcpkg/versions/w-/wayland.json new file mode 100644 index 000000000..eca73e177 --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wayland.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "353490d29b62e597126db445b5f2a49301002f5b", + "version": "1.19.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/webview2.json b/external_imported/vcpkg/versions/w-/webview2.json new file mode 100644 index 000000000..5a68306fe --- /dev/null +++ b/external_imported/vcpkg/versions/w-/webview2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "67a13efe8865489439c423563ee9fdaecf8baab1", + "version": "1.0.1210.39", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/winreg.json b/external_imported/vcpkg/versions/w-/winreg.json index 2b55d506c..9886bf55d 100644 --- a/external_imported/vcpkg/versions/w-/winreg.json +++ b/external_imported/vcpkg/versions/w-/winreg.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c2ca5ed4ead6f69d105bd677fc3acaeba4be8879", + "version": "6.1.0", + "port-version": 0 + }, + { + "git-tree": "d6faf66fd8bb6b7d12b74e2084cbf15f8628b531", + "version": "6.0.0", + "port-version": 0 + }, + { + "git-tree": "ec4168b0b4ceaece6ee9d24b5bcc8c4ed8897db7", + "version": "5.1.1", + "port-version": 0 + }, { "git-tree": "cdcb9cb9581869670509de4d2928b8821038d962", "version": "5.1.0", diff --git a/external_imported/vcpkg/versions/w-/winsock2.json b/external_imported/vcpkg/versions/w-/winsock2.json index 8c41d101f..2bfb20b28 100644 --- a/external_imported/vcpkg/versions/w-/winsock2.json +++ b/external_imported/vcpkg/versions/w-/winsock2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9afad2b0a036847b45f884809b16d804eae56cf", + "version": "0.0", + "port-version": 5 + }, { "git-tree": "f6fb217f4eea375e9691dbde28c72c01dddd0c9f", "version": "0.0", diff --git a/external_imported/vcpkg/versions/w-/wolfmqtt.json b/external_imported/vcpkg/versions/w-/wolfmqtt.json new file mode 100644 index 000000000..3bd3f6f61 --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wolfmqtt.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "37b49de24795f47490a870aa721aceeb545a07ce", + "version": "1.14.1", + "port-version": 0 + }, + { + "git-tree": "3cc2bb0123d6f9ea038bf52190ba1c6c2154b02b", + "version": "1.14.0", + "port-version": 0 + }, + { + "git-tree": "bc6b26e4254f8938dc9db7f7b5dc84958a45c877", + "version": "1.13.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/wolfssl.json b/external_imported/vcpkg/versions/w-/wolfssl.json new file mode 100644 index 000000000..737e8caca --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wolfssl.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "051a3dc2339554716a11e8e90e9ecea1c366ad31", + "version": "5.5.0", + "port-version": 0 + }, + { + "git-tree": "6b522a6326a126579cee52953fe42f597f301a22", + "version": "5.4.0", + "port-version": 0 + }, + { + "git-tree": "4dee782f3dda81bc4a72959bcda6d1377a24cbaa", + "version": "5.3.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/wolftpm.json b/external_imported/vcpkg/versions/w-/wolftpm.json new file mode 100644 index 000000000..bbfcdb8d2 --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wolftpm.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "3f07a1e1aa64eb12e407a202a68370a4e08e9af9", + "version": "2.6.0", + "port-version": 0 + }, + { + "git-tree": "80998c4f2e20341ac7195103ba9581a8c8e0cd68", + "version": "2.5.0", + "port-version": 0 + }, + { + "git-tree": "647740c5ad277ccf2d910605595118087f3bc342", + "version": "2.4.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/workflow.json b/external_imported/vcpkg/versions/w-/workflow.json index 67609cd7f..fd24509a3 100644 --- a/external_imported/vcpkg/versions/w-/workflow.json +++ b/external_imported/vcpkg/versions/w-/workflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e673ba0fd8857c0d13f6137e32b3ce5cfda65d9", + "version": "0.9.7", + "port-version": 1 + }, { "git-tree": "864387c239d4b0fadabfc4b314564d75c9bc07bc", "version": "0.9.7", diff --git a/external_imported/vcpkg/versions/w-/wpilib.json b/external_imported/vcpkg/versions/w-/wpilib.json index 2b2c63cfe..b4a4397f3 100644 --- a/external_imported/vcpkg/versions/w-/wpilib.json +++ b/external_imported/vcpkg/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1593dcc61c40d6205be6d47e3623dc6bb3ddbad3", + "version-date": "2020-03-02", + "port-version": 3 + }, { "git-tree": "cf10ef63982d54978a85c868d37462ce21643188", "version-string": "2020.3.2", diff --git a/external_imported/vcpkg/versions/w-/wren.json b/external_imported/vcpkg/versions/w-/wren.json index 98fc8dfc4..565c88763 100644 --- a/external_imported/vcpkg/versions/w-/wren.json +++ b/external_imported/vcpkg/versions/w-/wren.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d845edef970204677adb20d8f51acf22b1c9fb00", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "558979dc3ff66a524b930d85fbf856679ebd0208", "version-string": "2019-07-01", diff --git a/external_imported/vcpkg/versions/w-/wt.json b/external_imported/vcpkg/versions/w-/wt.json index a96534263..88eaa5f94 100644 --- a/external_imported/vcpkg/versions/w-/wt.json +++ b/external_imported/vcpkg/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24546bcb3aa44c987d85536d39420e4159d4ad99", + "version": "4.7.1", + "port-version": 0 + }, { "git-tree": "0d5d5d96583b44370437e567f086173a2c0ad51e", "version": "4.6.1", diff --git a/external_imported/vcpkg/versions/w-/wtl.json b/external_imported/vcpkg/versions/w-/wtl.json index 474f02cc8..b0448a20b 100644 --- a/external_imported/vcpkg/versions/w-/wtl.json +++ b/external_imported/vcpkg/versions/w-/wtl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c76ddf631b62e5d0b433859f7798c7ab06050f47", + "version": "10.0.10320", + "port-version": 4 + }, + { + "git-tree": "77302be4bab5f3221389c7948462e15ac941002b", + "version": "10.0.10320", + "port-version": 3 + }, { "git-tree": "3345336300f47e924a80d3be0f3fb76c558a54fe", "version-string": "10.0.10320", diff --git a/external_imported/vcpkg/versions/w-/wxchartdir.json b/external_imported/vcpkg/versions/w-/wxchartdir.json index 6cd71a59b..ec31d371c 100644 --- a/external_imported/vcpkg/versions/w-/wxchartdir.json +++ b/external_imported/vcpkg/versions/w-/wxchartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84db89440d1592907ba9d7513fb1b99695736caa", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "a08e6fa005143547643f47527bb263aca530b715", "version": "1.0.0", diff --git a/external_imported/vcpkg/versions/w-/wxcharts.json b/external_imported/vcpkg/versions/w-/wxcharts.json new file mode 100644 index 000000000..6804312bd --- /dev/null +++ b/external_imported/vcpkg/versions/w-/wxcharts.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "03603fb0a73094f361edd6b4f074b661654a19b2", + "version-date": "2022-07-05", + "port-version": 0 + }, + { + "git-tree": "0d4c30893a28468249d63c0f4c1a1a9e231ac817", + "version-date": "2022-06-16", + "port-version": 0 + }, + { + "git-tree": "b1e9c16349a281b499d1ff50cdee4dd21c4aafec", + "version-date": "2022-04-22", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/w-/wxwidgets.json b/external_imported/vcpkg/versions/w-/wxwidgets.json index ec8442938..715eb5b9b 100644 --- a/external_imported/vcpkg/versions/w-/wxwidgets.json +++ b/external_imported/vcpkg/versions/w-/wxwidgets.json @@ -1,5 +1,60 @@ { "versions": [ + { + "git-tree": "a113e248e95bf2305a91b4d7c2a93579cc911b15", + "version": "3.2.1", + "port-version": 0 + }, + { + "git-tree": "39e102a05ff8b8e2f8a137b1f3bbe8e44f88a8ad", + "version": "3.2.0", + "port-version": 2 + }, + { + "git-tree": "0d78ddc0e26a382e0eeca82b767dfbed70dda82e", + "version": "3.2.0", + "port-version": 1 + }, + { + "git-tree": "204fda7008c12569ddf44a935b32bbe5df87cef4", + "version": "3.2.0", + "port-version": 0 + }, + { + "git-tree": "2610601e9e585455bc709f29636f79b5ad9382a2", + "version": "3.1.7", + "port-version": 0 + }, + { + "git-tree": "27a68f45cbdc9ab88864c353c7a8b91f76153509", + "version": "3.1.6", + "port-version": 2 + }, + { + "git-tree": "793b49ce7710b440be0a451354614e282e6fc9fa", + "version": "3.1.6", + "port-version": 1 + }, + { + "git-tree": "16d9f0aabf4f0df68bebd7b42ff6005d952f9392", + "version": "3.1.6", + "port-version": 0 + }, + { + "git-tree": "3f891e383d71c7665ba49dcc254d8b2094c00c2b", + "version-semver": "3.1.5", + "port-version": 11 + }, + { + "git-tree": "99203047a716a1b39d06fb93c48daebb4b184141", + "version-semver": "3.1.5", + "port-version": 10 + }, + { + "git-tree": "26ad66271632adb4d00a270a90ad18514025859e", + "version-semver": "3.1.5", + "port-version": 9 + }, { "git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f", "version-semver": "3.1.5", diff --git a/external_imported/vcpkg/versions/x-/x264.json b/external_imported/vcpkg/versions/x-/x264.json index bd8a969ea..55e06c314 100644 --- a/external_imported/vcpkg/versions/x-/x264.json +++ b/external_imported/vcpkg/versions/x-/x264.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "16be87b659ccfeaba052e561f3f0a8b1b927c5d0", + "version": "0.164.3095", + "port-version": 1 + }, + { + "git-tree": "e369a0924f6b28e965b0e0c8f35264b7fd5efb7f", + "version": "0.164.3095", + "port-version": 0 + }, + { + "git-tree": "59d158d37c92adf78716bc36f80a82853149e368", + "version-string": "164-5db6aa6cab1b146", + "port-version": 5 + }, { "git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d", "version-string": "164-5db6aa6cab1b146", diff --git a/external_imported/vcpkg/versions/x-/x265.json b/external_imported/vcpkg/versions/x-/x265.json index bd0e54ac1..29999f52a 100644 --- a/external_imported/vcpkg/versions/x-/x265.json +++ b/external_imported/vcpkg/versions/x-/x265.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "994e11b88e86c790b503ec381185f33833b351f9", + "version": "3.4", + "port-version": 7 + }, + { + "git-tree": "15ee257957dfa5a194cf602c160713369b7c313a", + "version": "3.4", + "port-version": 6 + }, { "git-tree": "3904d5293aad0e38ee7ca93b82182441bb1575ca", "version-string": "3.4", diff --git a/external_imported/vcpkg/versions/x-/xaudio2redist.json b/external_imported/vcpkg/versions/x-/xaudio2redist.json index 2f86ccea7..7cf5b9801 100644 --- a/external_imported/vcpkg/versions/x-/xaudio2redist.json +++ b/external_imported/vcpkg/versions/x-/xaudio2redist.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "49a7df46ef685eea76f3775dfebc458117e6c33c", + "version": "1.2.9", + "port-version": 0 + }, + { + "git-tree": "fe3229572bacd0c7076a7a4d710f96e6b3a66a3f", + "version": "1.2.8", + "port-version": 3 + }, { "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", "version": "1.2.8", diff --git a/external_imported/vcpkg/versions/x-/xbyak.json b/external_imported/vcpkg/versions/x-/xbyak.json index 26f3261d0..26a62ce56 100644 --- a/external_imported/vcpkg/versions/x-/xbyak.json +++ b/external_imported/vcpkg/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4441480fab1434594b5441612ae5158c81a6642", + "version": "6.60", + "port-version": 0 + }, { "git-tree": "ef05725cf97fc484f475a6db447bc6d503c8d42b", "version-string": "6.00", diff --git a/external_imported/vcpkg/versions/x-/xcb-proto.json b/external_imported/vcpkg/versions/x-/xcb-proto.json new file mode 100644 index 000000000..20e240c60 --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xcb-proto.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e5933d2463549d6d3b00a8aa1f0279f2a974ec1c", + "version": "1.14.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xcb-render-util.json b/external_imported/vcpkg/versions/x-/xcb-render-util.json new file mode 100644 index 000000000..b14709327 --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xcb-render-util.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c33cb9ea07d2bd0e8662ad5d8a1368aae2144da2", + "version": "0.3.9", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xcb-util-m4.json b/external_imported/vcpkg/versions/x-/xcb-util-m4.json new file mode 100644 index 000000000..45f1929e4 --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xcb-util-m4.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3d9a0f48392c4845b152c9dfdfa702f9f0a932d9", + "version-date": "2022-01-24", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xcb.json b/external_imported/vcpkg/versions/x-/xcb.json new file mode 100644 index 000000000..29168c9ce --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xcb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7af3e0f5bc8377ca950f83d3a0bdbb8cc40026aa", + "version": "1.14", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xlnt.json b/external_imported/vcpkg/versions/x-/xlnt.json index cda2e706d..567f54e4e 100644 --- a/external_imported/vcpkg/versions/x-/xlnt.json +++ b/external_imported/vcpkg/versions/x-/xlnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e7ad7529f9ff8b7e9c59824230548f77b491cae", + "version": "1.5.0", + "port-version": 4 + }, { "git-tree": "225346f8b24e3d09ad6b63b928ed2e6f1cfed4d4", "version": "1.5.0", diff --git a/external_imported/vcpkg/versions/x-/xlsxio.json b/external_imported/vcpkg/versions/x-/xlsxio.json index 167faf72b..da0b39202 100644 --- a/external_imported/vcpkg/versions/x-/xlsxio.json +++ b/external_imported/vcpkg/versions/x-/xlsxio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b4eb1ccf9e863a9291e03521af9ff4d62f5eb3d", + "version-date": "2021-03-24", + "port-version": 1 + }, { "git-tree": "363ef11ba53c472f8ec8186c455f964b49088d7f", "version-date": "2021-03-24", diff --git a/external_imported/vcpkg/versions/x-/xmlsec.json b/external_imported/vcpkg/versions/x-/xmlsec.json index 0667e390f..f9b1032eb 100644 --- a/external_imported/vcpkg/versions/x-/xmlsec.json +++ b/external_imported/vcpkg/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41c14aae637b02b4e018902e0f9b67bcdef12f2", + "version": "1.2.34", + "port-version": 0 + }, { "git-tree": "635a9b0883829c524cc712d552d9a265ef984bf7", "version": "1.2.33", diff --git a/external_imported/vcpkg/versions/x-/xorg-macros.json b/external_imported/vcpkg/versions/x-/xorg-macros.json new file mode 100644 index 000000000..66137c08e --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xorg-macros.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "76db60fb182a4c33faabfb411e1842428ae4c8ad", + "version": "1.19.3", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xproto.json b/external_imported/vcpkg/versions/x-/xproto.json new file mode 100644 index 000000000..e4e8d7daf --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xproto.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "707be677dc8929167ad434402cd6ae8678e2bffc", + "version": "2021.5", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/x-/xsimd.json b/external_imported/vcpkg/versions/x-/xsimd.json index 704161229..82d262ad1 100644 --- a/external_imported/vcpkg/versions/x-/xsimd.json +++ b/external_imported/vcpkg/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d7f059f0f9d91da33b87a09615ef7f7f84cc76a", + "version": "8.1.0", + "port-version": 0 + }, { "git-tree": "e7b050635a31da5fce9834a6e8e859eb160b3916", "version": "8.0.3", diff --git a/external_imported/vcpkg/versions/x-/xtensor-blas.json b/external_imported/vcpkg/versions/x-/xtensor-blas.json index f377a2b39..ea8748bd3 100644 --- a/external_imported/vcpkg/versions/x-/xtensor-blas.json +++ b/external_imported/vcpkg/versions/x-/xtensor-blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dd896df9d5ded9e0980d91c3d1727c4105dd7c3", + "version": "0.20.0", + "port-version": 0 + }, { "git-tree": "6524a2462dd339878f2e32de8962576a15097a5e", "version-string": "0.17.2", diff --git a/external_imported/vcpkg/versions/x-/xtrans.json b/external_imported/vcpkg/versions/x-/xtrans.json new file mode 100644 index 000000000..5c6c6557a --- /dev/null +++ b/external_imported/vcpkg/versions/x-/xtrans.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef94e0330a53876e074a09a3cd9c311c4ca0aa28", + "version": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/y-/yara.json b/external_imported/vcpkg/versions/y-/yara.json index 5931955d9..e10d3ead5 100644 --- a/external_imported/vcpkg/versions/y-/yara.json +++ b/external_imported/vcpkg/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0551c4f9ac51859d9063f6482ff44acf3d7bfa2a", + "version": "4.2.3", + "port-version": 0 + }, { "git-tree": "f071df4391cee4f96e8f7bb5820d7d3f70db50e1", "version": "4.2.0", diff --git a/external_imported/vcpkg/versions/y-/yasm.json b/external_imported/vcpkg/versions/y-/yasm.json index 8ce7047cc..2611a7bf6 100644 --- a/external_imported/vcpkg/versions/y-/yasm.json +++ b/external_imported/vcpkg/versions/y-/yasm.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e9ad958de17f5b7661720dc322cff96b2dff8355", + "version": "1.3.0", + "port-version": 5 + }, + { + "git-tree": "796bb1f691c8ef8b04eb6577e95ab04167470dac", + "version": "1.3.0", + "port-version": 4 + }, { "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527", "version": "1.3.0", diff --git a/external_imported/vcpkg/versions/y-/yoga.json b/external_imported/vcpkg/versions/y-/yoga.json index 891c54e4c..4a754eace 100644 --- a/external_imported/vcpkg/versions/y-/yoga.json +++ b/external_imported/vcpkg/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "620d91442f1a5e599eeabcb0c6b86fcb57a781f8", + "version": "1.19.0", + "port-version": 1 + }, { "git-tree": "12751eb94758566f26b621b28dc86fe8b1977a7f", "version": "1.19.0", diff --git a/external_imported/vcpkg/versions/y-/yyjson.json b/external_imported/vcpkg/versions/y-/yyjson.json index cba93435d..bfd3c5279 100644 --- a/external_imported/vcpkg/versions/y-/yyjson.json +++ b/external_imported/vcpkg/versions/y-/yyjson.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "6dddfac371d8dad2fe69680acab1512cd2d87062", + "version": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "228eaef5ad7cddcc8e76dc73b2741f75cc18912a", + "version": "0.5.0", + "port-version": 0 + }, + { + "git-tree": "2d4f6a2936ab89c986bb1c3cafd5e3ca796ce7fa", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "ced4d99c46f8c50e8c8df046af0fe54cce4a0dbb", "version": "0.3.0", diff --git a/external_imported/vcpkg/versions/z-/z3.json b/external_imported/vcpkg/versions/z-/z3.json index f04b7bd92..a1cca9f3b 100644 --- a/external_imported/vcpkg/versions/z-/z3.json +++ b/external_imported/vcpkg/versions/z-/z3.json @@ -1,5 +1,30 @@ { "versions": [ + { + "git-tree": "4c57981e593026824fe9bedff234a82c13765e29", + "version": "4.11.0", + "port-version": 0 + }, + { + "git-tree": "aa0794e55ef223e835ae4dd228e3986d83be4843", + "version": "4.10.2", + "port-version": 0 + }, + { + "git-tree": "c934af0db69ef3b1bacc4bf5a72b5d901aaf1136", + "version": "4.9.1", + "port-version": 0 + }, + { + "git-tree": "a1217f07ef4a8f918f5b61a01057a4ee70f92422", + "version": "4.8.16", + "port-version": 0 + }, + { + "git-tree": "ca14e43533889ce4abf89af387b73d015e133c4a", + "version": "4.8.15", + "port-version": 0 + }, { "git-tree": "78366a5b407998768b97ddee528306cf9cbe9847", "version": "4.8.14", diff --git a/external_imported/vcpkg/versions/z-/z4kn4fein-semver.json b/external_imported/vcpkg/versions/z-/z4kn4fein-semver.json new file mode 100644 index 000000000..7869b1a81 --- /dev/null +++ b/external_imported/vcpkg/versions/z-/z4kn4fein-semver.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55540e32df4b2fe6743a954483b361808460adb6", + "version": "0.2.1", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/z-/zeroc-ice.json b/external_imported/vcpkg/versions/z-/zeroc-ice.json new file mode 100644 index 000000000..905dc77c3 --- /dev/null +++ b/external_imported/vcpkg/versions/z-/zeroc-ice.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "1ddc4746c1f19fca41706071fac4575ea99fe6b9", + "version": "3.7.7", + "port-version": 2 + }, + { + "git-tree": "f32e4c338e25d36018095348e632c794b13fc513", + "version": "3.7.7", + "port-version": 1 + }, + { + "git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b", + "version": "3.7.7", + "port-version": 0 + } + ] +} diff --git a/external_imported/vcpkg/versions/z-/zeromq.json b/external_imported/vcpkg/versions/z-/zeromq.json index 03d110f38..da9f561a8 100644 --- a/external_imported/vcpkg/versions/z-/zeromq.json +++ b/external_imported/vcpkg/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bdd3a27ea013a2d3b70032245631f114198cce9", + "version": "4.3.4", + "port-version": 6 + }, { "git-tree": "246f585e58f536087c5f70f918459d5500a4dc43", "version": "4.3.4", diff --git a/external_imported/vcpkg/versions/z-/zlib-ng.json b/external_imported/vcpkg/versions/z-/zlib-ng.json index 6c2249e9b..d69c235c4 100644 --- a/external_imported/vcpkg/versions/z-/zlib-ng.json +++ b/external_imported/vcpkg/versions/z-/zlib-ng.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "60e9a6f12ede4c5e87d2b3077c25e83991a02eea", + "version": "2.0.6", + "port-version": 1 + }, + { + "git-tree": "3324dce4e575e9ba671576b06108c612d0b500bf", + "version": "2.0.6", + "port-version": 0 + }, { "git-tree": "1edea9190001c716b745514982d2ee684f1183e8", "version": "2.0.5", diff --git a/external_imported/vcpkg/versions/z-/zlib.json b/external_imported/vcpkg/versions/z-/zlib.json index b7830cc6d..8d4707112 100644 --- a/external_imported/vcpkg/versions/z-/zlib.json +++ b/external_imported/vcpkg/versions/z-/zlib.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "d40d86865ecbcc5b54d21f840dd2212556aeadd5", + "version": "1.2.12", + "port-version": 2 + }, + { + "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774", + "version": "1.2.12", + "port-version": 1 + }, { "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", "version": "1.2.12", diff --git a/external_imported/vcpkg/versions/z-/zookeeper.json b/external_imported/vcpkg/versions/z-/zookeeper.json index ab8b9e678..61432ca7d 100644 --- a/external_imported/vcpkg/versions/z-/zookeeper.json +++ b/external_imported/vcpkg/versions/z-/zookeeper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ad08d6a8c4d4f812c50c02872d046c84dd4ccbc", + "version": "3.5.6", + "port-version": 0 + }, { "git-tree": "44fbecb403595fea598756cf946b00e0a2f21dad", "version-string": "3.5.5", diff --git a/external_imported/vcpkg/versions/z-/zopfli.json b/external_imported/vcpkg/versions/z-/zopfli.json index 437702602..20f84d691 100644 --- a/external_imported/vcpkg/versions/z-/zopfli.json +++ b/external_imported/vcpkg/versions/z-/zopfli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0451fdd88ef4beba9c0f572d219c0148ac28a25", + "version": "1.0.3", + "port-version": 2 + }, { "git-tree": "e80818813d5dfa5b563c84485d4a0030ce90906a", "version-string": "1.0.3", diff --git a/external_imported/vcpkg/versions/z-/zpp-bits.json b/external_imported/vcpkg/versions/z-/zpp-bits.json index 8b50b3560..a375c2314 100644 --- a/external_imported/vcpkg/versions/z-/zpp-bits.json +++ b/external_imported/vcpkg/versions/z-/zpp-bits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c360348897285a2a3bfa0b5db6f8cc09da9893be", + "version": "4.4.4", + "port-version": 0 + }, { "git-tree": "cfb5cd37a6ed4a1ccab70eeb3112db9ad3d2f026", "version": "4.3.3", diff --git a/external_imported/vcpkg/versions/z-/zserge-webview.json b/external_imported/vcpkg/versions/z-/zserge-webview.json index a25f30fe0..6d2c4538a 100644 --- a/external_imported/vcpkg/versions/z-/zserge-webview.json +++ b/external_imported/vcpkg/versions/z-/zserge-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "173fd4ea0d862f8cca595a8726fe7e0ef6444d45", + "version-date": "2022-09-07", + "port-version": 0 + }, { "git-tree": "e10cdad91c0d47a7dc03717d941254291abfd0eb", "version-string": "2019-04-27", diff --git a/external_imported/vcpkg/versions/z-/zug.json b/external_imported/vcpkg/versions/z-/zug.json index 687ab2d8f..6518dff54 100644 --- a/external_imported/vcpkg/versions/z-/zug.json +++ b/external_imported/vcpkg/versions/z-/zug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb162e61d6a161de1d01184b20389079eb3fdc6", + "version-date": "2021-04-23", + "port-version": 1 + }, { "git-tree": "2213b3d809f8a99994484b626896f6cf6e3858c3", "version-date": "2021-04-23", diff --git a/external_imported/vcpkg/versions/z-/zziplib.json b/external_imported/vcpkg/versions/z-/zziplib.json index 3aec32b51..63363563f 100644 --- a/external_imported/vcpkg/versions/z-/zziplib.json +++ b/external_imported/vcpkg/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "571af9ee98bd4bf80bf21fc10a5ec5971678b954", + "version": "0.13.72", + "port-version": 1 + }, { "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b", "version": "0.13.72",